diff --git a/.editorconfig b/.editorconfig
index 8a5cf43521..a87e5e0651 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -77,6 +77,8 @@ csharp_style_expression_bodied_methods = false:suggestion
 #csharp_style_expression_bodied_operators = false:silent
 csharp_style_expression_bodied_properties = true:suggestion
 
+csharp_style_namespace_declarations = file_scoped:suggestion
+
 # Pattern matching preferences
 #csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
 #csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
diff --git a/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs b/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs
index 0638d945aa..9b878eac40 100644
--- a/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs
+++ b/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs
@@ -8,6 +8,7 @@ using Robust.Shared;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 
 namespace Content.Benchmarks;
 
@@ -18,9 +19,11 @@ namespace Content.Benchmarks;
 [Virtual, MemoryDiagnoser]
 public class SpawnEquipDeleteBenchmark
 {
+    private static readonly EntProtoId Mob = "MobHuman";
+    private static readonly ProtoId<StartingGearPrototype> CaptainStartingGear = "CaptainGear";
+
     private TestPair _pair = default!;
     private StationSpawningSystem _spawnSys = default!;
-    private const string Mob = "MobHuman";
     private StartingGearPrototype _gear = default!;
     private EntityUid _entity;
     private EntityCoordinates _coords;
@@ -39,7 +42,7 @@ public class SpawnEquipDeleteBenchmark
         var mapData = await _pair.CreateTestMap();
         _coords = mapData.GridCoords;
         _spawnSys = server.System<StationSpawningSystem>();
-        _gear = server.ProtoMan.Index<StartingGearPrototype>("CaptainGear");
+        _gear = server.ProtoMan.Index(CaptainStartingGear);
     }
 
     [GlobalCleanup]
diff --git a/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs b/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs
index da68653ce5..4f07c31009 100644
--- a/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs
+++ b/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs
@@ -15,6 +15,8 @@ namespace Content.Client.Access.UI;
 [GenerateTypedNameReferences]
 public sealed partial class GroupedAccessLevelChecklist : BoxContainer
 {
+    private static readonly ProtoId<AccessGroupPrototype> GeneralAccessGroup = "General";
+
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
 
     private bool _isMonotone;
@@ -63,7 +65,7 @@ public sealed partial class GroupedAccessLevelChecklist : BoxContainer
 
         // Ensure that the 'general' access group is added to handle
         // misc. access levels that aren't associated with any group
-        if (_protoManager.TryIndex<AccessGroupPrototype>("General", out var generalAccessProto))
+        if (_protoManager.TryIndex(GeneralAccessGroup, out var generalAccessProto))
             _groupedAccessLevels.TryAdd(generalAccessProto, new());
 
         // Assign known access levels with their associated groups
diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
index 01259b60f7..6146240824 100644
--- a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
+++ b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
@@ -8,6 +8,21 @@
             <OptionButton Name="SolutionOption" HorizontalExpand="True"/>
         </BoxContainer>
 
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 4">
+            <Button Name="VVButton"
+                    Text="{Loc 'admin-solutions-window-vv-button'}"
+                    ToolTip="{Loc 'admin-solutions-window-vv-button-tooltip'}"
+                    Disabled="True"
+                    HorizontalExpand="True"
+                    StyleClasses="OpenRight"/>
+            <Button Name="SolutionButton"
+                    Text="{Loc 'admin-solutions-window-solution-button'}"
+                    ToolTip="{Loc 'admin-solutions-window-solution-button-tooltip'}"
+                    Disabled="True"
+                    HorizontalExpand="True"
+                    StyleClasses="OpenLeft"/>
+        </BoxContainer>
+
         <!-- The total volume / capacity of the solution -->
         <BoxContainer Name="VolumeBox" Orientation="Vertical" HorizontalExpand="True" Margin="0 4"/>
 
diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
index 812f2de3a0..a6b61a4393 100644
--- a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
@@ -1,3 +1,4 @@
+using Content.Client.Administration.Managers;
 using Content.Shared.Administration;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
@@ -20,6 +21,7 @@ namespace Content.Client.Administration.UI.ManageSolutions
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IClientGameTiming _timing = default!;
+        [Dependency] private readonly IClientAdminManager _admin = default!;
 
         private NetEntity _target = NetEntity.Invalid;
         private string? _selectedSolution;
@@ -34,6 +36,11 @@ namespace Content.Client.Administration.UI.ManageSolutions
 
             SolutionOption.OnItemSelected += SolutionSelected;
             AddButton.OnPressed += OpenAddReagentWindow;
+            VVButton.OnPressed += OpenVVWindow;
+            SolutionButton.OnPressed += OpenSolutionWindow;
+
+            VVButton.Disabled = !_admin.CanViewVar();
+            SolutionButton.Disabled = !_admin.CanViewVar();
         }
 
         public override void Close()
@@ -271,6 +278,32 @@ namespace Content.Client.Administration.UI.ManageSolutions
             _addReagentWindow.OpenCentered();
         }
 
+        /// <summary>
+        ///     Open the corresponding solution entity in a ViewVariables window.
+        /// </summary>
+        private void OpenVVWindow(BaseButton.ButtonEventArgs obj)
+        {
+            if (_solutions == null
+                || _selectedSolution == null
+                || !_solutions.TryGetValue(_selectedSolution, out var uid)
+                || !_entityManager.TryGetNetEntity(uid, out var netEntity))
+                return;
+            _consoleHost.ExecuteCommand($"vv {netEntity}");
+        }
+
+        /// <summary>
+        ///     Open the corresponding Solution instance in a ViewVariables window.
+        /// </summary>
+        private void OpenSolutionWindow(BaseButton.ButtonEventArgs obj)
+        {
+            if (_solutions == null
+                || _selectedSolution == null
+                || !_solutions.TryGetValue(_selectedSolution, out var uid)
+                || !_entityManager.TryGetNetEntity(uid, out var netEntity))
+                return;
+            _consoleHost.ExecuteCommand($"vv /entity/{netEntity}/Solution/Solution");
+        }
+
         /// <summary>
         ///     When a new solution is selected, set _selectedSolution and update the reagent list.
         /// </summary>
diff --git a/Content.Client/Anomaly/AnomalySystem.cs b/Content.Client/Anomaly/AnomalySystem.cs
index 83f15a9086..4eee43fac6 100644
--- a/Content.Client/Anomaly/AnomalySystem.cs
+++ b/Content.Client/Anomaly/AnomalySystem.cs
@@ -62,11 +62,11 @@ public sealed class AnomalySystem : SharedAnomalySystem
     {
         base.Update(frameTime);
 
-        var query = EntityQueryEnumerator<AnomalySupercriticalComponent, SpriteComponent>();
+        var query = EntityQueryEnumerator<AnomalyComponent, AnomalySupercriticalComponent, SpriteComponent>();
 
-        while (query.MoveNext(out var uid, out var super, out var sprite))
+        while (query.MoveNext(out var uid, out var anomaly, out var super, out var sprite))
         {
-            var completion = 1f - (float)((super.EndTime - _timing.CurTime) / super.SupercriticalDuration);
+            var completion = 1f - (float) ((super.EndTime - _timing.CurTime) / anomaly.SupercriticalDuration);
             var scale = completion * (super.MaxScaleAmount - 1f) + 1f;
             _sprite.SetScale((uid, sprite), new Vector2(scale, scale));
 
diff --git a/Content.Client/Atmos/EntitySystems/GasCanisterAppearanceSystem.cs b/Content.Client/Atmos/EntitySystems/GasCanisterAppearanceSystem.cs
new file mode 100644
index 0000000000..f16774ce24
--- /dev/null
+++ b/Content.Client/Atmos/EntitySystems/GasCanisterAppearanceSystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Atmos.Piping.Unary.Components;
+using Content.Shared.SprayPainter.Prototypes;
+using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Atmos.EntitySystems;
+
+/// <summary>
+/// Used to change the appearance of gas canisters.
+/// </summary>
+public sealed class GasCanisterAppearanceSystem : VisualizerSystem<GasCanisterComponent>
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    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)
+            return;
+
+        if (!_prototypeManager.HasIndex(protoName))
+            return;
+
+        // Create the given prototype and get its first layer.
+        var tempUid = Spawn(protoName);
+        SpriteSystem.LayerSetRsiState(uid, 0, SpriteSystem.LayerGetRsiState(tempUid, 0));
+        QueueDel(tempUid);
+    }
+}
diff --git a/Content.Client/Atmos/Overlays/GasTileOverlay.cs b/Content.Client/Atmos/Overlays/GasTileOverlay.cs
index cdbcb5b3f6..d91cc29e4c 100644
--- a/Content.Client/Atmos/Overlays/GasTileOverlay.cs
+++ b/Content.Client/Atmos/Overlays/GasTileOverlay.cs
@@ -19,6 +19,8 @@ namespace Content.Client.Atmos.Overlays
 {
     public sealed class GasTileOverlay : Overlay
     {
+        private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
         private readonly IEntityManager _entManager;
         private readonly IMapManager _mapManager;
         private readonly SharedMapSystem _mapSystem;
@@ -54,7 +56,7 @@ namespace Content.Client.Atmos.Overlays
             _mapManager = IoCManager.Resolve<IMapManager>();
             _mapSystem = entManager.System<SharedMapSystem>();
             _xformSys = xformSys;
-            _shader = protoMan.Index<ShaderPrototype>("unshaded").Instance();
+            _shader = protoMan.Index(UnshadedShader).Instance();
             ZIndex = GasOverlayZIndex;
 
             _gasCount = system.VisibleGasId.Length;
diff --git a/Content.Client/Bed/StasisBedSystem.cs b/Content.Client/Bed/StasisBedSystem.cs
deleted file mode 100644
index 6065ec839f..0000000000
--- a/Content.Client/Bed/StasisBedSystem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Bed;
-using Robust.Client.GameObjects;
-
-namespace Content.Client.Bed;
-
-public sealed class StasisBedSystem : VisualizerSystem<StasisBedVisualsComponent>
-{
-    protected override void OnAppearanceChange(EntityUid uid, StasisBedVisualsComponent component, ref AppearanceChangeEvent args)
-    {
-        if (args.Sprite != null
-            && AppearanceSystem.TryGetData<bool>(uid, StasisBedVisuals.IsOn, out var isOn, args.Component))
-        {
-            SpriteSystem.LayerSetVisible((uid, args.Sprite), StasisBedVisualLayers.IsOn, isOn);
-        }
-    }
-}
-
-public enum StasisBedVisualLayers : byte
-{
-    IsOn,
-}
diff --git a/Content.Client/Body/Systems/MetabolizerSystem.cs b/Content.Client/Body/Systems/MetabolizerSystem.cs
new file mode 100644
index 0000000000..2a0ba4606d
--- /dev/null
+++ b/Content.Client/Body/Systems/MetabolizerSystem.cs
@@ -0,0 +1,6 @@
+using Content.Shared.Body.Systems;
+
+namespace Content.Client.Body.Systems;
+
+/// <inheritdoc/>
+public sealed class MetabolizerSystem : SharedMetabolizerSystem;
diff --git a/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs b/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
index 374b00aa6e..3392545be8 100644
--- a/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
+++ b/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
@@ -18,14 +18,10 @@ public sealed class ChemistryGuideDataSystem : SharedChemistryGuideDataSystem
 {
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
 
-    [ValidatePrototypeId<MixingCategoryPrototype>]
-    private const string DefaultMixingCategory = "DummyMix";
-    [ValidatePrototypeId<MixingCategoryPrototype>]
-    private const string DefaultGrindCategory = "DummyGrind";
-    [ValidatePrototypeId<MixingCategoryPrototype>]
-    private const string DefaultJuiceCategory = "DummyJuice";
-    [ValidatePrototypeId<MixingCategoryPrototype>]
-    private const string DefaultCondenseCategory = "DummyCondense";
+    private static readonly ProtoId<MixingCategoryPrototype> DefaultMixingCategory = "DummyMix";
+    private static readonly ProtoId<MixingCategoryPrototype> DefaultGrindCategory = "DummyGrind";
+    private static readonly ProtoId<MixingCategoryPrototype> DefaultJuiceCategory = "DummyJuice";
+    private static readonly ProtoId<MixingCategoryPrototype> DefaultCondenseCategory = "DummyCondense";
 
     private readonly Dictionary<string, List<ReagentSourceData>> _reagentSources = new();
 
diff --git a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
index 9ca94fc3b4..749a6839b6 100644
--- a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
+++ b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
@@ -8,6 +8,8 @@ namespace Content.Client.CombatMode
 {
     public sealed class ColoredScreenBorderOverlay : Overlay
     {
+        private static readonly ProtoId<ShaderPrototype> Shader = "ColoredScreenBorder";
+
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
@@ -16,7 +18,7 @@ namespace Content.Client.CombatMode
         public ColoredScreenBorderOverlay()
         {
             IoCManager.InjectDependencies(this);
-            _shader = _prototypeManager.Index<ShaderPrototype>("ColoredScreenBorder").Instance();
+            _shader = _prototypeManager.Index(Shader).Instance();
         }
 
         protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
index 81410dc7e6..8ee8df48fd 100644
--- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
+++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
@@ -27,8 +27,7 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
 
     private EntityUid _owner;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    public const string NoBoardEffectId = "FlatpackerNoBoardEffect";
+    public static readonly EntProtoId NoBoardEffectId = "FlatpackerNoBoardEffect";
 
     private EntityUid? _currentBoard = EntityUid.Invalid;
 
diff --git a/Content.Client/Cooldown/CooldownGraphic.cs b/Content.Client/Cooldown/CooldownGraphic.cs
index 25063f8133..6779e4027a 100644
--- a/Content.Client/Cooldown/CooldownGraphic.cs
+++ b/Content.Client/Cooldown/CooldownGraphic.cs
@@ -7,6 +7,8 @@ namespace Content.Client.Cooldown
 {
     public sealed class CooldownGraphic : Control
     {
+        private static readonly ProtoId<ShaderPrototype> Shader = "CooldownAnimation";
+
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IPrototypeManager _protoMan = default!;
 
@@ -15,7 +17,7 @@ namespace Content.Client.Cooldown
         public CooldownGraphic()
         {
             IoCManager.InjectDependencies(this);
-            _shader = _protoMan.Index<ShaderPrototype>("CooldownAnimation").InstanceUnique();
+            _shader = _protoMan.Index(Shader).InstanceUnique();
         }
 
         /// <summary>
diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
index 5eaed77041..33b4fbc335 100644
--- a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
+++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
@@ -33,8 +33,7 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
 
     public readonly EntityUid Console;
 
-    [ValidatePrototypeId<LocalizedDatasetPrototype>]
-    private const string ReasonPlaceholders = "CriminalRecordsWantedReasonPlaceholders";
+    private static readonly ProtoId<LocalizedDatasetPrototype> ReasonPlaceholders = "CriminalRecordsWantedReasonPlaceholders";
 
     public Action<uint?>? OnKeySelected;
     public Action<StationRecordFilterType, string>? OnFiltersChanged;
@@ -296,7 +295,7 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
 
         var field = "reason";
         var title = Loc.GetString("criminal-records-status-" + status.ToString().ToLower());
-        var placeholders = _proto.Index<LocalizedDatasetPrototype>(ReasonPlaceholders);
+        var placeholders = _proto.Index(ReasonPlaceholders);
         var placeholder = Loc.GetString("criminal-records-console-reason-placeholder", ("placeholder", _random.Pick(placeholders))); // just funny it doesn't actually get used
         var prompt = Loc.GetString("criminal-records-console-reason");
         var entry = new QuickDialogEntry(field, QuickDialogEntryType.LongText, prompt, placeholder);
diff --git a/Content.Client/Damage/Systems/StaminaSystem.cs b/Content.Client/Damage/Systems/StaminaSystem.cs
index 69eb461a7d..046c72a8fa 100644
--- a/Content.Client/Damage/Systems/StaminaSystem.cs
+++ b/Content.Client/Damage/Systems/StaminaSystem.cs
@@ -1,7 +1,126 @@
-using Content.Shared.Damage.Systems;
+using Content.Client.Stunnable;
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Systems;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Systems;
+using Robust.Client.GameObjects;
 
 namespace Content.Client.Damage.Systems;
 
 public sealed partial class StaminaSystem : SharedStaminaSystem
 {
+    [Dependency] private readonly AnimationPlayerSystem _animation = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly SpriteSystem _sprite = default!;
+    [Dependency] private readonly StunSystem _stun = default!; // Clientside Stun System
+
+    private const string StaminaAnimationKey = "stamina";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<StaminaComponent, AnimationCompletedEvent>(OnAnimationCompleted);
+        SubscribeLocalEvent<ActiveStaminaComponent, ComponentShutdown>(OnActiveStaminaShutdown);
+        SubscribeLocalEvent<StaminaComponent, MobStateChangedEvent>(OnMobStateChanged);
+    }
+
+    protected override void OnStamHandleState(Entity<StaminaComponent> entity, ref AfterAutoHandleStateEvent args)
+    {
+        base.OnStamHandleState(entity, ref args);
+
+        TryStartAnimation(entity);
+    }
+
+    private void OnActiveStaminaShutdown(Entity<ActiveStaminaComponent> entity, ref ComponentShutdown args)
+    {
+        // If we don't have active stamina, we shouldn't have stamina damage. If the update loop can trust it we can trust it.
+        if (!TryComp<StaminaComponent>(entity, out var stamina))
+            return;
+
+        StopAnimation((entity, stamina));
+    }
+
+    protected override void OnShutdown(Entity<StaminaComponent> entity, ref ComponentShutdown args)
+    {
+        base.OnShutdown(entity, ref args);
+
+        StopAnimation(entity);
+    }
+
+    private void OnMobStateChanged(Entity<StaminaComponent> ent, ref MobStateChangedEvent args)
+    {
+        if (args.NewMobState == MobState.Dead)
+            StopAnimation(ent);
+    }
+
+    private void TryStartAnimation(Entity<StaminaComponent> entity)
+    {
+        if (!TryComp<SpriteComponent>(entity, out var sprite))
+            return;
+
+        // If the animation is running, the system should update it accordingly
+        // If we're below the threshold to animate, don't try to animate
+        // If we're in stamcrit don't override it
+        if (entity.Comp.AnimationThreshold > entity.Comp.StaminaDamage || _animation.HasRunningAnimation(entity, StaminaAnimationKey))
+            return;
+
+        // Don't animate if we're dead
+        if (_mobState.IsDead(entity))
+            return;
+
+        entity.Comp.StartOffset = sprite.Offset;
+
+        PlayAnimation((entity, entity.Comp, sprite));
+    }
+
+    private void StopAnimation(Entity<StaminaComponent, SpriteComponent?> entity)
+    {
+        if(!Resolve(entity, ref entity.Comp2))
+            return;
+
+        _animation.Stop(entity.Owner, StaminaAnimationKey);
+        entity.Comp1.StartOffset = entity.Comp2.Offset;
+    }
+
+    private void OnAnimationCompleted(Entity<StaminaComponent> entity, ref AnimationCompletedEvent args)
+    {
+        if (args.Key != StaminaAnimationKey || !args.Finished || !TryComp<SpriteComponent>(entity, out var sprite))
+            return;
+
+        // stop looping if we're below the threshold
+        if (entity.Comp.AnimationThreshold > entity.Comp.StaminaDamage)
+        {
+            _animation.Stop(entity.Owner, StaminaAnimationKey);
+            _sprite.SetOffset((entity, sprite), entity.Comp.StartOffset);
+            return;
+        }
+
+        if (!HasComp<AnimationPlayerComponent>(entity))
+            return;
+
+        PlayAnimation((entity, entity.Comp, sprite));
+    }
+
+    private void PlayAnimation(Entity<StaminaComponent, SpriteComponent> entity)
+    {
+        var step = Math.Clamp((entity.Comp1.StaminaDamage - entity.Comp1.AnimationThreshold) /
+                              (entity.Comp1.CritThreshold - entity.Comp1.AnimationThreshold),
+            0f,
+            1f); // The things I do for project 0 warnings
+        var frequency = entity.Comp1.FrequencyMin + step * entity.Comp1.FrequencyMod;
+        var jitter = entity.Comp1.JitterAmplitudeMin + step * entity.Comp1.JitterAmplitudeMod;
+        var breathing = entity.Comp1.BreathingAmplitudeMin + step * entity.Comp1.BreathingAmplitudeMod;
+
+        _animation.Play(entity.Owner,
+            _stun.GetFatigueAnimation(entity.Comp2,
+                frequency,
+                entity.Comp1.Jitters,
+                jitter * entity.Comp1.JitterMin,
+                jitter * entity.Comp1.JitterMax,
+                breathing,
+                entity.Comp1.StartOffset,
+                ref entity.Comp1.LastJitter),
+            StaminaAnimationKey);
+    }
 }
diff --git a/Content.Client/Delivery/DeliveryVisualizerSystem.cs b/Content.Client/Delivery/DeliveryVisualizerSystem.cs
index 846688149f..d5afd34533 100644
--- a/Content.Client/Delivery/DeliveryVisualizerSystem.cs
+++ b/Content.Client/Delivery/DeliveryVisualizerSystem.cs
@@ -24,7 +24,7 @@ public sealed class DeliveryVisualizerSystem : VisualizerSystem<DeliveryComponen
 
         if (!_prototype.TryIndex<JobIconPrototype>(job, out var icon))
         {
-            SpriteSystem.LayerSetTexture((uid, args.Sprite), DeliveryVisualLayers.JobStamp, SpriteSystem.Frame0(_prototype.Index("JobIconUnknown")));
+            SpriteSystem.LayerSetTexture((uid, args.Sprite), DeliveryVisualLayers.JobStamp, SpriteSystem.Frame0(_prototype.Index(UnknownIcon).Icon));
             return;
         }
 
diff --git a/Content.Client/Devour/DevourSystem.cs b/Content.Client/Devour/DevourSystem.cs
deleted file mode 100644
index ad905ffab3..0000000000
--- a/Content.Client/Devour/DevourSystem.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Content.Shared.Devour;
-
-namespace Content.Client.Devour;
-public sealed class DevourSystem : SharedDevourSystem
-{
-}
diff --git a/Content.Client/DoAfter/DoAfterOverlay.cs b/Content.Client/DoAfter/DoAfterOverlay.cs
index 6ecd758461..761584e06e 100644
--- a/Content.Client/DoAfter/DoAfterOverlay.cs
+++ b/Content.Client/DoAfter/DoAfterOverlay.cs
@@ -14,6 +14,8 @@ namespace Content.Client.DoAfter;
 
 public sealed class DoAfterOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
     private readonly IEntityManager _entManager;
     private readonly IGameTiming _timing;
     private readonly IPlayerManager _player;
@@ -50,7 +52,7 @@ public sealed class DoAfterOverlay : Overlay
         var sprite = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/progress_bar.rsi"), "icon");
         _barTexture = _entManager.EntitySysManager.GetEntitySystem<SpriteSystem>().Frame0(sprite);
 
-        _unshadedShader = protoManager.Index<ShaderPrototype>("unshaded").Instance();
+        _unshadedShader = protoManager.Index(UnshadedShader).Instance();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Doors/DoorSystem.cs b/Content.Client/Doors/DoorSystem.cs
index cb17cfaf21..3d9a3e2a9a 100644
--- a/Content.Client/Doors/DoorSystem.cs
+++ b/Content.Client/Doors/DoorSystem.cs
@@ -1,16 +1,17 @@
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
+using Content.Shared.SprayPainter.Prototypes;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Client.ResourceManagement;
-using Robust.Shared.Serialization.TypeSerializers.Implementations;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Doors;
 
 public sealed class DoorSystem : SharedDoorSystem
 {
     [Dependency] private readonly AnimationPlayerSystem _animationSystem = default!;
-    [Dependency] private readonly IResourceCache _resourceCache = default!;
+    [Dependency] private readonly IComponentFactory _componentFactory = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SpriteSystem _sprite = default!;
 
     public override void Initialize()
@@ -85,8 +86,8 @@ public sealed class DoorSystem : SharedDoorSystem
         if (!AppearanceSystem.TryGetData<DoorState>(entity, DoorVisuals.State, out var state, args.Component))
             state = DoorState.Closed;
 
-        if (AppearanceSystem.TryGetData<string>(entity, DoorVisuals.BaseRSI, out var baseRsi, args.Component))
-            UpdateSpriteLayers((entity.Owner, args.Sprite), baseRsi);
+        if (AppearanceSystem.TryGetData<string>(entity, PaintableVisuals.Prototype, out var prototype, args.Component))
+            UpdateSpriteLayers((entity.Owner, args.Sprite), prototype);
 
         if (_animationSystem.HasRunningAnimation(entity, DoorComponent.AnimationKey))
             _animationSystem.Stop(entity.Owner, DoorComponent.AnimationKey);
@@ -139,14 +140,14 @@ public sealed class DoorSystem : SharedDoorSystem
         }
     }
 
-    private void UpdateSpriteLayers(Entity<SpriteComponent> sprite, string baseRsi)
+    private void UpdateSpriteLayers(Entity<SpriteComponent> sprite, string targetProto)
     {
-        if (!_resourceCache.TryGetResource<RSIResource>(SpriteSpecifierSerializer.TextureRoot / baseRsi, out var res))
-        {
-            Log.Error("Unable to load RSI '{0}'. Trace:\n{1}", baseRsi, Environment.StackTrace);
+        if (!_prototypeManager.TryIndex(targetProto, out var target))
             return;
-        }
 
-        _sprite.SetBaseRsi(sprite.AsNullable(), res.RSI);
+        if (!target.TryGetComponent(out SpriteComponent? targetSprite, _componentFactory))
+            return;
+
+        _sprite.SetBaseRsi(sprite.AsNullable(), targetSprite.BaseRSI);
     }
 }
diff --git a/Content.Client/Drowsiness/DrowsinessOverlay.cs b/Content.Client/Drowsiness/DrowsinessOverlay.cs
index 1687216b3e..3770802302 100644
--- a/Content.Client/Drowsiness/DrowsinessOverlay.cs
+++ b/Content.Client/Drowsiness/DrowsinessOverlay.cs
@@ -10,12 +10,14 @@ namespace Content.Client.Drowsiness;
 
 public sealed class DrowsinessOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> Shader = "Drowsiness";
+
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IEntitySystemManager _sysMan = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    private readonly SharedStatusEffectsSystem _statusEffects = default!;
+    private readonly StatusEffectsSystem _statusEffects = default!;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
     public override bool RequestScreenTexture => true;
@@ -31,9 +33,9 @@ public sealed class DrowsinessOverlay : Overlay
     {
         IoCManager.InjectDependencies(this);
 
-        _statusEffects = _sysMan.GetEntitySystem<SharedStatusEffectsSystem>();
+        _statusEffects = _sysMan.GetEntitySystem<StatusEffectsSystem>();
 
-        _drowsinessShader = _prototypeManager.Index<ShaderPrototype>("Drowsiness").InstanceUnique();
+        _drowsinessShader = _prototypeManager.Index(Shader).InstanceUnique();
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
diff --git a/Content.Client/Drowsiness/DrowsinessSystem.cs b/Content.Client/Drowsiness/DrowsinessSystem.cs
index 3b35101489..632d2134ca 100644
--- a/Content.Client/Drowsiness/DrowsinessSystem.cs
+++ b/Content.Client/Drowsiness/DrowsinessSystem.cs
@@ -10,7 +10,7 @@ public sealed class DrowsinessSystem : SharedDrowsinessSystem
 {
     [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
-    [Dependency] private readonly SharedStatusEffectsSystem _statusEffects = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
 
     private DrowsinessOverlay _overlay = default!;
 
diff --git a/Content.Client/Drugs/RainbowOverlay.cs b/Content.Client/Drugs/RainbowOverlay.cs
index bfb3815649..e40fcdfca2 100644
--- a/Content.Client/Drugs/RainbowOverlay.cs
+++ b/Content.Client/Drugs/RainbowOverlay.cs
@@ -12,13 +12,15 @@ namespace Content.Client.Drugs;
 
 public sealed class RainbowOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> Shader = "Rainbow";
+
     [Dependency] private readonly IConfigurationManager _config = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IEntitySystemManager _sysMan = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    private readonly SharedStatusEffectsSystem _statusEffects = default!;
+    private readonly StatusEffectsSystem _statusEffects = default!;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
     public override bool RequestScreenTexture => true;
@@ -39,9 +41,9 @@ public sealed class RainbowOverlay : Overlay
     {
         IoCManager.InjectDependencies(this);
 
-        _statusEffects = _sysMan.GetEntitySystem<SharedStatusEffectsSystem>();
+        _statusEffects = _sysMan.GetEntitySystem<StatusEffectsSystem>();
 
-        _rainbowShader = _prototypeManager.Index<ShaderPrototype>("Rainbow").InstanceUnique();
+        _rainbowShader = _prototypeManager.Index(Shader).InstanceUnique();
         _config.OnValueChanged(CCVars.ReducedMotion, OnReducedMotionChanged, invokeImmediately: true);
     }
 
diff --git a/Content.Client/Drunk/DrunkOverlay.cs b/Content.Client/Drunk/DrunkOverlay.cs
index e01719e62c..1f26e75ffc 100644
--- a/Content.Client/Drunk/DrunkOverlay.cs
+++ b/Content.Client/Drunk/DrunkOverlay.cs
@@ -10,6 +10,8 @@ namespace Content.Client.Drunk;
 
 public sealed class DrunkOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> Shader = "Drunk";
+
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -30,7 +32,7 @@ public sealed class DrunkOverlay : Overlay
     public DrunkOverlay()
     {
         IoCManager.InjectDependencies(this);
-        _drunkShader = _prototypeManager.Index<ShaderPrototype>("Drunk").InstanceUnique();
+        _drunkShader = _prototypeManager.Index(Shader).InstanceUnique();
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs
index a005d0317b..18cb8f647a 100644
--- a/Content.Client/Explosion/ExplosionOverlay.cs
+++ b/Content.Client/Explosion/ExplosionOverlay.cs
@@ -13,6 +13,8 @@ namespace Content.Client.Explosion;
 [UsedImplicitly]
 public sealed class ExplosionOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly IEntityManager _entMan = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
@@ -26,7 +28,7 @@ public sealed class ExplosionOverlay : Overlay
     public ExplosionOverlay(SharedAppearanceSystem appearanceSystem)
     {
         IoCManager.InjectDependencies(this);
-        _shader = _proto.Index<ShaderPrototype>("unshaded").Instance();
+        _shader = _proto.Index(UnshadedShader).Instance();
         _transformSystem = _entMan.System<SharedTransformSystem>();
         _appearance = appearanceSystem;
     }
diff --git a/Content.Client/Eye/Blinding/BlindOverlay.cs b/Content.Client/Eye/Blinding/BlindOverlay.cs
index 1949b170ab..906f9c954c 100644
--- a/Content.Client/Eye/Blinding/BlindOverlay.cs
+++ b/Content.Client/Eye/Blinding/BlindOverlay.cs
@@ -12,6 +12,9 @@ namespace Content.Client.Eye.Blinding
 {
     public sealed class BlindOverlay : Overlay
     {
+        private static readonly ProtoId<ShaderPrototype> GreyscaleShader = "GreyscaleFullscreen";
+        private static readonly ProtoId<ShaderPrototype> CircleShader = "CircleMask";
+
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
@@ -27,8 +30,8 @@ namespace Content.Client.Eye.Blinding
         public BlindOverlay()
         {
             IoCManager.InjectDependencies(this);
-            _greyscaleShader = _prototypeManager.Index<ShaderPrototype>("GreyscaleFullscreen").InstanceUnique();
-            _circleMaskShader = _prototypeManager.Index<ShaderPrototype>("CircleMask").InstanceUnique();
+            _greyscaleShader = _prototypeManager.Index(GreyscaleShader).InstanceUnique();
+            _circleMaskShader = _prototypeManager.Index(CircleShader).InstanceUnique();
         }
         protected override bool BeforeDraw(in OverlayDrawArgs args)
         {
diff --git a/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs b/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs
index b56b091309..dccdac2758 100644
--- a/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs
+++ b/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs
@@ -10,6 +10,9 @@ namespace Content.Client.Eye.Blinding
 {
     public sealed class BlurryVisionOverlay : Overlay
     {
+        private static readonly ProtoId<ShaderPrototype> CataractsShader = "Cataracts";
+        private static readonly ProtoId<ShaderPrototype> CircleShader = "CircleMask";
+
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -33,8 +36,8 @@ namespace Content.Client.Eye.Blinding
         public BlurryVisionOverlay()
         {
             IoCManager.InjectDependencies(this);
-            _cataractsShader = _prototypeManager.Index<ShaderPrototype>("Cataracts").InstanceUnique();
-            _circleMaskShader = _prototypeManager.Index<ShaderPrototype>("CircleMask").InstanceUnique();
+            _cataractsShader = _prototypeManager.Index(CataractsShader).InstanceUnique();
+            _circleMaskShader = _prototypeManager.Index(CircleShader).InstanceUnique();
 
             _circleMaskShader.SetParameter("CircleMinDist", 0.0f);
             _circleMaskShader.SetParameter("CirclePow", NoMotion_Pow);
diff --git a/Content.Client/Flash/FlashOverlay.cs b/Content.Client/Flash/FlashOverlay.cs
index 8e41c382dd..72567530c0 100644
--- a/Content.Client/Flash/FlashOverlay.cs
+++ b/Content.Client/Flash/FlashOverlay.cs
@@ -1,8 +1,10 @@
+using Content.Shared.CCVar;
 using Content.Shared.Flash;
 using Content.Shared.Flash.Components;
 using Content.Shared.StatusEffect;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
+using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -11,25 +13,31 @@ namespace Content.Client.Flash
 {
     public sealed class FlashOverlay : Overlay
     {
+        private static readonly ProtoId<ShaderPrototype> FlashedEffectShader = "FlashedEffect";
+
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
+        [Dependency] private readonly IConfigurationManager _configManager = default!;
 
         private readonly SharedFlashSystem _flash;
         private readonly StatusEffectsSystem _statusSys;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
         private readonly ShaderInstance _shader;
-        public float PercentComplete = 0.0f;
+        private bool _reducedMotion;
+        public float PercentComplete;
         public Texture? ScreenshotTexture;
 
         public FlashOverlay()
         {
             IoCManager.InjectDependencies(this);
-            _shader = _prototypeManager.Index<ShaderPrototype>("FlashedEffect").InstanceUnique();
+            _shader = _prototypeManager.Index(FlashedEffectShader).InstanceUnique();
             _flash = _entityManager.System<SharedFlashSystem>();
             _statusSys = _entityManager.System<StatusEffectsSystem>();
+
+            _configManager.OnValueChanged(CCVars.ReducedMotion, (b) => { _reducedMotion = b; }, invokeImmediately: true);
         }
 
         protected override void FrameUpdate(FrameEventArgs args)
@@ -47,8 +55,8 @@ namespace Content.Client.Flash
                 return;
 
             var curTime = _timing.CurTime;
-            var lastsFor = (float) (time.Value.Item2 - time.Value.Item1).TotalSeconds;
-            var timeDone = (float) (curTime - time.Value.Item1).TotalSeconds;
+            var lastsFor = (float)(time.Value.Item2 - time.Value.Item1).TotalSeconds;
+            var timeDone = (float)(curTime - time.Value.Item1).TotalSeconds;
 
             PercentComplete = timeDone / lastsFor;
         }
@@ -74,10 +82,22 @@ namespace Content.Client.Flash
                 return;
 
             var worldHandle = args.WorldHandle;
-            _shader.SetParameter("percentComplete", PercentComplete);
-            worldHandle.UseShader(_shader);
-            worldHandle.DrawTextureRectRegion(ScreenshotTexture, args.WorldBounds);
-            worldHandle.UseShader(null);
+            if (_reducedMotion)
+            {
+                // TODO: This is a very simple placeholder.
+                // Replace it with a proper shader once we come up with something good.
+                // Turns out making an effect that is supposed to be a bright, sudden, and disorienting flash 
+                // not do any of that while also being equivalent in terms of game balance is hard.
+                var alpha = 1 - MathF.Pow(PercentComplete, 8f); // similar falloff curve to the flash shader
+                worldHandle.DrawRect(args.WorldBounds, new Color(0f, 0f, 0f, alpha));
+            }
+            else
+            {
+                _shader.SetParameter("percentComplete", PercentComplete);
+                worldHandle.UseShader(_shader);
+                worldHandle.DrawTextureRectRegion(ScreenshotTexture, args.WorldBounds);
+                worldHandle.UseShader(null);
+            }
         }
 
         protected override void DisposeBehavior()
diff --git a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
index 29ed124422..66d3f693b8 100644
--- a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
@@ -21,8 +21,7 @@ namespace Content.Client.Guidebook.Controls;
 [UsedImplicitly, GenerateTypedNameReferences]
 public sealed partial class GuideReagentReaction : BoxContainer, ISearchableControl
 {
-    [ValidatePrototypeId<MixingCategoryPrototype>]
-    private const string DefaultMixingCategory = "DummyMix";
+    private static readonly ProtoId<MixingCategoryPrototype> DefaultMixingCategory = "DummyMix";
 
     private readonly IPrototypeManager _protoMan;
 
@@ -55,7 +54,7 @@ public sealed partial class GuideReagentReaction : BoxContainer, ISearchableCont
         }
         else
         {
-            mixingCategories.Add(protoMan.Index<MixingCategoryPrototype>(DefaultMixingCategory));
+            mixingCategories.Add(protoMan.Index(DefaultMixingCategory));
         }
         SetMixingCategory(mixingCategories, prototype, sysMan);
     }
diff --git a/Content.Client/Interactable/Components/InteractionOutlineComponent.cs b/Content.Client/Interactable/Components/InteractionOutlineComponent.cs
index 9803920257..8d1d8cd07d 100644
--- a/Content.Client/Interactable/Components/InteractionOutlineComponent.cs
+++ b/Content.Client/Interactable/Components/InteractionOutlineComponent.cs
@@ -7,17 +7,14 @@ namespace Content.Client.Interactable.Components
     [RegisterComponent]
     public sealed partial class InteractionOutlineComponent : Component
     {
+        private static readonly ProtoId<ShaderPrototype> ShaderInRange = "SelectionOutlineInrange";
+        private static readonly ProtoId<ShaderPrototype> ShaderOutOfRange = "SelectionOutline";
+
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IEntityManager _entMan = default!;
 
         private const float DefaultWidth = 1;
 
-        [ValidatePrototypeId<ShaderPrototype>]
-        private const string ShaderInRange = "SelectionOutlineInrange";
-
-        [ValidatePrototypeId<ShaderPrototype>]
-        private const string ShaderOutOfRange = "SelectionOutline";
-
         private bool _inRange;
         private ShaderInstance? _shader;
         private int _lastRenderScale;
@@ -65,7 +62,7 @@ namespace Content.Client.Interactable.Components
         {
             var shaderName = inRange ? ShaderInRange : ShaderOutOfRange;
 
-            var instance = _prototypeManager.Index<ShaderPrototype>(shaderName).InstanceUnique();
+            var instance = _prototypeManager.Index(shaderName).InstanceUnique();
             instance.SetParameter("outline_width", DefaultWidth * renderScale);
             return instance;
         }
diff --git a/Content.Client/Interaction/DragDropSystem.cs b/Content.Client/Interaction/DragDropSystem.cs
index fe23866535..a1af9f9e20 100644
--- a/Content.Client/Interaction/DragDropSystem.cs
+++ b/Content.Client/Interaction/DragDropSystem.cs
@@ -29,6 +29,10 @@ namespace Content.Client.Interaction;
 /// </summary>
 public sealed class DragDropSystem : SharedDragDropSystem
 {
+    private static readonly ProtoId<ShaderPrototype> ShaderDropTargetInRange = "SelectionOutlineInrange";
+
+    private static readonly ProtoId<ShaderPrototype> ShaderDropTargetOutOfRange = "SelectionOutline";
+
     [Dependency] private readonly IStateManager _stateManager = default!;
     [Dependency] private readonly IInputManager _inputManager = default!;
     [Dependency] private readonly IEyeManager _eyeManager = default!;
@@ -54,12 +58,6 @@ public sealed class DragDropSystem : SharedDragDropSystem
     // mousedown event so it can be treated like a regular click
     private const float MaxMouseDownTimeForReplayingClick = 0.85f;
 
-    [ValidatePrototypeId<ShaderPrototype>]
-    private const string ShaderDropTargetInRange = "SelectionOutlineInrange";
-
-    [ValidatePrototypeId<ShaderPrototype>]
-    private const string ShaderDropTargetOutOfRange = "SelectionOutline";
-
     /// <summary>
     /// Current entity being dragged around.
     /// </summary>
@@ -113,8 +111,8 @@ public sealed class DragDropSystem : SharedDragDropSystem
 
         Subs.CVar(_cfgMan, CCVars.DragDropDeadZone, SetDeadZone, true);
 
-        _dropTargetInRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetInRange).Instance();
-        _dropTargetOutOfRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetOutOfRange).Instance();
+        _dropTargetInRangeShader = _prototypeManager.Index(ShaderDropTargetInRange).Instance();
+        _dropTargetOutOfRangeShader = _prototypeManager.Index(ShaderDropTargetOutOfRange).Instance();
         // needs to fire on mouseup and mousedown so we can detect a drag / drop
         CommandBinds.Builder
             .BindBefore(EngineKeyFunctions.Use, new PointerInputCmdHandler(OnUse, false, true), new[] { typeof(SharedInteractionSystem) })
diff --git a/Content.Client/Light/AmbientOcclusionOverlay.cs b/Content.Client/Light/AmbientOcclusionOverlay.cs
index f771dbe9fc..4caf654494 100644
--- a/Content.Client/Light/AmbientOcclusionOverlay.cs
+++ b/Content.Client/Light/AmbientOcclusionOverlay.cs
@@ -15,6 +15,10 @@ namespace Content.Client.Light;
 /// </summary>
 public sealed class AmbientOcclusionOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+    private static readonly ProtoId<ShaderPrototype> StencilMaskShader = "StencilMask";
+    private static readonly ProtoId<ShaderPrototype> StencilEqualDrawShader = "StencilEqualDraw";
+
     [Dependency] private readonly IClyde _clyde = default!;
     [Dependency] private readonly IConfigurationManager _cfgManager = default!;
     [Dependency] private readonly IEntityManager _entManager = default!;
@@ -87,7 +91,7 @@ public sealed class AmbientOcclusionOverlay : Overlay
         args.WorldHandle.RenderInRenderTarget(_aoTarget,
             () =>
             {
-                worldHandle.UseShader(_proto.Index<ShaderPrototype>("unshaded").Instance());
+                worldHandle.UseShader(_proto.Index(UnshadedShader).Instance());
                 var invMatrix = _aoTarget.GetWorldToLocalMatrix(viewport.Eye!, scale);
 
                 foreach (var entry in query.QueryAabb(mapId, worldBounds))
@@ -110,7 +114,7 @@ public sealed class AmbientOcclusionOverlay : Overlay
             () =>
             {
                 // Don't want lighting affecting it.
-                worldHandle.UseShader(_proto.Index<ShaderPrototype>("unshaded").Instance());
+                worldHandle.UseShader(_proto.Index(UnshadedShader).Instance());
 
                 foreach (var grid in _mapManager.FindGridsIntersecting(mapId, worldBounds))
                 {
@@ -131,11 +135,11 @@ public sealed class AmbientOcclusionOverlay : Overlay
             }, Color.Transparent);
 
         // Draw the stencil texture to depth buffer.
-        worldHandle.UseShader(_proto.Index<ShaderPrototype>("StencilMask").Instance());
+        worldHandle.UseShader(_proto.Index(StencilMaskShader).Instance());
         worldHandle.DrawTextureRect(_aoStencilTarget!.Texture, worldBounds);
 
         // Draw the Blurred AO texture finally.
-        worldHandle.UseShader(_proto.Index<ShaderPrototype>("StencilEqualDraw").Instance());
+        worldHandle.UseShader(_proto.Index(StencilEqualDrawShader).Instance());
         worldHandle.DrawTextureRect(_aoTarget!.Texture, worldBounds, color);
 
         args.WorldHandle.SetTransform(Matrix3x2.Identity);
diff --git a/Content.Client/Light/Components/LightBehaviourComponent.cs b/Content.Client/Light/Components/LightBehaviourComponent.cs
index 246863ba60..03452c6112 100644
--- a/Content.Client/Light/Components/LightBehaviourComponent.cs
+++ b/Content.Client/Light/Components/LightBehaviourComponent.cs
@@ -238,6 +238,9 @@ namespace Content.Client.Light.Components
 
         public override void OnInitialize()
         {
+            // This is very janky. This could easily result in no visible animation at all if the random values happen
+            // to all be close to each other.
+            // TODO ANIMATIONS
             _randomValue1 = (float)InterpolateLinear(StartValue, EndValue, (float)_random.NextDouble());
             _randomValue2 = (float)InterpolateLinear(StartValue, EndValue, (float)_random.NextDouble());
             _randomValue3 = (float)InterpolateLinear(StartValue, EndValue, (float)_random.NextDouble());
diff --git a/Content.Client/Light/SunShadowOverlay.cs b/Content.Client/Light/SunShadowOverlay.cs
index a296f95479..f30f4c0409 100644
--- a/Content.Client/Light/SunShadowOverlay.cs
+++ b/Content.Client/Light/SunShadowOverlay.cs
@@ -11,6 +11,8 @@ namespace Content.Client.Light;
 
 public sealed class SunShadowOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> MixShader = "Mix";
+
     public override OverlaySpace Space => OverlaySpace.BeforeLighting;
 
     [Dependency] private readonly IClyde _clyde = default!;
@@ -150,7 +152,7 @@ public sealed class SunShadowOverlay : Overlay
                         viewport.LightRenderTarget.GetWorldToLocalMatrix(eye, scale);
                     worldHandle.SetTransform(invMatrix);
 
-                    var maskShader = _protoManager.Index<ShaderPrototype>("Mix").Instance();
+                    var maskShader = _protoManager.Index(MixShader).Instance();
                     worldHandle.UseShader(maskShader);
 
                     worldHandle.DrawTextureRect(_target.Texture, worldBounds, Color.Black.WithAlpha(alpha));
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index a31e741a6a..03e80a2592 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -104,8 +104,7 @@ namespace Content.Client.Lobby.UI
 
         private bool _isDirty;
 
-        [ValidatePrototypeId<GuideEntryPrototype>]
-        private const string DefaultSpeciesGuidebook = "Species";
+        private static readonly ProtoId<GuideEntryPrototype> DefaultSpeciesGuidebook = "Species";
 
         public event Action<List<ProtoId<GuideEntryPrototype>>>? OnOpenGuidebook;
 
@@ -810,9 +809,9 @@ namespace Content.Client.Lobby.UI
             var species = Profile?.Species ?? SharedHumanoidAppearanceSystem.DefaultSpecies;
             var page = DefaultSpeciesGuidebook;
             if (_prototypeManager.HasIndex<GuideEntryPrototype>(species))
-                page = species;
+                page = new ProtoId<GuideEntryPrototype>(species.Id); // Gross. See above todo comment.
 
-            if (_prototypeManager.TryIndex<GuideEntryPrototype>(DefaultSpeciesGuidebook, out var guideRoot))
+            if (_prototypeManager.TryIndex(DefaultSpeciesGuidebook, out var guideRoot))
             {
                 var dict = new Dictionary<ProtoId<GuideEntryPrototype>, GuideEntry>();
                 dict.Add(DefaultSpeciesGuidebook, guideRoot);
@@ -1464,17 +1463,13 @@ namespace Content.Client.Lobby.UI
             {
                 return;
             }
-            var hairMarking = Profile.Appearance.HairStyleId switch
-            {
-                HairStyles.DefaultHairStyle => new List<Marking>(),
-                _ => new() { new(Profile.Appearance.HairStyleId, new List<Color>() { Profile.Appearance.HairColor }) },
-            };
+            var hairMarking = Profile.Appearance.HairStyleId == HairStyles.DefaultHairStyle
+                ? new List<Marking>()
+                : new() { new(Profile.Appearance.HairStyleId, new List<Color>() { Profile.Appearance.HairColor }) };
 
-            var facialHairMarking = Profile.Appearance.FacialHairStyleId switch
-            {
-                HairStyles.DefaultFacialHairStyle => new List<Marking>(),
-                _ => new() { new(Profile.Appearance.FacialHairStyleId, new List<Color>() { Profile.Appearance.FacialHairColor }) },
-            };
+            var facialHairMarking = Profile.Appearance.FacialHairStyleId == HairStyles.DefaultFacialHairStyle
+                ? new List<Marking>()
+                : new() { new(Profile.Appearance.FacialHairStyleId, new List<Color>() { Profile.Appearance.FacialHairColor }) };
 
             HairStylePicker.UpdateData(
                 hairMarking,
diff --git a/Content.Client/Mapping/MappingOverlay.cs b/Content.Client/Mapping/MappingOverlay.cs
index ed44b43d52..e461440996 100644
--- a/Content.Client/Mapping/MappingOverlay.cs
+++ b/Content.Client/Mapping/MappingOverlay.cs
@@ -11,6 +11,8 @@ namespace Content.Client.Mapping;
 
 public sealed class MappingOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
     [Dependency] private readonly IEntityManager _entities = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IPrototypeManager _prototypes = default!;
@@ -35,7 +37,7 @@ public sealed class MappingOverlay : Overlay
         _sprite = _entities.System<SpriteSystem>();
 
         _state = state;
-        _shader = _prototypes.Index<ShaderPrototype>("unshaded").Instance();
+        _shader = _prototypes.Index(UnshadedShader).Instance();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Movement/Systems/FloorOcclusionSystem.cs b/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
index 44573f8e08..6520d98ac9 100644
--- a/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
+++ b/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
@@ -8,6 +8,8 @@ namespace Content.Client.Movement.Systems;
 
 public sealed class FloorOcclusionSystem : SharedFloorOcclusionSystem
 {
+    private static readonly ProtoId<ShaderPrototype> HorizontalCut = "HorizontalCut";
+
     [Dependency] private readonly IPrototypeManager _proto = default!;
 
     private EntityQuery<SpriteComponent> _spriteQuery;
@@ -48,7 +50,7 @@ public sealed class FloorOcclusionSystem : SharedFloorOcclusionSystem
         if (!_spriteQuery.Resolve(sprite.Owner, ref sprite.Comp, false))
             return;
 
-        var shader = _proto.Index<ShaderPrototype>("HorizontalCut").Instance();
+        var shader = _proto.Index(HorizontalCut).Instance();
 
         if (sprite.Comp.PostShader is not null && sprite.Comp.PostShader != shader)
             return;
diff --git a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
index 8f519e61ac..9828222447 100644
--- a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
+++ b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
@@ -23,8 +23,7 @@ public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem
     [Dependency] private readonly ActionsSystem _actions = default!;
     [Dependency] private readonly IInputManager _inputManager = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string Action = "ActionClearNetworkLinkOverlays";
+    private static readonly EntProtoId Action = "ActionClearNetworkLinkOverlays";
 
     public override void Initialize()
     {
diff --git a/Content.Client/Options/UI/EscapeMenu.xaml b/Content.Client/Options/UI/EscapeMenu.xaml
index 71da231f29..6aa14f27e7 100644
--- a/Content.Client/Options/UI/EscapeMenu.xaml
+++ b/Content.Client/Options/UI/EscapeMenu.xaml
@@ -6,13 +6,16 @@
             Resizable="False">
 
     <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150">
-        <changelog:ChangelogButton Access="Public" Name="ChangelogButton"/>
         <ui:VoteCallMenuButton />
-        <Button Access="Public" Name="OptionsButton" Text="{Loc 'ui-escape-options'}" />
+        <PanelContainer StyleClasses="LowDivider" Margin="0 2.5 0 2.5" />
         <Button Access="Public" Name="RulesButton" Text="{Loc 'ui-escape-rules'}" />
         <Button Access="Public" Name="GuidebookButton" Text="{Loc 'ui-escape-guidebook'}" />
         <Button Access="Public" Name="WikiButton" Text="{Loc 'ui-escape-wiki'}" />
+        <changelog:ChangelogButton Access="Public" Name="ChangelogButton" />
+        <PanelContainer StyleClasses="LowDivider" Margin="0 2.5 0 2.5" />
+        <Button Access="Public" Name="OptionsButton" Text="{Loc 'ui-escape-options'}" />
+        <PanelContainer StyleClasses="LowDivider" Margin="0 2.5 0 2.5" />
         <Button Access="Public" Name="DisconnectButton" Text="{Loc 'ui-escape-disconnect'}" />
-        <Button Access="Public" Name="QuitButton" Text="{Loc 'ui-escape-quit'}" />
+        <Button Access="Public" Name="QuitButton" Text="{Loc 'ui-escape-quit'}" StyleClasses="ButtonColorRed" />
     </BoxContainer>
 </ui1:EscapeMenu>
diff --git a/Content.Client/Outline/TargetOutlineSystem.cs b/Content.Client/Outline/TargetOutlineSystem.cs
index 0d9b9787ae..73d45a17a9 100644
--- a/Content.Client/Outline/TargetOutlineSystem.cs
+++ b/Content.Client/Outline/TargetOutlineSystem.cs
@@ -15,6 +15,9 @@ namespace Content.Client.Outline;
 /// </summary>
 public sealed class TargetOutlineSystem : EntitySystem
 {
+    private static readonly ProtoId<ShaderPrototype> ShaderTargetValid = "SelectionOutlineInrange";
+    private static readonly ProtoId<ShaderPrototype> ShaderTargetInvalid = "SelectionOutline";
+
     [Dependency] private readonly IEyeManager _eyeManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
@@ -70,12 +73,6 @@ public sealed class TargetOutlineSystem : EntitySystem
 
     private Vector2 LookupVector => new(LookupSize, LookupSize);
 
-    [ValidatePrototypeId<ShaderPrototype>]
-    private const string ShaderTargetValid = "SelectionOutlineInrange";
-
-    [ValidatePrototypeId<ShaderPrototype>]
-    private const string ShaderTargetInvalid = "SelectionOutline";
-
     private ShaderInstance? _shaderTargetValid;
     private ShaderInstance? _shaderTargetInvalid;
 
@@ -85,8 +82,8 @@ public sealed class TargetOutlineSystem : EntitySystem
     {
         base.Initialize();
 
-        _shaderTargetValid = _prototypeManager.Index<ShaderPrototype>(ShaderTargetValid).InstanceUnique();
-        _shaderTargetInvalid = _prototypeManager.Index<ShaderPrototype>(ShaderTargetInvalid).InstanceUnique();
+        _shaderTargetValid = _prototypeManager.Index(ShaderTargetValid).InstanceUnique();
+        _shaderTargetInvalid = _prototypeManager.Index(ShaderTargetInvalid).InstanceUnique();
     }
 
     public void Disable()
diff --git a/Content.Client/Overlays/BlackAndWhiteOverlay.cs b/Content.Client/Overlays/BlackAndWhiteOverlay.cs
index 785d1dad7f..251a9534a2 100644
--- a/Content.Client/Overlays/BlackAndWhiteOverlay.cs
+++ b/Content.Client/Overlays/BlackAndWhiteOverlay.cs
@@ -6,6 +6,8 @@ namespace Content.Client.Overlays;
 
 public sealed partial class BlackAndWhiteOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> Shader = "GreyscaleFullscreen";
+
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
@@ -15,7 +17,7 @@ public sealed partial class BlackAndWhiteOverlay : Overlay
     public BlackAndWhiteOverlay()
     {
         IoCManager.InjectDependencies(this);
-        _greyscaleShader = _prototypeManager.Index<ShaderPrototype>("GreyscaleFullscreen").InstanceUnique();
+        _greyscaleShader = _prototypeManager.Index(Shader).InstanceUnique();
         ZIndex = 10; // draw this over the DamageOverlay, RainbowOverlay etc.
     }
 
diff --git a/Content.Client/Overlays/NoirOverlay.cs b/Content.Client/Overlays/NoirOverlay.cs
index d2a6cbe8b3..f9e468f995 100644
--- a/Content.Client/Overlays/NoirOverlay.cs
+++ b/Content.Client/Overlays/NoirOverlay.cs
@@ -6,6 +6,8 @@ namespace Content.Client.Overlays;
 
 public sealed partial class NoirOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> Shader = "Noir";
+
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
@@ -15,7 +17,7 @@ public sealed partial class NoirOverlay : Overlay
     public NoirOverlay()
     {
         IoCManager.InjectDependencies(this);
-        _noirShader = _prototypeManager.Index<ShaderPrototype>("Noir").InstanceUnique();
+        _noirShader = _prototypeManager.Index(Shader).InstanceUnique();
         ZIndex = 9; // draw this over the DamageOverlay, RainbowOverlay etc, but before the black and white shader
     }
 
diff --git a/Content.Client/Overlays/ShowJobIconsSystem.cs b/Content.Client/Overlays/ShowJobIconsSystem.cs
index e5ba9b813f..d0d14449f6 100644
--- a/Content.Client/Overlays/ShowJobIconsSystem.cs
+++ b/Content.Client/Overlays/ShowJobIconsSystem.cs
@@ -13,8 +13,7 @@ public sealed class ShowJobIconsSystem : EquipmentHudSystem<ShowJobIconsComponen
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly AccessReaderSystem _accessReader = default!;
 
-    [ValidatePrototypeId<JobIconPrototype>]
-    private const string JobIconForNoId = "JobIconNoId";
+    private static readonly ProtoId<JobIconPrototype> JobIconForNoId = "JobIconNoId";
 
     public override void Initialize()
     {
@@ -52,7 +51,7 @@ public sealed class ShowJobIconsSystem : EquipmentHudSystem<ShowJobIconsComponen
             }
         }
 
-        if (_prototype.TryIndex<JobIconPrototype>(iconId, out var iconPrototype))
+        if (_prototype.TryIndex(iconId, out var iconPrototype))
             ev.StatusIcons.Add(iconPrototype);
         else
             Log.Error($"Invalid job icon prototype: {iconPrototype}");
diff --git a/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs b/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
index d29564caa9..a5efacc16c 100644
--- a/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
+++ b/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
@@ -45,13 +45,13 @@ public sealed partial class StencilOverlay
         }, Color.Transparent);
 
         worldHandle.SetTransform(Matrix3x2.Identity);
-        worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilMask").Instance());
+        worldHandle.UseShader(_protoManager.Index(StencilMask).Instance());
         worldHandle.DrawTextureRect(_blep!.Texture, worldBounds);
         var curTime = _timing.RealTime;
         var sprite = _sprite.GetFrame(new SpriteSpecifier.Texture(new ResPath("/Textures/Parallaxes/noise.png")), curTime);
 
         // Draw the rain
-        worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilDraw").Instance());
+        worldHandle.UseShader(_protoManager.Index(StencilDraw).Instance());
         _parallax.DrawParallax(worldHandle, worldAABB, sprite, curTime, position, new Vector2(0.5f, 0f));
     }
 }
diff --git a/Content.Client/Overlays/StencilOverlay.Weather.cs b/Content.Client/Overlays/StencilOverlay.Weather.cs
index cad81acccc..c5ccb50cf5 100644
--- a/Content.Client/Overlays/StencilOverlay.Weather.cs
+++ b/Content.Client/Overlays/StencilOverlay.Weather.cs
@@ -55,13 +55,13 @@ public sealed partial class StencilOverlay
         }, Color.Transparent);
 
         worldHandle.SetTransform(Matrix3x2.Identity);
-        worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilMask").Instance());
+        worldHandle.UseShader(_protoManager.Index(StencilMask).Instance());
         worldHandle.DrawTextureRect(_blep!.Texture, worldBounds);
         var curTime = _timing.RealTime;
         var sprite = _sprite.GetFrame(weatherProto.Sprite, curTime);
 
         // Draw the rain
-        worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilDraw").Instance());
+        worldHandle.UseShader(_protoManager.Index(StencilDraw).Instance());
         _parallax.DrawParallax(worldHandle, worldAABB, sprite, curTime, position, weatherProto.OffsetSpeed, modulate: (weatherProto.Color ?? Color.White).WithAlpha(alpha*weatherProto.Alpha)); //CP14 alpha and offset scrolling
 
         worldHandle.SetTransform(Matrix3x2.Identity);
diff --git a/Content.Client/Overlays/StencilOverlay.cs b/Content.Client/Overlays/StencilOverlay.cs
index b7b6cf23c9..561488e550 100644
--- a/Content.Client/Overlays/StencilOverlay.cs
+++ b/Content.Client/Overlays/StencilOverlay.cs
@@ -18,6 +18,10 @@ namespace Content.Client.Overlays;
 /// </summary>
 public sealed partial class StencilOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> CircleShader = "WorldGradientCircle";
+    private static readonly ProtoId<ShaderPrototype> StencilMask = "StencilMask";
+    private static readonly ProtoId<ShaderPrototype> StencilDraw = "StencilDraw";
+
     [Dependency] private readonly IClyde _clyde = default!;
     [Dependency] private readonly IEntityManager _entManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
@@ -44,7 +48,7 @@ public sealed partial class StencilOverlay : Overlay
         _sprite = sprite;
         _weather = weather;
         IoCManager.InjectDependencies(this);
-        _shader = _protoManager.Index<ShaderPrototype>("WorldGradientCircle").InstanceUnique();
+        _shader = _protoManager.Index(CircleShader).InstanceUnique();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Paper/UI/StampLabel.xaml.cs b/Content.Client/Paper/UI/StampLabel.xaml.cs
index be6d52baea..1750110c4c 100644
--- a/Content.Client/Paper/UI/StampLabel.xaml.cs
+++ b/Content.Client/Paper/UI/StampLabel.xaml.cs
@@ -10,6 +10,8 @@ namespace Content.Client.Paper.UI;
 [GenerateTypedNameReferences]
 public sealed partial class StampLabel : Label
 {
+    private static readonly ProtoId<ShaderPrototype> PaperStamp = "PaperStamp";
+
     /// A scale that's applied to the text to ensure it
     /// fits in the allowed space.
     private Vector2 _textScaling = Vector2.One;
@@ -26,7 +28,7 @@ public sealed partial class StampLabel : Label
         RobustXamlLoader.Load(this);
 
         var prototypes = IoCManager.Resolve<IPrototypeManager>();
-        _stampShader = prototypes.Index<ShaderPrototype>("PaperStamp").InstanceUnique();
+        _stampShader = prototypes.Index(PaperStamp).InstanceUnique();
     }
 
     protected override Vector2 MeasureOverride(Vector2 availableSize)
diff --git a/Content.Client/Paper/UI/StampWidget.xaml.cs b/Content.Client/Paper/UI/StampWidget.xaml.cs
index 487e0732b4..a462d40e69 100644
--- a/Content.Client/Paper/UI/StampWidget.xaml.cs
+++ b/Content.Client/Paper/UI/StampWidget.xaml.cs
@@ -12,6 +12,8 @@ namespace Content.Client.Paper.UI;
 [GenerateTypedNameReferences]
 public sealed partial class StampWidget : PanelContainer
 {
+    private static readonly ProtoId<ShaderPrototype> PaperStamp = "PaperStamp";
+
     private StyleBoxTexture _borderTexture;
     private ShaderInstance? _stampShader;
 
@@ -42,7 +44,7 @@ public sealed partial class StampWidget : PanelContainer
         PanelOverride = _borderTexture;
 
         var prototypes = IoCManager.Resolve<IPrototypeManager>();
-        _stampShader = prototypes.Index<ShaderPrototype>("PaperStamp").InstanceUnique();
+        _stampShader = prototypes.Index(PaperStamp).InstanceUnique();
     }
 
     protected override void Draw(DrawingHandleScreen handle)
diff --git a/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs b/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs
index 845f631de8..911f655c6d 100644
--- a/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs
+++ b/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs
@@ -195,7 +195,6 @@ public sealed class GeneratedParallaxCache : IPostInjectInit
         public required ResPath ConfigPath;
         public required Task<Texture> LoadTask;
         public required CancellationTokenSource CancellationSource;
-        public ValueList<CancellationTokenRegistration> CancelRegistrations;
 
         public int RefCount;
     }
diff --git a/Content.Client/Parallax/ParallaxSystem.cs b/Content.Client/Parallax/ParallaxSystem.cs
index 465bc9cef4..7fed53782a 100644
--- a/Content.Client/Parallax/ParallaxSystem.cs
+++ b/Content.Client/Parallax/ParallaxSystem.cs
@@ -14,8 +14,7 @@ public sealed class ParallaxSystem : SharedParallaxSystem
     [Dependency] private readonly IParallaxManager _parallax = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
 
-    [ValidatePrototypeId<ParallaxPrototype>]
-    private const string Fallback = "Default";
+    private static readonly ProtoId<ParallaxPrototype> Fallback = "Default";
 
     public const int ParallaxZIndex = 0;
 
diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs
index cc5016c4a7..27a585119e 100644
--- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs
@@ -262,6 +262,7 @@ public sealed partial class ParticleAcceleratorControlMenu : FancyWindow
 
 public sealed class PASegmentControl : Control
 {
+    private static readonly ProtoId<ShaderPrototype> GreyscaleShaderId = "Greyscale";
     private readonly ShaderInstance _greyScaleShader;
     private readonly TextureRect _base;
     private readonly TextureRect _unlit;
@@ -272,7 +273,7 @@ public sealed class PASegmentControl : Control
 
     public PASegmentControl()
     {
-        _greyScaleShader = IoCManager.Resolve<IPrototypeManager>().Index<ShaderPrototype>("Greyscale").Instance();
+        _greyScaleShader = IoCManager.Resolve<IPrototypeManager>().Index(GreyscaleShaderId).Instance();
 
         AddChild(_base = new TextureRect());
         AddChild(_unlit = new TextureRect());
diff --git a/Content.Client/Popups/PopupOverlay.cs b/Content.Client/Popups/PopupOverlay.cs
index cf22c8bbd5..3b3e9cd463 100644
--- a/Content.Client/Popups/PopupOverlay.cs
+++ b/Content.Client/Popups/PopupOverlay.cs
@@ -16,6 +16,8 @@ namespace Content.Client.Popups;
 /// </summary>
 public sealed class PopupOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
     private readonly IConfigurationManager _configManager;
     private readonly IEntityManager _entManager;
     private readonly IPlayerManager _playerMgr;
@@ -48,7 +50,7 @@ public sealed class PopupOverlay : Overlay
         _popup = popup;
         _controller = controller;
 
-        _shader = protoManager.Index<ShaderPrototype>("unshaded").Instance();
+        _shader = protoManager.Index(UnshadedShader).Instance();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Power/EntitySystems/StaticPowerSystem.cs b/Content.Client/Power/EntitySystems/StaticPowerSystem.cs
index 2ca945cbbd..f803b92067 100644
--- a/Content.Client/Power/EntitySystems/StaticPowerSystem.cs
+++ b/Content.Client/Power/EntitySystems/StaticPowerSystem.cs
@@ -9,7 +9,7 @@ public static class StaticPowerSystem
     public static bool IsPowered(this EntitySystem system, EntityUid uid, IEntityManager entManager, ApcPowerReceiverComponent? receiver = null)
     {
         if (receiver == null && !entManager.TryGetComponent(uid, out receiver))
-            return false;
+            return true;
 
         return receiver.Powered;
     }
diff --git a/Content.Client/Power/Generation/Teg/TegSystem.cs b/Content.Client/Power/Generation/Teg/TegSystem.cs
index 92b5062b6d..0ae1b5e496 100644
--- a/Content.Client/Power/Generation/Teg/TegSystem.cs
+++ b/Content.Client/Power/Generation/Teg/TegSystem.cs
@@ -15,8 +15,7 @@ namespace Content.Client.Power.Generation.Teg;
 /// <seealso cref="TegCirculatorComponent"/>
 public sealed class TegSystem : EntitySystem
 {
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string ArrowPrototype = "TegCirculatorArrow";
+    private static readonly EntProtoId ArrowPrototype = "TegCirculatorArrow";
 
     public override void Initialize()
     {
diff --git a/Content.Client/PowerCell/PowerCellSystem.cs b/Content.Client/PowerCell/PowerCellSystem.cs
index fb40b911d1..8d9dd5ebdd 100644
--- a/Content.Client/PowerCell/PowerCellSystem.cs
+++ b/Content.Client/PowerCell/PowerCellSystem.cs
@@ -48,8 +48,9 @@ public sealed class PowerCellSystem : SharedPowerCellSystem
         if (!_sprite.LayerExists((uid, args.Sprite), PowerCellVisualLayers.Unshaded))
             return;
 
+        // If no appearance data is set, rely on whatever existing sprite state is set being correct.
         if (!_appearance.TryGetData<byte>(uid, PowerCellVisuals.ChargeLevel, out var level, args.Component))
-            level = 0;
+            return;
 
         var positiveCharge = level > 0;
         _sprite.LayerSetVisible((uid, args.Sprite), PowerCellVisualLayers.Unshaded, positiveCharge);
diff --git a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
index d6e36dd0ad..4cbeaa52f5 100644
--- a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
+++ b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
@@ -13,6 +13,8 @@ namespace Content.Client.Radiation.Overlays
 {
     public sealed class RadiationPulseOverlay : Overlay
     {
+        private static readonly ProtoId<ShaderPrototype> RadiationShader = "Radiation";
+
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
@@ -29,7 +31,7 @@ namespace Content.Client.Radiation.Overlays
         public RadiationPulseOverlay()
         {
             IoCManager.InjectDependencies(this);
-            _baseShader = _prototypeManager.Index<ShaderPrototype>("Radiation").Instance().Duplicate();
+            _baseShader = _prototypeManager.Index(RadiationShader).Instance().Duplicate();
         }
 
         protected override bool BeforeDraw(in OverlayDrawArgs args)
diff --git a/Content.Client/Shuttles/FtlArrivalOverlay.cs b/Content.Client/Shuttles/FtlArrivalOverlay.cs
index f24a1e9648..185d26f333 100644
--- a/Content.Client/Shuttles/FtlArrivalOverlay.cs
+++ b/Content.Client/Shuttles/FtlArrivalOverlay.cs
@@ -14,6 +14,8 @@ namespace Content.Client.Shuttles;
 /// </summary>
 public sealed class FtlArrivalOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowEntities;
 
     private EntityLookupSystem _lookups;
@@ -36,7 +38,7 @@ public sealed class FtlArrivalOverlay : Overlay
         _maps = _entManager.System<SharedMapSystem>();
         _sprites = _entManager.System<SpriteSystem>();
 
-        _shader = _protos.Index<ShaderPrototype>("unshaded").Instance();
+        _shader = _protos.Index(UnshadedShader).Instance();
     }
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)
diff --git a/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs b/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs
index e1fbd376b5..be59b07b65 100644
--- a/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs
+++ b/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs
@@ -25,7 +25,6 @@ public sealed partial class BorgSelectTypeMenu : FancyWindow
 
     public event Action<ProtoId<BorgTypePrototype>>? ConfirmedBorgType;
 
-    [ValidatePrototypeId<GuideEntryPrototype>]
     private static readonly List<ProtoId<GuideEntryPrototype>> GuidebookEntries = new() { "Cyborgs", "Robotics" };
 
     public BorgSelectTypeMenu()
diff --git a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
index bb0dba2f57..245ea194f0 100644
--- a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
+++ b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
@@ -84,12 +84,13 @@ public sealed partial class LawDisplay : Control
 
             radioChannelButton.OnPressed += _ =>
             {
-                switch (radioChannel)
+                if (radioChannel == SharedChatSystem.CommonChannel)
                 {
-                    case SharedChatSystem.CommonChannel:
-                        _chatManager.SendMessage($"{SharedChatSystem.RadioCommonPrefix} {lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Radio); break;
-                    default:
-                        _chatManager.SendMessage($"{SharedChatSystem.RadioChannelPrefix}{radioChannelProto.KeyCode} {lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Radio); break;
+                    _chatManager.SendMessage($"{SharedChatSystem.RadioCommonPrefix} {lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Radio);
+                }
+                else
+                {
+                    _chatManager.SendMessage($"{SharedChatSystem.RadioChannelPrefix}{radioChannelProto.KeyCode} {lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Radio);
                 }
                 _nextAllowedPress[radioChannelButton] = _timing.CurTime + PressCooldown;
             };
diff --git a/Content.Client/Silicons/StationAi/StationAiOverlay.cs b/Content.Client/Silicons/StationAi/StationAiOverlay.cs
index 15a8a3a63f..5c84ce0c93 100644
--- a/Content.Client/Silicons/StationAi/StationAiOverlay.cs
+++ b/Content.Client/Silicons/StationAi/StationAiOverlay.cs
@@ -12,6 +12,10 @@ namespace Content.Client.Silicons.StationAi;
 
 public sealed class StationAiOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> CameraStaticShader = "CameraStatic";
+    private static readonly ProtoId<ShaderPrototype> StencilMaskShader = "StencilMask";
+    private static readonly ProtoId<ShaderPrototype> StencilDrawShader = "StencilDraw";
+
     [Dependency] private readonly IClyde _clyde = default!;
     [Dependency] private readonly IEntityManager _entManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
@@ -91,7 +95,7 @@ public sealed class StationAiOverlay : Overlay
             () =>
             {
                 worldHandle.SetTransform(invMatrix);
-                var shader = _proto.Index<ShaderPrototype>("CameraStatic").Instance();
+                var shader = _proto.Index(CameraStaticShader).Instance();
                 worldHandle.UseShader(shader);
                 worldHandle.DrawRect(worldBounds, Color.White);
             },
@@ -114,11 +118,11 @@ public sealed class StationAiOverlay : Overlay
         }
 
         // Use the lighting as a mask
-        worldHandle.UseShader(_proto.Index<ShaderPrototype>("StencilMask").Instance());
+        worldHandle.UseShader(_proto.Index(StencilMaskShader).Instance());
         worldHandle.DrawTextureRect(_stencilTexture!.Texture, worldBounds);
 
         // Draw the static
-        worldHandle.UseShader(_proto.Index<ShaderPrototype>("StencilDraw").Instance());
+        worldHandle.UseShader(_proto.Index(StencilDrawShader).Instance());
         worldHandle.DrawTextureRect(_staticTexture!.Texture, worldBounds);
 
         worldHandle.SetTransform(Matrix3x2.Identity);
diff --git a/Content.Client/Singularity/SingularityOverlay.cs b/Content.Client/Singularity/SingularityOverlay.cs
index e71b6e96b8..39b0758bf1 100644
--- a/Content.Client/Singularity/SingularityOverlay.cs
+++ b/Content.Client/Singularity/SingularityOverlay.cs
@@ -9,6 +9,8 @@ namespace Content.Client.Singularity
 {
     public sealed class SingularityOverlay : Overlay, IEntityEventSubscriber
     {
+        private static readonly ProtoId<ShaderPrototype> Shader = "Singularity";
+
         [Dependency] private readonly IEntityManager _entMan = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         private SharedTransformSystem? _xformSystem = null;
@@ -29,7 +31,7 @@ namespace Content.Client.Singularity
         public SingularityOverlay()
         {
             IoCManager.InjectDependencies(this);
-            _shader = _prototypeManager.Index<ShaderPrototype>("Singularity").Instance().Duplicate();
+            _shader = _prototypeManager.Index(Shader).Instance().Duplicate();
             _shader.SetParameter("maxDistance", MaxDistance * EyeManager.PixelsPerMeter);
             _entMan.EventBus.SubscribeEvent<PixelToMapEvent>(EventSource.Local, this, OnProjectFromScreenToMap);
             ZIndex = 101; // Should be drawn after the placement overlay so admins placing items near the singularity can tell where they're going.
diff --git a/Content.Client/SprayPainter/SprayPainterSystem.cs b/Content.Client/SprayPainter/SprayPainterSystem.cs
index 6a1d27e98b..8f7d7f0362 100644
--- a/Content.Client/SprayPainter/SprayPainterSystem.cs
+++ b/Content.Client/SprayPainter/SprayPainterSystem.cs
@@ -1,56 +1,129 @@
-using Content.Shared.SprayPainter;
-using Robust.Client.Graphics;
-using Robust.Client.ResourceManagement;
-using Robust.Shared.Serialization.TypeSerializers.Implementations;
-using Robust.Shared.Utility;
 using System.Linq;
-using Robust.Shared.Graphics;
+using Content.Client.Items;
+using Content.Client.Message;
+using Content.Client.Stylesheets;
+using Content.Shared.Decals;
+using Content.Shared.SprayPainter;
+using Content.Shared.SprayPainter.Components;
+using Content.Shared.SprayPainter.Prototypes;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 
 namespace Content.Client.SprayPainter;
 
+/// <summary>
+/// Client-side spray painter functions. Caches information for spray painter windows and updates the UI to reflect component state.
+/// </summary>
 public sealed class SprayPainterSystem : SharedSprayPainterSystem
 {
-    [Dependency] private readonly IResourceCache _resourceCache = default!;
+    [Dependency] private readonly UserInterfaceSystem _ui = default!;
 
-    public List<SprayPainterEntry> Entries { get; private set; } = new();
+    public List<SprayPainterDecalEntry> Decals = [];
+    public Dictionary<string, List<string>> PaintableGroupsByCategory = new();
+    public Dictionary<string, Dictionary<string, EntProtoId>> PaintableStylesByGroup = new();
 
-    protected override void CacheStyles()
+    public override void Initialize()
     {
-        base.CacheStyles();
+        base.Initialize();
 
-        Entries.Clear();
-        foreach (var style in Styles)
+        Subs.ItemStatus<SprayPainterComponent>(ent => new StatusControl(ent));
+        SubscribeLocalEvent<SprayPainterComponent, AfterAutoHandleStateEvent>(OnStateUpdate);
+        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
+
+        CachePrototypes();
+    }
+
+    private void OnStateUpdate(Entity<SprayPainterComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        UpdateUi(ent);
+    }
+
+    protected override void UpdateUi(Entity<SprayPainterComponent> ent)
+    {
+        if (_ui.TryGetOpenUi(ent.Owner, SprayPainterUiKey.Key, out var bui))
+            bui.Update();
+    }
+
+    private void OnPrototypesReloaded(PrototypesReloadedEventArgs args)
+    {
+        if (!args.WasModified<PaintableGroupCategoryPrototype>() || !args.WasModified<PaintableGroupPrototype>() || !args.WasModified<DecalPrototype>())
+            return;
+
+        CachePrototypes();
+    }
+
+    private void CachePrototypes()
+    {
+        PaintableGroupsByCategory.Clear();
+        PaintableStylesByGroup.Clear();
+        foreach (var category in Proto.EnumeratePrototypes<PaintableGroupCategoryPrototype>().OrderBy(x => x.ID))
         {
-            var name = style.Name;
-            string? iconPath = Groups
-              .FindAll(x => x.StylePaths.ContainsKey(name))?
-              .MaxBy(x => x.IconPriority)?.StylePaths[name];
-            if (iconPath == null)
+            var groupList = new List<string>();
+            foreach (var groupId in category.Groups)
             {
-                Entries.Add(new SprayPainterEntry(name, null));
-                continue;
+                if (!Proto.TryIndex(groupId, out var group))
+                    continue;
+
+                groupList.Add(groupId);
+                PaintableStylesByGroup[groupId] = group.Styles;
             }
 
-            RSIResource doorRsi = _resourceCache.GetResource<RSIResource>(SpriteSpecifierSerializer.TextureRoot / new ResPath(iconPath));
-            if (!doorRsi.RSI.TryGetState("closed", out var icon))
-            {
-                Entries.Add(new SprayPainterEntry(name, null));
-                continue;
-            }
+            if (groupList.Count > 0)
+                PaintableGroupsByCategory[category.ID] = groupList;
+        }
 
-            Entries.Add(new SprayPainterEntry(name, icon.Frame0));
+        Decals.Clear();
+        foreach (var decalPrototype in Proto.EnumeratePrototypes<DecalPrototype>().OrderBy(x => x.ID))
+        {
+            if (!decalPrototype.Tags.Contains("station")
+                && !decalPrototype.Tags.Contains("markings")
+                || decalPrototype.Tags.Contains("dirty"))
+                continue;
+
+            Decals.Add(new SprayPainterDecalEntry(decalPrototype.ID, decalPrototype.Sprite));
+        }
+    }
+
+    private sealed class StatusControl : Control
+    {
+        private readonly RichTextLabel _label;
+        private readonly Entity<SprayPainterComponent> _entity;
+        private DecalPaintMode? _lastPaintingDecals = null;
+
+        public StatusControl(Entity<SprayPainterComponent> ent)
+        {
+            _entity = ent;
+            _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
+            AddChild(_label);
+        }
+
+        protected override void FrameUpdate(FrameEventArgs args)
+        {
+            base.FrameUpdate(args);
+
+            if (_entity.Comp.DecalMode == _lastPaintingDecals)
+                return;
+
+            _lastPaintingDecals = _entity.Comp.DecalMode;
+
+            string modeLocString = _entity.Comp.DecalMode switch
+            {
+                DecalPaintMode.Add => "spray-painter-item-status-add",
+                DecalPaintMode.Remove => "spray-painter-item-status-remove",
+                _ => "spray-painter-item-status-off"
+            };
+
+            _label.SetMarkupPermissive(Robust.Shared.Localization.Loc.GetString("spray-painter-item-status-label",
+                ("mode", Robust.Shared.Localization.Loc.GetString(modeLocString))));
         }
     }
 }
 
-public sealed class SprayPainterEntry
-{
-    public string Name;
-    public Texture? Icon;
-
-    public SprayPainterEntry(string name, Texture? icon)
-    {
-        Name = name;
-        Icon = icon;
-    }
-}
+/// <summary>
+/// A spray paintable decal, mapped by ID.
+/// </summary>
+public sealed record SprayPainterDecalEntry(string Name, SpriteSpecifier Sprite);
diff --git a/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs b/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs
index 7d6a6cf2a5..701ec80bac 100644
--- a/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs
+++ b/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs
@@ -1,42 +1,96 @@
+using Content.Shared.Decals;
 using Content.Shared.SprayPainter;
 using Content.Shared.SprayPainter.Components;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.SprayPainter.UI;
 
-public sealed class SprayPainterBoundUserInterface : BoundUserInterface
+/// <summary>
+/// A BUI for a spray painter. Allows selecting pipe colours, decals, and paintable object types sorted by category.
+/// </summary>
+public sealed class SprayPainterBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
 {
     [ViewVariables]
     private SprayPainterWindow? _window;
 
-    public SprayPainterBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-    {
-    }
-
     protected override void Open()
     {
         base.Open();
 
-        _window = this.CreateWindow<SprayPainterWindow>();
-
-        _window.OnSpritePicked = OnSpritePicked;
-        _window.OnColorPicked = OnColorPicked;
-
-        if (EntMan.TryGetComponent(Owner, out SprayPainterComponent? comp))
+        if (_window == null)
         {
-            _window.Populate(EntMan.System<SprayPainterSystem>().Entries, comp.Index, comp.PickedColor, comp.ColorPalette);
+            _window = this.CreateWindow<SprayPainterWindow>();
+
+            _window.OnSpritePicked += OnSpritePicked;
+            _window.OnSetPipeColor += OnSetPipeColor;
+            _window.OnTabChanged += OnTabChanged;
+            _window.OnDecalChanged += OnDecalChanged;
+            _window.OnDecalColorChanged += OnDecalColorChanged;
+            _window.OnDecalAngleChanged += OnDecalAngleChanged;
+            _window.OnDecalSnapChanged += OnDecalSnapChanged;
         }
+
+        var sprayPainter = EntMan.System<SprayPainterSystem>();
+        _window.PopulateCategories(sprayPainter.PaintableStylesByGroup, sprayPainter.PaintableGroupsByCategory, sprayPainter.Decals);
+        Update();
+
+        if (EntMan.TryGetComponent(Owner, out SprayPainterComponent? sprayPainterComp))
+            _window.SetSelectedTab(sprayPainterComp.SelectedTab);
     }
 
-    private void OnSpritePicked(ItemList.ItemListSelectedEventArgs args)
+    public override void Update()
     {
-        SendMessage(new SprayPainterSpritePickedMessage(args.ItemIndex));
+        if (_window == null)
+            return;
+
+        if (!EntMan.TryGetComponent(Owner, out SprayPainterComponent? sprayPainter))
+            return;
+
+        _window.PopulateColors(sprayPainter.ColorPalette);
+        if (sprayPainter.PickedColor != null)
+            _window.SelectColor(sprayPainter.PickedColor);
+        _window.SetSelectedStyles(sprayPainter.StylesByGroup);
+        _window.SetSelectedDecal(sprayPainter.SelectedDecal);
+        _window.SetDecalAngle(sprayPainter.SelectedDecalAngle);
+        _window.SetDecalColor(sprayPainter.SelectedDecalColor);
+        _window.SetDecalSnap(sprayPainter.SnapDecals);
     }
 
-    private void OnColorPicked(ItemList.ItemListSelectedEventArgs args)
+    private void OnDecalSnapChanged(bool snap)
+    {
+        SendPredictedMessage(new SprayPainterSetDecalSnapMessage(snap));
+    }
+
+    private void OnDecalAngleChanged(int angle)
+    {
+        SendPredictedMessage(new SprayPainterSetDecalAngleMessage(angle));
+    }
+
+    private void OnDecalColorChanged(Color? color)
+    {
+        SendPredictedMessage(new SprayPainterSetDecalColorMessage(color));
+    }
+
+    private void OnDecalChanged(ProtoId<DecalPrototype> protoId)
+    {
+        SendPredictedMessage(new SprayPainterSetDecalMessage(protoId));
+    }
+
+    private void OnTabChanged(int index, bool isSelectedTabWithDecals)
+    {
+        SendPredictedMessage(new SprayPainterTabChangedMessage(index, isSelectedTabWithDecals));
+    }
+
+    private void OnSpritePicked(string group, string style)
+    {
+        SendPredictedMessage(new SprayPainterSetPaintableStyleMessage(group, style));
+    }
+
+    private void OnSetPipeColor(ItemList.ItemListSelectedEventArgs args)
     {
         var key = _window?.IndexToColorKey(args.ItemIndex);
-        SendMessage(new SprayPainterColorPickedMessage(key));
+        SendPredictedMessage(new SprayPainterSetPipeColorMessage(key));
     }
 }
diff --git a/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml b/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml
new file mode 100644
index 0000000000..0d5c8e4f16
--- /dev/null
+++ b/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml
@@ -0,0 +1,26 @@
+<controls:SprayPainterDecals
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.SprayPainter.UI">
+    <BoxContainer Orientation="Vertical">
+        <Label Text="{Loc 'spray-painter-selected-decals'}" />
+        <ScrollContainer VerticalExpand="True">
+            <GridContainer Columns="7" Name="DecalsGrid">
+                <!-- populated by code -->
+            </GridContainer>
+        </ScrollContainer>
+
+        <BoxContainer Orientation="Vertical">
+            <ColorSelectorSliders Name="ColorSelector" IsAlphaVisible="True" />
+            <CheckBox Name="UseCustomColorCheckBox" Text="{Loc 'spray-painter-use-custom-color'}" />
+            <CheckBox Name="SnapToTileCheckBox" Text="{Loc 'spray-painter-use-snap-to-tile'}" />
+        </BoxContainer>
+
+        <BoxContainer Orientation="Horizontal">
+            <Label Text="{Loc 'spray-painter-angle-rotation'}" />
+            <SpinBox Name="AngleSpinBox" HorizontalExpand="True" />
+            <Button Text="{Loc 'spray-painter-angle-rotation-90-sub'}" Name="SubAngleButton" />
+            <Button Text="{Loc 'spray-painter-angle-rotation-reset'}" Name="SetZeroAngleButton" />
+            <Button Text="{Loc 'spray-painter-angle-rotation-90-add'}" Name="AddAngleButton" />
+        </BoxContainer>
+    </BoxContainer>
+</controls:SprayPainterDecals>
diff --git a/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml.cs b/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml.cs
new file mode 100644
index 0000000000..64d1f78d3c
--- /dev/null
+++ b/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml.cs
@@ -0,0 +1,174 @@
+using System.Numerics;
+using Content.Client.Stylesheets;
+using Content.Shared.Decals;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.SprayPainter.UI;
+
+/// <summary>
+/// Used to control decal painting parameters for the spray painter.
+/// </summary>
+[GenerateTypedNameReferences]
+public sealed partial class SprayPainterDecals : Control
+{
+    public Action<ProtoId<DecalPrototype>>? OnDecalSelected;
+    public Action<Color?>? OnColorChanged;
+    public Action<int>? OnAngleChanged;
+    public Action<bool>? OnSnapChanged;
+
+    private SpriteSystem? _sprite;
+    private string _selectedDecal = string.Empty;
+    private List<SprayPainterDecalEntry> _decals = [];
+
+    public SprayPainterDecals()
+    {
+        RobustXamlLoader.Load(this);
+
+        AddAngleButton.OnButtonUp += _ => AngleSpinBox.Value += 90;
+        SubAngleButton.OnButtonUp += _ => AngleSpinBox.Value -= 90;
+        SetZeroAngleButton.OnButtonUp += _ => AngleSpinBox.Value = 0;
+        AngleSpinBox.ValueChanged += args => OnAngleChanged?.Invoke(args.Value);
+
+        UseCustomColorCheckBox.OnPressed += UseCustomColorCheckBoxOnOnPressed;
+        SnapToTileCheckBox.OnPressed += SnapToTileCheckBoxOnOnPressed;
+        ColorSelector.OnColorChanged += OnColorSelected;
+    }
+
+    private void UseCustomColorCheckBoxOnOnPressed(BaseButton.ButtonEventArgs _)
+    {
+        OnColorChanged?.Invoke(UseCustomColorCheckBox.Pressed ? ColorSelector.Color : null);
+        UpdateColorButtons(UseCustomColorCheckBox.Pressed);
+    }
+
+    private void SnapToTileCheckBoxOnOnPressed(BaseButton.ButtonEventArgs _)
+    {
+        OnSnapChanged?.Invoke(SnapToTileCheckBox.Pressed);
+    }
+
+    /// <summary>
+    /// Updates the decal list.
+    /// </summary>
+    public void PopulateDecals(List<SprayPainterDecalEntry> decals, SpriteSystem sprite)
+    {
+        _sprite ??= sprite;
+
+        _decals = decals;
+        DecalsGrid.Children.Clear();
+
+        foreach (var decal in decals)
+        {
+            var button = new TextureButton()
+            {
+                TextureNormal = sprite.Frame0(decal.Sprite),
+                Name = decal.Name,
+                ToolTip = decal.Name,
+                Scale = new Vector2(2, 2),
+            };
+            button.OnPressed += DecalButtonOnPressed;
+
+            if (UseCustomColorCheckBox.Pressed)
+            {
+                button.Modulate = ColorSelector.Color;
+            }
+
+            if (_selectedDecal == decal.Name)
+            {
+                var panelContainer = new PanelContainer()
+                {
+                    PanelOverride = new StyleBoxFlat()
+                    {
+                        BackgroundColor = StyleNano.ButtonColorDefault,
+                    },
+                    Children =
+                    {
+                        button,
+                    },
+                };
+                DecalsGrid.AddChild(panelContainer);
+            }
+            else
+            {
+                DecalsGrid.AddChild(button);
+            }
+        }
+    }
+
+    private void OnColorSelected(Color color)
+    {
+        if (!UseCustomColorCheckBox.Pressed)
+            return;
+
+        OnColorChanged?.Invoke(color);
+
+        UpdateColorButtons(UseCustomColorCheckBox.Pressed);
+    }
+
+    private void UpdateColorButtons(bool apply)
+    {
+        Color modulateColor = apply ? ColorSelector.Color : Color.White;
+        foreach (var button in DecalsGrid.Children)
+        {
+            switch (button)
+            {
+                case TextureButton:
+                    button.Modulate = modulateColor;
+                    break;
+                case PanelContainer panelContainer:
+                    {
+                        foreach (TextureButton textureButton in panelContainer.Children)
+                            textureButton.Modulate = modulateColor;
+
+                        break;
+                    }
+            }
+        }
+    }
+
+    private void DecalButtonOnPressed(BaseButton.ButtonEventArgs obj)
+    {
+        if (obj.Button.Name is not { } name)
+            return;
+
+        _selectedDecal = name;
+        OnDecalSelected?.Invoke(_selectedDecal);
+
+        if (_sprite is null)
+            return;
+
+        PopulateDecals(_decals, _sprite);
+    }
+
+    public void SetSelectedDecal(string name)
+    {
+        _selectedDecal = name;
+
+        if (_sprite is null)
+            return;
+
+        PopulateDecals(_decals, _sprite);
+    }
+
+    public void SetAngle(int degrees)
+    {
+        AngleSpinBox.OverrideValue(degrees);
+    }
+
+    public void SetColor(Color? color)
+    {
+        UseCustomColorCheckBox.Pressed = color != null;
+        if (color != null)
+            ColorSelector.Color = color.Value;
+        UpdateColorButtons(UseCustomColorCheckBox.Pressed);
+    }
+
+    public void SetSnap(bool snap)
+    {
+        SnapToTileCheckBox.Pressed = snap;
+    }
+}
diff --git a/Content.Client/SprayPainter/UI/SprayPainterGroup.xaml b/Content.Client/SprayPainter/UI/SprayPainterGroup.xaml
new file mode 100644
index 0000000000..aeb0d07158
--- /dev/null
+++ b/Content.Client/SprayPainter/UI/SprayPainterGroup.xaml
@@ -0,0 +1,12 @@
+<BoxContainer
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    Orientation="Vertical">
+    <Label Text="{Loc 'spray-painter-selected-style'}" />
+    <controls:ListContainer
+        Name="StyleList"
+        Toggle="True"
+        Group="True">
+        <!-- populated by code -->
+    </controls:ListContainer>
+</BoxContainer>
diff --git a/Content.Client/SprayPainter/UI/SprayPainterGroup.xaml.cs b/Content.Client/SprayPainter/UI/SprayPainterGroup.xaml.cs
new file mode 100644
index 0000000000..fe2f5a87af
--- /dev/null
+++ b/Content.Client/SprayPainter/UI/SprayPainterGroup.xaml.cs
@@ -0,0 +1,66 @@
+using Content.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.SprayPainter.UI;
+
+/// <summary>
+/// Used to display a group of paintable styles in the spray painter menu.
+/// (e.g. each type of paintable locker or plastic crate)
+/// </summary>
+[GenerateTypedNameReferences]
+public sealed partial class SprayPainterGroup : BoxContainer
+{
+    public event Action<SpriteListData>? OnButtonPressed;
+
+    public SprayPainterGroup()
+    {
+        RobustXamlLoader.Load(this);
+
+        StyleList.GenerateItem = GenerateItems;
+    }
+
+    public void PopulateList(List<SpriteListData> spriteList)
+    {
+        StyleList.PopulateList(spriteList);
+    }
+
+    public void SelectItemByStyle(string key)
+    {
+        foreach (var elem in StyleList.Data)
+        {
+            if (elem is not SpriteListData spriteElem)
+                continue;
+
+            if (spriteElem.Style == key)
+            {
+                StyleList.Select(spriteElem);
+                break;
+            }
+        }
+    }
+
+    private void GenerateItems(ListData data, ListContainerButton button)
+    {
+        if (data is not SpriteListData spriteListData)
+            return;
+
+        var box = new BoxContainer() { Orientation = LayoutOrientation.Horizontal };
+        var protoView = new EntityPrototypeView();
+        protoView.SetPrototype(spriteListData.Prototype);
+        var label = new Label()
+        {
+            Text = Loc.GetString($"spray-painter-style-{spriteListData.Group.ToLower()}-{spriteListData.Style.ToLower()}")
+        };
+
+        box.AddChild(protoView);
+        box.AddChild(label);
+        button.AddChild(box);
+        button.AddStyleClass(ListContainer.StyleClassListContainerButton);
+        button.OnPressed += _ => OnButtonPressed?.Invoke(spriteListData);
+
+        if (spriteListData.SelectedIndex == button.Index)
+            button.Pressed = true;
+    }
+}
diff --git a/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml b/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml
index 13e500c46c..46facb5d32 100644
--- a/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml
+++ b/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml
@@ -1,34 +1,6 @@
 <DefaultWindow xmlns="https://spacestation14.io"
-               MinSize="500 300"
-               SetSize="500 500"
-               Title="{Loc 'spray-painter-window-title'}">
-    <BoxContainer Orientation="Horizontal"
-                  HorizontalExpand="True"
-                  VerticalExpand="True"
-                  SeparationOverride="4"
-                  MinWidth="450">
-        <BoxContainer Orientation="Vertical"
-                      HorizontalExpand="True"
-                      VerticalExpand="True"
-                      SeparationOverride="4"
-                      MinWidth="200">
-            <Label Name="SelectedSpriteLabel"
-                   Text="{Loc 'spray-painter-selected-style'}">
-            </Label>
-            <ItemList Name="SpriteList"
-                      SizeFlagsStretchRatio="8"
-                      VerticalExpand="True"/>
-        </BoxContainer>
-        <BoxContainer Orientation="Vertical"
-                      HorizontalExpand="True"
-                      VerticalExpand="True"
-                      SeparationOverride="4"
-                      MinWidth="200">
-            <Label Name="SelectedColorLabel"
-                   Text="{Loc 'spray-painter-selected-color'}"/>
-            <ItemList Name="ColorList"
-                      SizeFlagsStretchRatio="8"
-                      VerticalExpand="True"/>
-        </BoxContainer>
-    </BoxContainer>
+       MinSize="520 300"
+       SetSize="520 700"
+       Title="{Loc 'spray-painter-window-title'}">
+       <TabContainer Name="Tabs"/>
 </DefaultWindow>
diff --git a/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml.cs b/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml.cs
index 4e7bdd8973..eb1218ad67 100644
--- a/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml.cs
+++ b/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml.cs
@@ -1,12 +1,19 @@
+using System.Linq;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Decals;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Client.SprayPainter.UI;
 
+/// <summary>
+/// A window to select spray painter settings by object type, as well as pipe colours and decals.
+/// </summary>
 [GenerateTypedNameReferences]
 public sealed partial class SprayPainterWindow : DefaultWindow
 {
@@ -15,13 +22,33 @@ public sealed partial class SprayPainterWindow : DefaultWindow
 
     private readonly SpriteSystem _spriteSystem;
 
-    public Action<ItemList.ItemListSelectedEventArgs>? OnSpritePicked;
-    public Action<ItemList.ItemListSelectedEventArgs>? OnColorPicked;
+    // Events
+    public event Action<string, string>? OnSpritePicked;
+    public event Action<int, bool>? OnTabChanged;
+    public event Action<ProtoId<DecalPrototype>>? OnDecalChanged;
+    public event Action<ItemList.ItemListSelectedEventArgs>? OnSetPipeColor;
+    public event Action<Color?>? OnDecalColorChanged;
+    public event Action<int>? OnDecalAngleChanged;
+    public event Action<bool>? OnDecalSnapChanged;
+
+    // Pipe color data
+    private ItemList _colorList = default!;
     public Dictionary<string, int> ItemColorIndex = new();
 
-    private Dictionary<string, Color> currentPalette = new();
-    private const string colorLocKeyPrefix = "pipe-painter-color-";
-    private List<SprayPainterEntry> CurrentEntries = new List<SprayPainterEntry>();
+    private Dictionary<string, Color> _currentPalette = new();
+    private const string ColorLocKeyPrefix = "pipe-painter-color-";
+
+    // Paintable objects
+    private Dictionary<string, Dictionary<string, EntProtoId>> _currentStylesByGroup = new();
+    private Dictionary<string, List<string>> _currentGroupsByCategory = new();
+
+    // Tab controls
+    private Dictionary<string, SprayPainterGroup> _paintableControls = new();
+    private BoxContainer? _pipeControl;
+
+    // Decals
+    private List<SprayPainterDecalEntry> _currentDecals = [];
+    private SprayPainterDecals? _sprayPainterDecals;
 
     private readonly SpriteSpecifier _colorEntryIconTexture = new SpriteSpecifier.Rsi(
         new ResPath("Structures/Piping/Atmospherics/pipe.rsi"),
@@ -32,13 +59,14 @@ public sealed partial class SprayPainterWindow : DefaultWindow
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
         _spriteSystem = _sysMan.GetEntitySystem<SpriteSystem>();
+        Tabs.OnTabChanged += (index) => OnTabChanged?.Invoke(index, _sprayPainterDecals?.GetPositionInParent() == index);
     }
 
     private string GetColorLocString(string? colorKey)
     {
         if (string.IsNullOrEmpty(colorKey))
             return Loc.GetString("pipe-painter-no-color-selected");
-        var locKey = colorLocKeyPrefix + colorKey;
+        var locKey = ColorLocKeyPrefix + colorKey;
 
         if (!_loc.TryGetString(locKey, out var locString))
             locString = colorKey;
@@ -48,51 +76,229 @@ public sealed partial class SprayPainterWindow : DefaultWindow
 
     public string? IndexToColorKey(int index)
     {
-        return (string?) ColorList[index].Metadata;
+        return _colorList[index].Text;
     }
 
-    public void Populate(List<SprayPainterEntry> entries, int selectedStyle, string? selectedColorKey, Dictionary<string, Color> palette)
+    private void OnStyleSelected(ListData data)
     {
-        // Only clear if the entries change. Otherwise the list would "jump" after selecting an item
-        if (!CurrentEntries.Equals(entries))
+        if (data is SpriteListData listData)
+            OnSpritePicked?.Invoke(listData.Group, listData.Style);
+    }
+
+    /// <summary>
+    /// Wrapper to allow for selecting/deselecting the event to avoid loops
+    /// </summary>
+    private void OnColorPicked(ItemList.ItemListSelectedEventArgs args)
+    {
+        OnSetPipeColor?.Invoke(args);
+    }
+
+    /// <summary>
+    /// Setup function for the window.
+    /// </summary>
+    /// <param name="stylesByGroup">Each group, mapped by name to the set of named styles by their associated entity prototype.</param>
+    /// <param name="groupsByCategory">The set of categories and the groups associated with them.</param>
+    /// <param name="decals">A list of each decal.</param>
+    public void PopulateCategories(Dictionary<string, Dictionary<string, EntProtoId>> stylesByGroup, Dictionary<string, List<string>> groupsByCategory, List<SprayPainterDecalEntry> decals)
+    {
+        bool tabsCleared = false;
+        var lastTab = Tabs.CurrentTab;
+
+        if (!_currentGroupsByCategory.Equals(groupsByCategory))
         {
-            CurrentEntries = entries;
-            SpriteList.Clear();
-            foreach (var entry in entries)
+            // Destroy all existing tabs
+            tabsCleared = true;
+            _paintableControls.Clear();
+            _pipeControl = null;
+            _sprayPainterDecals = null;
+            Tabs.RemoveAllChildren();
+        }
+
+        // Only clear if the entries change. Otherwise the list would "jump" after selecting an item
+        if (tabsCleared || !_currentStylesByGroup.Equals(stylesByGroup))
+        {
+            _currentStylesByGroup = stylesByGroup;
+
+            var tabIndex = 0;
+            foreach (var (categoryName, categoryGroups) in groupsByCategory.OrderBy(c => c.Key))
             {
-                SpriteList.AddItem(entry.Name, entry.Icon);
+                if (categoryGroups.Count <= 0)
+                    continue;
+
+                // Repopulating controls:
+                //      ensure that categories with multiple groups have separate subtabs
+                //      but single-group categories do not.
+                if (tabsCleared)
+                {
+                    TabContainer? subTabs = null;
+                    if (categoryGroups.Count > 1)
+                        subTabs = new();
+
+                    foreach (var group in categoryGroups)
+                    {
+                        if (!stylesByGroup.TryGetValue(group, out var styles))
+                            continue;
+
+                        var groupControl = new SprayPainterGroup();
+                        groupControl.OnButtonPressed += OnStyleSelected;
+                        _paintableControls[group] = groupControl;
+                        if (categoryGroups.Count > 1)
+                        {
+                            if (subTabs != null)
+                            {
+                                subTabs?.AddChild(groupControl);
+                                var subTabLocalization = Loc.GetString("spray-painter-tab-group-" + group.ToLower());
+                                TabContainer.SetTabTitle(groupControl, subTabLocalization);
+                            }
+                        }
+                        else
+                        {
+                            Tabs.AddChild(groupControl);
+                        }
+                    }
+
+                    if (subTabs != null)
+                        Tabs.AddChild(subTabs);
+
+                    var tabLocalization = Loc.GetString("spray-painter-tab-category-" + categoryName.ToLower());
+                    Tabs.SetTabTitle(tabIndex, tabLocalization);
+                    tabIndex++;
+                }
+
+                // Finally, populate all groups with new data.
+                foreach (var group in categoryGroups)
+                {
+                    if (!stylesByGroup.TryGetValue(group, out var styles) ||
+                        !_paintableControls.TryGetValue(group, out var control))
+                        continue;
+
+                    var dataList = styles
+                        .Select(e => new SpriteListData(group, e.Key, e.Value, 0))
+                        .OrderBy(d => Loc.GetString($"spray-painter-style-{group.ToLower()}-{d.Style.ToLower()}"))
+                        .ToList();
+                    control.PopulateList(dataList);
+                }
             }
         }
 
-        if (!currentPalette.Equals(palette))
-        {
-            currentPalette = palette;
-            ItemColorIndex.Clear();
-            ColorList.Clear();
+        PopulateColors(_currentPalette);
 
+        if (!_currentDecals.Equals(decals))
+        {
+            _currentDecals = decals;
+
+            if (_sprayPainterDecals is null)
+            {
+                _sprayPainterDecals = new SprayPainterDecals();
+
+                _sprayPainterDecals.OnDecalSelected += id => OnDecalChanged?.Invoke(id);
+                _sprayPainterDecals.OnColorChanged += color => OnDecalColorChanged?.Invoke(color);
+                _sprayPainterDecals.OnAngleChanged += angle => OnDecalAngleChanged?.Invoke(angle);
+                _sprayPainterDecals.OnSnapChanged += snap => OnDecalSnapChanged?.Invoke(snap);
+
+                Tabs.AddChild(_sprayPainterDecals);
+                TabContainer.SetTabTitle(_sprayPainterDecals, Loc.GetString("spray-painter-tab-category-decals"));
+            }
+
+            _sprayPainterDecals.PopulateDecals(decals, _spriteSystem);
+        }
+
+        if (tabsCleared)
+            SetSelectedTab(lastTab);
+    }
+
+    public void PopulateColors(Dictionary<string, Color> palette)
+    {
+        // Create pipe tab controls if they don't exist
+        bool tabCreated = false;
+        if (_pipeControl == null)
+        {
+            _pipeControl = new BoxContainer() { Orientation = BoxContainer.LayoutOrientation.Vertical };
+
+            var label = new Label() { Text = Loc.GetString("spray-painter-selected-color") };
+
+            _colorList = new ItemList() { VerticalExpand = true };
+            _colorList.OnItemSelected += OnColorPicked;
+
+            _pipeControl.AddChild(label);
+            _pipeControl.AddChild(_colorList);
+
+            Tabs.AddChild(_pipeControl);
+            TabContainer.SetTabTitle(_pipeControl, Loc.GetString("spray-painter-tab-category-pipes"));
+            tabCreated = true;
+        }
+
+        // Populate the tab if needed (new tab/new data)
+        if (tabCreated || !_currentPalette.Equals(palette))
+        {
+            _currentPalette = palette;
+            ItemColorIndex.Clear();
+            _colorList.Clear();
+
+            int index = 0;
             foreach (var color in palette)
             {
                 var locString = GetColorLocString(color.Key);
-                var item = ColorList.AddItem(locString, _spriteSystem.Frame0(_colorEntryIconTexture));
+                var item = _colorList.AddItem(locString, _spriteSystem.Frame0(_colorEntryIconTexture), metadata: color.Key);
                 item.IconModulate = color.Value;
-                item.Metadata = color.Key;
 
-                ItemColorIndex.Add(color.Key, ColorList.IndexOf(item));
+                ItemColorIndex.Add(color.Key, index);
+                index++;
             }
         }
-
-        // Disable event so we don't send a new event for pre-selectedStyle entry and end up in a loop
-
-        if (selectedColorKey != null)
-        {
-            var index = ItemColorIndex[selectedColorKey];
-            ColorList.OnItemSelected -= OnColorPicked;
-            ColorList[index].Selected = true;
-            ColorList.OnItemSelected += OnColorPicked;
-        }
-
-        SpriteList.OnItemSelected -= OnSpritePicked;
-        SpriteList[selectedStyle].Selected = true;
-        SpriteList.OnItemSelected += OnSpritePicked;
     }
+
+    # region Setters
+    public void SetSelectedStyles(Dictionary<string, string> selectedStyles)
+    {
+        foreach (var (group, style) in selectedStyles)
+        {
+            if (!_paintableControls.TryGetValue(group, out var control))
+                continue;
+
+            control.SelectItemByStyle(style);
+        }
+    }
+
+    public void SelectColor(string color)
+    {
+        if (_colorList != null && ItemColorIndex.TryGetValue(color, out var colorIdx))
+        {
+            _colorList.OnItemSelected -= OnColorPicked;
+            _colorList[colorIdx].Selected = true;
+            _colorList.OnItemSelected += OnColorPicked;
+        }
+    }
+
+    public void SetSelectedTab(int tab)
+    {
+        Tabs.CurrentTab = int.Min(tab, Tabs.ChildCount - 1);
+    }
+
+    public void SetSelectedDecal(string decal)
+    {
+        if (_sprayPainterDecals != null)
+            _sprayPainterDecals.SetSelectedDecal(decal);
+    }
+
+    public void SetDecalAngle(int angle)
+    {
+        if (_sprayPainterDecals != null)
+            _sprayPainterDecals.SetAngle(angle);
+    }
+
+    public void SetDecalColor(Color? color)
+    {
+        if (_sprayPainterDecals != null)
+            _sprayPainterDecals.SetColor(color);
+    }
+
+    public void SetDecalSnap(bool snap)
+    {
+        if (_sprayPainterDecals != null)
+            _sprayPainterDecals.SetSnap(snap);
+    }
+    # endregion
 }
+
+public record SpriteListData(string Group, string Style, EntProtoId Prototype, int SelectedIndex) : ListData;
diff --git a/Content.Client/StatusEffectNew/ClientStatusEffectsSystem.cs b/Content.Client/StatusEffectNew/ClientStatusEffectsSystem.cs
deleted file mode 100644
index e35c09190e..0000000000
--- a/Content.Client/StatusEffectNew/ClientStatusEffectsSystem.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Content.Shared.StatusEffectNew;
-using Content.Shared.StatusEffectNew.Components;
-using Robust.Shared.Collections;
-using Robust.Shared.GameStates;
-
-namespace Content.Client.StatusEffectNew;
-
-/// <inheritdoc/>
-public sealed partial class ClientStatusEffectsSystem : SharedStatusEffectsSystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<StatusEffectContainerComponent, ComponentHandleState>(OnHandleState);
-    }
-
-    private void OnHandleState(Entity<StatusEffectContainerComponent> ent, ref ComponentHandleState args)
-    {
-        if (args.Current is not StatusEffectContainerComponentState state)
-            return;
-
-        var toRemove = new ValueList<EntityUid>();
-        foreach (var effect in ent.Comp.ActiveStatusEffects)
-        {
-            if (state.ActiveStatusEffects.Contains(GetNetEntity(effect)))
-                continue;
-
-            toRemove.Add(effect);
-        }
-
-        foreach (var effect in toRemove)
-        {
-            ent.Comp.ActiveStatusEffects.Remove(effect);
-            var ev = new StatusEffectRemovedEvent(ent);
-            RaiseLocalEvent(effect, ref ev);
-        }
-
-        foreach (var effect in state.ActiveStatusEffects)
-        {
-            var effectUid = GetEntity(effect);
-            if (ent.Comp.ActiveStatusEffects.Contains(effectUid))
-                continue;
-
-            ent.Comp.ActiveStatusEffects.Add(effectUid);
-            var ev = new StatusEffectAppliedEvent(ent);
-            RaiseLocalEvent(effectUid, ref ev);
-        }
-    }
-}
diff --git a/Content.Client/StatusIcon/StatusIconOverlay.cs b/Content.Client/StatusIcon/StatusIconOverlay.cs
index aff450e657..4d3be5439c 100644
--- a/Content.Client/StatusIcon/StatusIconOverlay.cs
+++ b/Content.Client/StatusIcon/StatusIconOverlay.cs
@@ -11,6 +11,8 @@ namespace Content.Client.StatusIcon;
 
 public sealed class StatusIconOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
     [Dependency] private readonly IEntityManager _entity = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
@@ -29,7 +31,7 @@ public sealed class StatusIconOverlay : Overlay
         _sprite = _entity.System<SpriteSystem>();
         _transform = _entity.System<TransformSystem>();
         _statusIcon = _entity.System<StatusIconSystem>();
-        _unshadedShader = _prototype.Index<ShaderPrototype>("unshaded").Instance();
+        _unshadedShader = _prototype.Index(UnshadedShader).Instance();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Stealth/StealthSystem.cs b/Content.Client/Stealth/StealthSystem.cs
index 940f8f154d..5810b9bc85 100644
--- a/Content.Client/Stealth/StealthSystem.cs
+++ b/Content.Client/Stealth/StealthSystem.cs
@@ -10,6 +10,8 @@ namespace Content.Client.Stealth;
 
 public sealed class StealthSystem : SharedStealthSystem
 {
+    private static readonly ProtoId<ShaderPrototype> Shader = "Stealth";
+
     [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
     [Dependency] private readonly SpriteSystem _sprite = default!;
@@ -20,7 +22,7 @@ public sealed class StealthSystem : SharedStealthSystem
     {
         base.Initialize();
 
-        _shader = _protoMan.Index<ShaderPrototype>("Stealth").InstanceUnique();
+        _shader = _protoMan.Index(Shader).InstanceUnique();
 
         SubscribeLocalEvent<StealthComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<StealthComponent, ComponentStartup>(OnStartup);
diff --git a/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs b/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
index e6e53ae87a..c10a24ac32 100644
--- a/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
+++ b/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
@@ -1,10 +1,15 @@
+using Content.Shared.SprayPainter.Prototypes;
 using Content.Shared.Storage;
 using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Storage.Visualizers;
 
 public sealed class EntityStorageVisualizerSystem : VisualizerSystem<EntityStorageVisualsComponent>
 {
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IComponentFactory _componentFactory = default!;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -26,12 +31,34 @@ public sealed class EntityStorageVisualizerSystem : VisualizerSystem<EntityStora
         SpriteSystem.LayerSetRsiState((uid, sprite), StorageVisualLayers.Base, comp.StateBaseClosed);
     }
 
-    protected override void OnAppearanceChange(EntityUid uid, EntityStorageVisualsComponent comp, ref AppearanceChangeEvent args)
+    protected override void OnAppearanceChange(EntityUid uid,
+        EntityStorageVisualsComponent comp,
+        ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null
-        || !AppearanceSystem.TryGetData<bool>(uid, StorageVisuals.Open, out var open, args.Component))
+            || !AppearanceSystem.TryGetData<bool>(uid, StorageVisuals.Open, out var open, args.Component))
             return;
 
+        var forceRedrawBase = false;
+        if (AppearanceSystem.TryGetData<string>(uid, PaintableVisuals.Prototype, out var prototype, args.Component))
+        {
+            if (_prototypeManager.TryIndex(prototype, out var proto))
+            {
+                if (proto.TryGetComponent(out SpriteComponent? sprite, _componentFactory))
+                {
+                    SpriteSystem.SetBaseRsi((uid, args.Sprite), sprite.BaseRSI);
+                }
+                if (proto.TryGetComponent(out EntityStorageVisualsComponent? visuals, _componentFactory))
+                {
+                    comp.StateBaseOpen = visuals.StateBaseOpen;
+                    comp.StateBaseClosed = visuals.StateBaseClosed;
+                    comp.StateDoorOpen = visuals.StateDoorOpen;
+                    comp.StateDoorClosed = visuals.StateDoorClosed;
+                    forceRedrawBase = true;
+                }
+            }
+        }
+
         // Open/Closed state for the storage entity.
         if (SpriteSystem.LayerMapTryGet((uid, args.Sprite), StorageVisualLayers.Door, out _, false))
         {
@@ -52,6 +79,8 @@ public sealed class EntityStorageVisualizerSystem : VisualizerSystem<EntityStora
 
                 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
             {
@@ -68,6 +97,8 @@ public sealed class EntityStorageVisualizerSystem : VisualizerSystem<EntityStora
 
                 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/Store/Ui/StoreListingControl.xaml b/Content.Client/Store/Ui/StoreListingControl.xaml
index 3142f1cb06..b779672726 100644
--- a/Content.Client/Store/Ui/StoreListingControl.xaml
+++ b/Content.Client/Store/Ui/StoreListingControl.xaml
@@ -1,24 +1,28 @@
 <Control xmlns="https://spacestation14.io">
-    <BoxContainer Margin="8,8,8,8" Orientation="Vertical">
+    <BoxContainer Margin="8,0,8,8" Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
             <Label Name="StoreItemName" HorizontalExpand="True" />
-            <Label Name="DiscountSubText"
-                   HorizontalAlignment="Right"/>
-            <Button
-                Name="StoreItemBuyButton"
-                MinWidth="64"
-                HorizontalAlignment="Right"
-                Access="Public" />
         </BoxContainer>
-        <PanelContainer StyleClasses="HighDivider" />
+        <PanelContainer StyleClasses="HighDivider" Margin="0,1,0,2"/>
         <BoxContainer HorizontalExpand="True" Orientation="Horizontal">
-            <TextureRect
-                Name="StoreItemTexture"
-                Margin="0,0,4,0"
-                MinSize="48 48"
-                Stretch="KeepAspectCentered" />
-            <Control MinWidth="5"/>
-            <RichTextLabel Name="StoreItemDescription" />
+            <BoxContainer Orientation="Vertical" VerticalAlignment="Center" Margin="0,0,4,0">
+                <TextureRect
+                    Name="StoreItemTexture"
+                    Margin="0,0,4,0"
+                    MinSize="48 48"
+                    Stretch="KeepAspectCentered" />
+                <Button
+                    Name="StoreItemBuyButton"
+                    MinWidth="48"
+                    MaxHeight="48"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    Margin="0,4,0,0"
+                    Access="Public" />
+                <Label Name="DiscountSubText"
+                       HorizontalAlignment="Center"/>
+            </BoxContainer>
+            <RichTextLabel Name="StoreItemDescription" VerticalAlignment="Top"/>
         </BoxContainer>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Stunnable/StunSystem.cs b/Content.Client/Stunnable/StunSystem.cs
index e519a0d5f0..cb59eda482 100644
--- a/Content.Client/Stunnable/StunSystem.cs
+++ b/Content.Client/Stunnable/StunSystem.cs
@@ -1,9 +1,164 @@
+using System.Numerics;
+using Content.Shared.Mobs;
 using Content.Shared.Stunnable;
+using Robust.Client.Animations;
+using Robust.Client.GameObjects;
+using Robust.Shared.Animations;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 
-namespace Content.Client.Stunnable
+namespace Content.Client.Stunnable;
+
+public sealed class StunSystem : SharedStunSystem
 {
-    public sealed class StunSystem : SharedStunSystem
-    {
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SpriteSystem _spriteSystem = default!;
 
+    private readonly int[] _sign = [-1, 1];
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<StunVisualsComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<StunVisualsComponent, AppearanceChangeEvent>(OnAppearanceChanged);
+    }
+
+    /// <summary>
+    ///     Add stun visual layers
+    /// </summary>
+    private void OnComponentInit(Entity<StunVisualsComponent> entity, ref ComponentInit args)
+    {
+        if (!TryComp<SpriteComponent>(entity, out var sprite))
+            return;
+
+        var spriteEntity = (entity.Owner, sprite);
+
+        _spriteSystem.LayerMapReserve(spriteEntity, StunVisualLayers.StamCrit);
+        _spriteSystem.LayerSetVisible(spriteEntity, StunVisualLayers.StamCrit, false);
+        _spriteSystem.LayerSetOffset(spriteEntity, StunVisualLayers.StamCrit, new Vector2(0, 0.3125f));
+
+        _spriteSystem.LayerSetRsi(spriteEntity, StunVisualLayers.StamCrit, entity.Comp.StarsPath);
+
+        UpdateAppearance((entity, sprite), entity.Comp.State);
+    }
+
+    private void OnAppearanceChanged(Entity<StunVisualsComponent> entity, ref AppearanceChangeEvent args)
+    {
+        if (args.Sprite != null)
+            UpdateAppearance((entity, args.Sprite), entity.Comp.State);
+    }
+
+    private void UpdateAppearance(Entity<SpriteComponent?> entity, string state)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return;
+
+        if (!_spriteSystem.LayerMapTryGet((entity, entity.Comp), StunVisualLayers.StamCrit, out var index, false))
+            return;
+
+        var visible = Appearance.TryGetData<bool>(entity, StunVisuals.SeeingStars, out var stars) && stars;
+
+        _spriteSystem.LayerSetVisible((entity, entity.Comp), index, visible);
+        _spriteSystem.LayerSetRsiState((entity, entity.Comp), index, state);
+    }
+
+    /// <summary>
+    /// A simple fatigue animation, a mild modification of the jittering animation. The animation constructor is
+    /// quite complex, but that's because the AnimationSystem doesn't have proper adjustment layers. In a potential
+    /// future where proper adjustment layers are added feel free to clean this up to be an animation with two adjustment
+    /// layers rather than one mega layer.
+    /// </summary>
+    /// <param name="sprite">The spriteComponent we're adjusting the offset of</param>
+    /// <param name="frequency">How many times per second does the animation run?</param>
+    /// <param name="jitters">How many times should we jitter during the animation? Also determines breathing frequency</param>
+    /// <param name="minJitter">Mininum jitter offset multiplier for X and Y directions</param>
+    /// <param name="maxJitter">Maximum jitter offset multiplier for X and Y directions</param>
+    /// <param name="breathing">Maximum breathing offset, this is in the Y direction</param>
+    /// <param name="startOffset">Starting offset because we don't have adjustment layers</param>
+    /// <param name="lastJitter">Last jitter so we don't jitter to the same quadrant</param>
+    /// <returns></returns>
+    public Animation GetFatigueAnimation(SpriteComponent sprite,
+        float frequency,
+        int jitters,
+        Vector2 minJitter,
+        Vector2 maxJitter,
+        float breathing,
+        Vector2 startOffset,
+        ref Vector2 lastJitter)
+    {
+        // avoid animations with negative length or infinite length
+        if (frequency <= 0)
+            return new Animation();
+
+        var breaths = new Vector2(0, breathing * 2) / jitters;
+
+        var length =  1 / frequency;
+        var frames = length / jitters;
+
+        var keyFrames = new List<AnimationTrackProperty.KeyFrame> { new(sprite.Offset, 0f) };
+
+        // Spits out a list of keyframes to feed to the AnimationPlayer based on the variables we've inputted
+        for (var i = 1; i <= jitters; i++)
+        {
+            var offset = new Vector2(_random.NextFloat(minJitter.X, maxJitter.X),
+                _random.NextFloat(minJitter.Y, maxJitter.Y));
+            offset.X *= _random.Pick(_sign);
+            offset.Y *= _random.Pick(_sign);
+
+            if (i == 1 && Math.Sign(offset.X) == Math.Sign(lastJitter.X)
+                       && Math.Sign(offset.Y) == Math.Sign(lastJitter.Y))
+            {
+                // If the sign is the same as last time on both axis we flip one randomly
+                // to avoid jitter staying in one quadrant too much.
+                if (_random.Prob(0.5f))
+                    offset.X *= -1;
+                else
+                    offset.Y *= -1;
+            }
+
+            lastJitter = offset;
+
+            // For the first half of the jitter, we vertically displace the sprite upwards to simulate breathing in
+            if (i <= jitters / 2)
+            {
+                keyFrames.Add(new AnimationTrackProperty.KeyFrame(startOffset + breaths * i + offset, frames));
+            }
+            // For the next quarter we displace the sprite down, to about 12.5% breathing offset below our starting position
+            // Simulates breathing out
+            else if (i < jitters * 3 / 4)
+            {
+                keyFrames.Add(
+                    new AnimationTrackProperty.KeyFrame(startOffset + breaths * ( jitters - i * 1.5f ) + offset, frames));
+            }
+            // Return to our starting position for breathing, jitter reaches its final position
+            else
+            {
+                keyFrames.Add(
+                    new AnimationTrackProperty.KeyFrame(startOffset + breaths * ( i - jitters ) + offset, frames));
+            }
+        }
+
+        return new Animation
+        {
+            Length = TimeSpan.FromSeconds(length),
+            AnimationTracks =
+            {
+                new AnimationTrackComponentProperty
+                {
+                    // Heavy Breathing
+                    ComponentType = typeof(SpriteComponent),
+                    Property = nameof(SpriteComponent.Offset),
+                    InterpolationMode = AnimationInterpolationMode.Cubic,
+                    KeyFrames = keyFrames,
+                },
+            }
+        };
     }
 }
+
+public enum StunVisualLayers : byte
+{
+    StamCrit,
+}
diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
index 0fbaf858da..ac82fbff59 100644
--- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
+++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
@@ -17,6 +17,8 @@ namespace Content.Client.SurveillanceCamera.UI;
 [GenerateTypedNameReferences]
 public sealed partial class SurveillanceCameraMonitorWindow : DefaultWindow
 {
+    private static readonly ProtoId<ShaderPrototype> CameraStaticShader = "CameraStatic";
+
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IResourceCache _resourceCache = default!;
 
@@ -53,7 +55,7 @@ public sealed partial class SurveillanceCameraMonitorWindow : DefaultWindow
 
         // This could be done better. I don't want to deal with stylesheets at the moment.
         var texture = _resourceCache.GetTexture("/Textures/Interface/Nano/square_black.png");
-        var shader = _prototypeManager.Index<ShaderPrototype>("CameraStatic").Instance().Duplicate();
+        var shader = _prototypeManager.Index(CameraStaticShader).Instance().Duplicate();
 
         CameraView.ViewportSize = new Vector2i(500, 500);
         CameraView.Eye = _defaultEye; // sure
diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupWindow.xaml.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupWindow.xaml.cs
index a7feb9db54..1c8568b2bd 100644
--- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupWindow.xaml.cs
+++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupWindow.xaml.cs
@@ -38,7 +38,7 @@ public sealed partial class SurveillanceCameraSetupWindow : DefaultWindow
     }
 
     // Pass in a list of frequency prototype IDs.
-    public void LoadAvailableNetworks(uint currentNetwork, List<string> networks)
+    public void LoadAvailableNetworks(uint currentNetwork, List<ProtoId<DeviceFrequencyPrototype>> networks)
     {
         NetworkSelector.Clear();
 
diff --git a/Content.Client/UserInterface/RichText/MonoTag.cs b/Content.Client/UserInterface/RichText/MonoTag.cs
index aee41c324a..d97997dc83 100644
--- a/Content.Client/UserInterface/RichText/MonoTag.cs
+++ b/Content.Client/UserInterface/RichText/MonoTag.cs
@@ -12,7 +12,7 @@ namespace Content.Client.UserInterface.RichText;
 /// </summary>
 public sealed class MonoTag : IMarkupTag
 {
-    [ValidatePrototypeId<FontPrototype>] public const string MonoFont = "Monospace";
+    public static readonly ProtoId<FontPrototype> MonoFont = "Monospace";
 
     [Dependency] private readonly IResourceCache _resourceCache = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 13c6ff4a2a..e324429859 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -67,8 +67,7 @@ public sealed partial class ChatUIController : UIController
     [UISystemDependency] private readonly MindSystem? _mindSystem = default!;
     [UISystemDependency] private readonly RoleCodewordSystem? _roleCodewordSystem = default!;
 
-    [ValidatePrototypeId<ColorPalettePrototype>]
-    private const string ChatNamePalette = "ChatNames";
+    private static readonly ProtoId<ColorPalettePrototype> ChatNamePalette = "ChatNames";
     private string[] _chatNameColors = default!;
     private bool _chatNameColorsEnabled;
 
@@ -232,7 +231,7 @@ public sealed partial class ChatUIController : UIController
         gameplayStateLoad.OnScreenLoad += OnScreenLoad;
         gameplayStateLoad.OnScreenUnload += OnScreenUnload;
 
-        var nameColors = _prototypeManager.Index<ColorPalettePrototype>(ChatNamePalette).Colors.Values.ToArray();
+        var nameColors = _prototypeManager.Index(ChatNamePalette).Colors.Values.ToArray();
         _chatNameColors = new string[nameColors.Length];
         for (var i = 0; i < nameColors.Length; i++)
         {
diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
index de70fe16f8..3eef88f19b 100644
--- a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
+++ b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
@@ -9,6 +9,8 @@ namespace Content.Client.UserInterface.Systems.DamageOverlays.Overlays;
 
 public sealed class DamageOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> CircleMaskShader = "GradientCircleMask";
+
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
@@ -49,9 +51,9 @@ public sealed class DamageOverlay : Overlay
     {
         // TODO: Replace
         IoCManager.InjectDependencies(this);
-        _oxygenShader = _prototypeManager.Index<ShaderPrototype>("GradientCircleMask").InstanceUnique();
-        _critShader = _prototypeManager.Index<ShaderPrototype>("GradientCircleMask").InstanceUnique();
-        _bruteShader = _prototypeManager.Index<ShaderPrototype>("GradientCircleMask").InstanceUnique();
+        _oxygenShader = _prototypeManager.Index(CircleMaskShader).InstanceUnique();
+        _critShader = _prototypeManager.Index(CircleMaskShader).InstanceUnique();
+        _bruteShader = _prototypeManager.Index(CircleMaskShader).InstanceUnique();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
index 9f3461eadd..692ee26774 100644
--- a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
+++ b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
@@ -19,8 +19,7 @@ public sealed class InfoUIController : UIController, IOnStateExited<GameplayStat
     private RulesPopup? _rulesPopup;
     private RulesAndInfoWindow? _infoWindow;
 
-    [ValidatePrototypeId<GuideEntryPrototype>]
-    private const string DefaultRuleset = "DefaultRuleset";
+    private static readonly ProtoId<GuideEntryPrototype> DefaultRuleset = "DefaultRuleset";
 
     public ProtoId<GuideEntryPrototype> RulesEntryId = DefaultRuleset;
 
@@ -92,7 +91,7 @@ public sealed class InfoUIController : UIController, IOnStateExited<GameplayStat
     {
         if (!_prototype.TryIndex(RulesEntryId, out var guideEntryPrototype))
         {
-            guideEntryPrototype = _prototype.Index<GuideEntryPrototype>(DefaultRuleset);
+            guideEntryPrototype = _prototype.Index(DefaultRuleset);
             Log.Error($"Couldn't find the following prototype: {RulesEntryId}. Falling back to {DefaultRuleset}, please check that the server has the rules set up correctly");
             return guideEntryPrototype;
         }
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index dd26effb33..6abebda6ee 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -39,8 +39,7 @@ public sealed partial class GunSystem : SharedGunSystem
     [Dependency] private readonly SharedTransformSystem _xform = default!;
     [Dependency] private readonly SpriteSystem _sprite = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    public const string HitscanProto = "HitscanEffect";
+    public static readonly EntProtoId HitscanProto = "HitscanEffect";
 
     public bool SpreadOverlay
     {
diff --git a/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs b/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
index 46cbe63c45..9b9ff23158 100644
--- a/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
+++ b/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
@@ -7,10 +7,12 @@ namespace Content.IntegrationTests.Tests.Atmos
     [TestOf(typeof(AtmosAlarmThreshold))]
     public sealed class AlarmThresholdTest
     {/*
+        private const string AlarmThresholdTestDummyId = "AlarmThresholdTestDummy";
+
         [TestPrototypes]
-        private const string Prototypes = @"
+        private const string Prototypes = $@"
 - type: alarmThreshold
-  id: AlarmThresholdTestDummy
+  id: {AlarmThresholdTestDummyId}
   upperBound: !type:AlarmThresholdSetting
     threshold: 5
   lowerBound: !type:AlarmThresholdSetting
@@ -30,7 +32,7 @@ namespace Content.IntegrationTests.Tests.Atmos
             var prototypeManager = server.ResolveDependency<IPrototypeManager>();
             AtmosAlarmThreshold threshold = default!;
 
-            var proto = prototypeManager.Index<AtmosAlarmThresholdPrototype>("AlarmThresholdTestDummy");
+            var proto = prototypeManager.Index<AtmosAlarmThresholdPrototype>(AlarmThresholdTestDummyId);
             threshold = new(proto);
 
             await server.WaitAssertion(() =>
diff --git a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
index cfc8007306..e4ec7e907a 100644
--- a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
+++ b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
@@ -15,6 +15,8 @@ namespace Content.IntegrationTests.Tests.Commands
     [TestOf(typeof(RejuvenateSystem))]
     public sealed class RejuvenateTest
     {
+        private static readonly ProtoId<DamageGroupPrototype> TestDamageGroup = "Toxin";
+
         [TestPrototypes]
         private const string Prototypes = @"
 - type: entity
@@ -62,7 +64,7 @@ namespace Content.IntegrationTests.Tests.Commands
                 });
 
                 // Kill the entity
-                DamageSpecifier damage = new(prototypeManager.Index<DamageGroupPrototype>("Toxin"), FixedPoint2.New(10000000));
+                DamageSpecifier damage = new(prototypeManager.Index(TestDamageGroup), FixedPoint2.New(10000000));
 
                 damSystem.TryChangeDamage(human, damage, true);
 
diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
index c156bf5b48..63610aa8ac 100644
--- a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
+++ b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
@@ -53,6 +53,8 @@ public sealed class SuicideCommandTests
   components:
   - type: MaterialReclaimer";
     private static readonly ProtoId<TagPrototype> CannotSuicideTag = "CannotSuicide";
+    private static readonly ProtoId<DamageTypePrototype> DamageType = "Slash";
+
     /// <summary>
     /// Run the suicide command in the console
     /// Should successfully kill the player and ghost them
@@ -144,7 +146,7 @@ public sealed class SuicideCommandTests
             mobThresholdsComp = entManager.GetComponent<MobThresholdsComponent>(player);
             damageableComp = entManager.GetComponent<DamageableComponent>(player);
 
-            if (protoMan.TryIndex<DamageTypePrototype>("Slash", out var slashProto))
+            if (protoMan.TryIndex(DamageType, out var slashProto))
                 damageableSystem.TryChangeDamage(player, new DamageSpecifier(slashProto, FixedPoint2.New(46.5)));
         });
 
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs b/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs
index 6eea519af3..192604edfd 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs
@@ -8,6 +8,8 @@ namespace Content.IntegrationTests.Tests.Construction.Interaction;
 
 public sealed class WindowRepair : InteractionTest
 {
+    private static readonly ProtoId<DamageTypePrototype> BluntDamageType = "Blunt";
+
     [Test]
     public async Task RepairReinforcedWindow()
     {
@@ -16,7 +18,7 @@ public sealed class WindowRepair : InteractionTest
         // Damage the entity.
         var sys = SEntMan.System<DamageableSystem>();
         var comp = Comp<DamageableComponent>();
-        var damageType = Server.ResolveDependency<IPrototypeManager>().Index<DamageTypePrototype>("Blunt");
+        var damageType = Server.ProtoMan.Index(BluntDamageType);
         var damage = new DamageSpecifier(damageType, FixedPoint2.New(10));
         Assert.That(comp.Damage.GetTotal(), Is.EqualTo(FixedPoint2.Zero));
         await Server.WaitPost(() => sys.TryChangeDamage(SEntMan.GetEntity(Target), damage, ignoreResistances: true));
diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
index 69069fc82f..f610ab732e 100644
--- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
+++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
@@ -1,9 +1,7 @@
-using System.Linq;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
@@ -14,66 +12,79 @@ namespace Content.IntegrationTests.Tests.Damageable
     [TestOf(typeof(DamageableSystem))]
     public sealed class DamageableTest
     {
+        private const string TestDamageableEntityId = "TestDamageableEntityId";
+        private const string TestGroup1 = "TestGroup1";
+        private const string TestGroup2 = "TestGroup2";
+        private const string TestGroup3 = "TestGroup3";
+        private const string TestDamage1 = "TestDamage1";
+        private const string TestDamage2a = "TestDamage2a";
+        private const string TestDamage2b = "TestDamage2b";
+
+        private const string TestDamage3a = "TestDamage3a";
+
+        private const string TestDamage3b = "TestDamage3b";
+        private const string TestDamage3c = "TestDamage3c";
+
         [TestPrototypes]
-        private const string Prototypes = @"
+        private const string Prototypes = $@"
 # Define some damage groups
 - type: damageType
-  id: TestDamage1
+  id: {TestDamage1}
   name: damage-type-blunt
 
 - type: damageType
-  id: TestDamage2a
+  id: {TestDamage2a}
   name: damage-type-blunt
 
 - type: damageType
-  id: TestDamage2b
+  id: {TestDamage2b}
   name: damage-type-blunt
 
 - type: damageType
-  id: TestDamage3a
+  id: {TestDamage3a}
   name: damage-type-blunt
 
 - type: damageType
-  id: TestDamage3b
+  id: {TestDamage3b}
   name: damage-type-blunt
 
 - type: damageType
-  id: TestDamage3c
+  id: {TestDamage3c}
   name: damage-type-blunt
 
 # Define damage Groups with 1,2,3 damage types
 - type: damageGroup
-  id: TestGroup1
+  id: {TestGroup1}
   name: damage-group-brute
   damageTypes:
-    - TestDamage1
+    - {TestDamage1}
 
 - type: damageGroup
-  id: TestGroup2
+  id: {TestGroup2}
   name: damage-group-brute
   damageTypes:
-    - TestDamage2a
-    - TestDamage2b
+    - {TestDamage2a}
+    - {TestDamage2b}
 
 - type: damageGroup
-  id: TestGroup3
+  id: {TestGroup3}
   name: damage-group-brute
   damageTypes:
-    - TestDamage3a
-    - TestDamage3b
-    - TestDamage3c
+    - {TestDamage3a}
+    - {TestDamage3b}
+    - {TestDamage3c}
 
 # This container should not support TestDamage1 or TestDamage2b
 - type: damageContainer
   id: testDamageContainer
   supportedGroups:
-    - TestGroup3
+    - {TestGroup3}
   supportedTypes:
-    - TestDamage2a
+    - {TestDamage2a}
 
 - type: entity
-  id: TestDamageableEntityId
-  name: TestDamageableEntityId
+  id: {TestDamageableEntityId}
+  name: {TestDamageableEntityId}
   components:
   - type: Damageable
     damageContainer: testDamageContainer
@@ -113,20 +124,20 @@ namespace Content.IntegrationTests.Tests.Damageable
             {
                 var coordinates = map.MapCoords;
 
-                sDamageableEntity = sEntityManager.SpawnEntity("TestDamageableEntityId", coordinates);
+                sDamageableEntity = sEntityManager.SpawnEntity(TestDamageableEntityId, coordinates);
                 sDamageableComponent = sEntityManager.GetComponent<DamageableComponent>(sDamageableEntity);
                 sDamageableSystem = sEntitySystemManager.GetEntitySystem<DamageableSystem>();
 
-                group1 = sPrototypeManager.Index<DamageGroupPrototype>("TestGroup1");
-                group2 = sPrototypeManager.Index<DamageGroupPrototype>("TestGroup2");
-                group3 = sPrototypeManager.Index<DamageGroupPrototype>("TestGroup3");
+                group1 = sPrototypeManager.Index<DamageGroupPrototype>(TestGroup1);
+                group2 = sPrototypeManager.Index<DamageGroupPrototype>(TestGroup2);
+                group3 = sPrototypeManager.Index<DamageGroupPrototype>(TestGroup3);
 
-                type1 = sPrototypeManager.Index<DamageTypePrototype>("TestDamage1");
-                type2a = sPrototypeManager.Index<DamageTypePrototype>("TestDamage2a");
-                type2b = sPrototypeManager.Index<DamageTypePrototype>("TestDamage2b");
-                type3a = sPrototypeManager.Index<DamageTypePrototype>("TestDamage3a");
-                type3b = sPrototypeManager.Index<DamageTypePrototype>("TestDamage3b");
-                type3c = sPrototypeManager.Index<DamageTypePrototype>("TestDamage3c");
+                type1 = sPrototypeManager.Index<DamageTypePrototype>(TestDamage1);
+                type2a = sPrototypeManager.Index<DamageTypePrototype>(TestDamage2a);
+                type2b = sPrototypeManager.Index<DamageTypePrototype>(TestDamage2b);
+                type3a = sPrototypeManager.Index<DamageTypePrototype>(TestDamage3a);
+                type3b = sPrototypeManager.Index<DamageTypePrototype>(TestDamage3b);
+                type3c = sPrototypeManager.Index<DamageTypePrototype>(TestDamage3c);
             });
 
             await server.WaitRunTicks(5);
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
index d37de7a504..0da07ad5a1 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
@@ -54,8 +54,8 @@ namespace Content.IntegrationTests.Tests.Destructible
 
             await server.WaitAssertion(() =>
             {
-                var bruteDamageGroup = sPrototypeManager.Index<DamageGroupPrototype>("TestBrute");
-                var burnDamageGroup = sPrototypeManager.Index<DamageGroupPrototype>("TestBurn");
+                var bruteDamageGroup = sPrototypeManager.Index<DamageGroupPrototype>(TestBruteDamageGroupId);
+                var burnDamageGroup = sPrototypeManager.Index<DamageGroupPrototype>(TestBurnDamageGroupId);
 
                 DamageSpecifier bruteDamage = new(bruteDamageGroup, FixedPoint2.New(5));
                 DamageSpecifier burnDamage = new(burnDamageGroup, FixedPoint2.New(5));
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
index 69891cbd89..ccd459668b 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
@@ -49,8 +49,8 @@ namespace Content.IntegrationTests.Tests.Destructible
 
             await server.WaitAssertion(() =>
             {
-                var bluntDamageType = protoManager.Index<DamageTypePrototype>("TestBlunt");
-                var slashDamageType = protoManager.Index<DamageTypePrototype>("TestSlash");
+                var bluntDamageType = protoManager.Index<DamageTypePrototype>(TestBluntDamageTypeId);
+                var slashDamageType = protoManager.Index<DamageTypePrototype>(TestSlashDamageTypeId);
 
                 var bluntDamage = new DamageSpecifier(bluntDamageType, 5);
                 var slashDamage = new DamageSpecifier(slashDamageType, 5);
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
index a50238d8f5..4e169e7dfa 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
@@ -39,7 +39,7 @@ namespace Content.IntegrationTests.Tests.Destructible
             await server.WaitAssertion(() =>
             {
                 var coordinates = sEntityManager.GetComponent<TransformComponent>(sDestructibleEntity).Coordinates;
-                var bruteDamageGroup = sPrototypeManager.Index<DamageGroupPrototype>("TestBrute");
+                var bruteDamageGroup = sPrototypeManager.Index<DamageGroupPrototype>(TestBruteDamageGroupId);
                 DamageSpecifier bruteDamage = new(bruteDamageGroup, 50);
 
 #pragma warning disable NUnit2045 // Interdependent assertions.
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs
index 7ff9242398..872e414ac3 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs
@@ -7,48 +7,56 @@ namespace Content.IntegrationTests.Tests.Destructible
         public const string DestructibleDestructionEntityId = "DestructibleTestsDestructibleDestructionEntity";
         public const string DestructibleDamageTypeEntityId = "DestructibleTestsDestructibleDamageTypeEntity";
         public const string DestructibleDamageGroupEntityId = "DestructibleTestsDestructibleDamageGroupEntity";
+        public const string TestBruteDamageGroupId = "TestBrute";
+        public const string TestBurnDamageGroupId = "TestBurn";
+        public const string TestBluntDamageTypeId = "TestBlunt";
+        public const string TestSlashDamageTypeId = "TestSlash";
+        public const string TestPiercingDamageTypeId = "TestPiercing";
+        public const string TestHeatDamageTypeId = "TestHeat";
+        public const string TestShockDamageTypeId = "TestShock";
+        public const string TestColdDamageTypeId = "TestCold";
 
         [TestPrototypes]
         public const string DamagePrototypes = $@"
 - type: damageType
-  id: TestBlunt
+  id: {TestBluntDamageTypeId}
   name: damage-type-blunt
 
 - type: damageType
-  id: TestSlash
+  id: {TestSlashDamageTypeId}
   name: damage-type-slash
 
 - type: damageType
-  id: TestPiercing
+  id: {TestPiercingDamageTypeId}
   name: damage-type-piercing
 
 - type: damageType
-  id: TestHeat
+  id: {TestHeatDamageTypeId}
   name: damage-type-heat
 
 - type: damageType
-  id: TestShock
+  id: {TestShockDamageTypeId}
   name: damage-type-shock
 
 - type: damageType
-  id: TestCold
+  id: {TestColdDamageTypeId}
   name: damage-type-cold
 
 - type: damageGroup
-  id: TestBrute
+  id: {TestBruteDamageGroupId}
   name: damage-group-brute
   damageTypes:
-    - TestBlunt
-    - TestSlash
-    - TestPiercing
+    - {TestBluntDamageTypeId}
+    - {TestSlashDamageTypeId}
+    - {TestPiercingDamageTypeId}
 
 - type: damageGroup
-  id: TestBurn
+  id: {TestBurnDamageGroupId}
   name: damage-group-burn
   damageTypes:
-    - TestHeat
-    - TestShock
-    - TestCold
+    - {TestHeatDamageTypeId}
+    - {TestShockDamageTypeId}
+    - {TestColdDamageTypeId}
 
 - type: entity
   id: {SpawnedEntityId}
@@ -114,10 +122,10 @@ namespace Content.IntegrationTests.Tests.Destructible
         !type:AndTrigger
         triggers:
         - !type:DamageTypeTrigger
-          damageType: TestBlunt
+          damageType: {TestBluntDamageTypeId}
           damage: 10
         - !type:DamageTypeTrigger
-          damageType: TestSlash
+          damageType: {TestSlashDamageTypeId}
           damage: 10
 
 - type: entity
@@ -131,10 +139,10 @@ namespace Content.IntegrationTests.Tests.Destructible
         !type:AndTrigger
         triggers:
         - !type:DamageGroupTrigger
-          damageGroup: TestBrute
+          damageGroup: {TestBruteDamageGroupId}
           damage: 10
         - !type:DamageGroupTrigger
-          damageGroup: TestBurn
+          damageGroup: {TestBurnDamageGroupId}
           damage: 10";
     }
 }
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
index 80f750c715..af86e406ef 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
@@ -61,7 +61,7 @@ namespace Content.IntegrationTests.Tests.Destructible
 
             await server.WaitAssertion(() =>
             {
-                var bluntDamage = new DamageSpecifier(sPrototypeManager.Index<DamageTypePrototype>("TestBlunt"), 10);
+                var bluntDamage = new DamageSpecifier(sPrototypeManager.Index<DamageTypePrototype>(TestBluntDamageTypeId), 10);
 
                 sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage, true);
 
diff --git a/Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs b/Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs
index bf47768274..1afed38966 100644
--- a/Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs
+++ b/Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs
@@ -110,7 +110,7 @@ public sealed class AbsorbentTest
                 solutionContainerSystem.AddSolution(refillableSoln.Value, new Solution(NonEvaporablePrototypeId, testCase.InitialRefillableSolution.VolumeOfNonEvaporable));
 
             // Act
-            absorbentSystem.Mop(user, refillable, absorbent, component);
+            absorbentSystem.Mop((absorbent, component), user, refillable);
 
             // Assert
             var absorbentComposition = absorbentSolution.GetReagentPrototypes(prototypeManager).ToDictionary(r => r.Key.ID, r => r.Value);
@@ -167,7 +167,7 @@ public sealed class AbsorbentTest
                 solutionContainerSystem.AddSolution(refillableSoln.Value, new Solution(NonEvaporablePrototypeId, testCase.InitialRefillableSolution.VolumeOfNonEvaporable));
 
             // Act
-            absorbentSystem.Mop(user, refillable, absorbent, component);
+            absorbentSystem.Mop((absorbent, component), user, refillable);
 
             // Assert
             var absorbentComposition = absorbentSolution.GetReagentPrototypes(prototypeManager).ToDictionary(r => r.Key.ID, r => r.Value);
diff --git a/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs b/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs
index 90bf82e8f1..b75b81ab3c 100644
--- a/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs
+++ b/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs
@@ -4,7 +4,6 @@ using Content.Shared.Tag;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Reflection;
-using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.IntegrationTests.Tests.Linter;
 
@@ -66,25 +65,25 @@ public sealed class StaticFieldValidationTest
     [Reflect(false)]
     private sealed class StringValid
     {
-        [ValidatePrototypeId<TagPrototype>] public static string Tag = "StaticFieldTestTag";
+        public static readonly ProtoId<TagPrototype> Tag = "StaticFieldTestTag";
     }
 
     [Reflect(false)]
     private sealed class StringInvalid
     {
-        [ValidatePrototypeId<TagPrototype>] public static string Tag = string.Empty;
+        public static readonly ProtoId<TagPrototype> Tag = string.Empty;
     }
 
     [Reflect(false)]
     private sealed class StringArrayValid
     {
-        [ValidatePrototypeId<TagPrototype>] public static string[] Tag = ["StaticFieldTestTag", "StaticFieldTestTag"];
+        public static readonly ProtoId<TagPrototype>[] Tag = ["StaticFieldTestTag", "StaticFieldTestTag"];
     }
 
     [Reflect(false)]
     private sealed class StringArrayInvalid
     {
-        [ValidatePrototypeId<TagPrototype>] public static string[] Tag = [string.Empty, "StaticFieldTestTag", string.Empty];
+        public static readonly ProtoId<TagPrototype>[] Tag = [string.Empty, "StaticFieldTestTag", string.Empty];
     }
 
     [Reflect(false)]
diff --git a/Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs b/Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs
index 150bc951f8..32fcf9c1ad 100644
--- a/Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs
+++ b/Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs
@@ -1,38 +1,48 @@
 #nullable enable
 using System.Linq;
-using Content.IntegrationTests.Pair;
 using Content.Server.Ghost.Roles;
 using Content.Server.Ghost.Roles.Components;
-using Content.Server.Players;
 using Content.Shared.Ghost;
 using Content.Shared.Mind;
 using Content.Shared.Players;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 
 namespace Content.IntegrationTests.Tests.Minds;
 
 [TestFixture]
 public sealed class GhostRoleTests
 {
+    private const string GhostRoleProtoId = "GhostRoleTestEntity";
+    private const string TestMobProtoId = "GhostRoleTestMob";
+
     [TestPrototypes]
-    private const string Prototypes = @"
-- type: entity
-  id: GhostRoleTestEntity
-  components:
-  - type: MindContainer
-  - type: GhostRole
-  - type: GhostTakeoverAvailable
-";
+    private const string Prototypes = $"""
+        - type: entity
+          id: {GhostRoleProtoId}
+          components:
+          - type: MindContainer
+          - type: GhostRole
+          - type: GhostTakeoverAvailable
+          - type: MobState
+
+        - type: entity
+          id: {TestMobProtoId}
+          components:
+          - type: MobState # MobState is required for correct determination of if the player can return to body or not
+        """;
 
     /// <summary>
     /// This is a simple test that just checks if a player can take a ghost role and then regain control of their
     /// original entity without encountering errors.
     /// </summary>
-    [Test]
-    public async Task TakeRoleAndReturn()
+    [TestCase(true)]
+    [TestCase(false)]
+    public async Task TakeRoleAndReturn(bool adminGhost)
     {
+        var ghostCommand = adminGhost ? "aghost" : "ghost";
+
         await using var pair = await PoolManager.GetServerClient(new PoolSettings
         {
             Dirty = true,
@@ -49,36 +59,67 @@ public sealed class GhostRoleTests
         var conHost = client.ResolveDependency<IConsoleHost>();
         var mindSystem = entMan.System<SharedMindSystem>();
         var session = sPlayerMan.Sessions.Single();
-        var originalMindId = session.ContentData()!.Mind!.Value;
+        var originalPlayerMindId = session.ContentData()!.Mind!.Value;
+
+        // Check that there are no ghosts
+        Assert.That(entMan.Count<GhostComponent>(), Is.Zero);
 
         // Spawn player entity & attach
-        EntityUid originalMob = default;
+        EntityUid originalPlayerMob = default;
         await server.WaitPost(() =>
         {
-            originalMob = entMan.SpawnEntity(null, mapData.GridCoords);
-            mindSystem.TransferTo(originalMindId, originalMob, true);
+            originalPlayerMob = entMan.SpawnEntity(TestMobProtoId, mapData.GridCoords);
+            mindSystem.TransferTo(originalPlayerMindId, originalPlayerMob, true);
         });
 
-        // Check player got attached.
         await pair.RunTicksSync(10);
-        Assert.That(session.AttachedEntity, Is.EqualTo(originalMob));
-        var originalMind = entMan.GetComponent<MindComponent>(originalMindId);
-        Assert.That(originalMind.OwnedEntity, Is.EqualTo(originalMob));
-        Assert.That(originalMind.VisitingEntity, Is.Null);
+        var originalPlayerMind = entMan.GetComponent<MindComponent>(originalPlayerMindId);
+        Assert.Multiple(() =>
+        {
+            // Check player got attached.
+            Assert.That(session.AttachedEntity, Is.EqualTo(originalPlayerMob));
+            Assert.That(originalPlayerMind.OwnedEntity, Is.EqualTo(originalPlayerMob));
+            Assert.That(originalPlayerMind.VisitingEntity, Is.Null);
+            Assert.That(originalPlayerMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+
+            // Check that there are still no ghosts
+            Assert.That(entMan.Count<GhostComponent>(), Is.Zero);
+        });
 
         // Use the ghost command
-        conHost.ExecuteCommand("ghost");
+        conHost.ExecuteCommand(ghostCommand);
         await pair.RunTicksSync(10);
-        var ghost = session.AttachedEntity;
-        Assert.That(entMan.HasComponent<GhostComponent>(ghost));
-        Assert.That(ghost, Is.Not.EqualTo(originalMob));
-        Assert.That(session.ContentData()?.Mind, Is.EqualTo(originalMindId));
-        Assert.That(originalMind.OwnedEntity, Is.EqualTo(originalMob), $"Original mob: {originalMob}, Ghost: {ghost}");
-        Assert.That(originalMind.VisitingEntity, Is.EqualTo(ghost));
+        var ghostOne = session.AttachedEntity;
+        Assert.Multiple(() =>
+        {
+            // Assert that the ghost is a new entity with a new mind
+            Assert.That(entMan.HasComponent<GhostComponent>(ghostOne));
+            Assert.That(ghostOne, Is.Not.EqualTo(originalPlayerMob));
+            Assert.That(session.ContentData()?.Mind, Is.EqualTo(originalPlayerMindId));
+            if (adminGhost)
+            {
+                // aghost, so the player mob should still own the mind, but the mind is visiting the ghost.
+                Assert.That(originalPlayerMind.OwnedEntity, Is.EqualTo(originalPlayerMob));
+                Assert.That(originalPlayerMind.VisitingEntity, Is.EqualTo(ghostOne));
+                Assert.That(originalPlayerMind.UserId, Is.EqualTo(session.UserId));
+            }
+            else
+            {
+                // player ghost, can't return. The mind is owned by the ghost, and is not visiting.
+                Assert.That(originalPlayerMind.OwnedEntity, Is.EqualTo(ghostOne));
+                Assert.That(originalPlayerMind.VisitingEntity, Is.Null);
+            }
+
+            // Check that we're tracking the original owner for round end screen
+            Assert.That(originalPlayerMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+
+            // Check that there is only one ghost
+            Assert.That(entMan.Count<GhostComponent>(), Is.EqualTo(1));
+        });
 
         // Spawn ghost takeover entity.
         EntityUid ghostRole = default;
-        await server.WaitPost(() => ghostRole = entMan.SpawnEntity("GhostRoleTestEntity", mapData.GridCoords));
+        await server.WaitPost(() => ghostRole = entMan.SpawnEntity(GhostRoleProtoId, mapData.GridCoords));
 
         // Take the ghost role
         await server.WaitPost(() =>
@@ -89,40 +130,118 @@ public sealed class GhostRoleTests
 
         // Check player got attached to ghost role.
         await pair.RunTicksSync(10);
-        var newMindId = session.ContentData()!.Mind!.Value;
-        var newMind = entMan.GetComponent<MindComponent>(newMindId);
-        Assert.That(newMindId, Is.Not.EqualTo(originalMindId));
-        Assert.That(session.AttachedEntity, Is.EqualTo(ghostRole));
-        Assert.That(newMind.OwnedEntity, Is.EqualTo(ghostRole));
-        Assert.That(newMind.VisitingEntity, Is.Null);
+        var ghostRoleMindId = session.ContentData()!.Mind!.Value;
+        var ghostRoleMind = entMan.GetComponent<MindComponent>(ghostRoleMindId);
+        Assert.Multiple(() =>
+        {
+            // Check that the ghost role mind is new
+            Assert.That(ghostRoleMindId, Is.Not.EqualTo(originalPlayerMindId));
 
-        // Original mind should be unaffected, but the ghost will have deleted itself.
-        Assert.That(originalMind.OwnedEntity, Is.EqualTo(originalMob));
-        Assert.That(originalMind.VisitingEntity, Is.Null);
-        Assert.That(entMan.Deleted(ghost));
+            // Check that the session and mind are properly attached to the ghost role
+            Assert.That(session.AttachedEntity, Is.EqualTo(ghostRole));
+            Assert.That(ghostRoleMind.OwnedEntity, Is.EqualTo(ghostRole));
+            Assert.That(ghostRoleMind.VisitingEntity, Is.Null);
+
+            // Original mind should be unaffected, but the ghost will have deleted itself.
+            if (adminGhost)
+            {
+                // aghost case, the original player mob should still own the mind, and that mind is not visiting.
+                Assert.That(originalPlayerMind.OwnedEntity, Is.EqualTo(originalPlayerMob));
+            }
+            else
+            {
+                // player ghost case, the original mind is disconnected and not owned by an entity.
+                // This mind cannot be returned to
+                Assert.That(originalPlayerMind.OwnedEntity, Is.Null);
+            }
+
+            // In either case the original player mind is not visiting anything, not connected to any user.
+            Assert.That(originalPlayerMind.VisitingEntity, Is.Null);
+            Assert.That(originalPlayerMind.UserId, Is.Null);
+
+            // Now the original owner of both minds should permanently be set to this session.
+            Assert.That(originalPlayerMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+            Assert.That(ghostRoleMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+
+            // Make sure that the ghost was deleted
+            Assert.That(entMan.Deleted(ghostOne));
+
+            // Check that there is are no lingereing ghosts
+            Assert.That(entMan.Count<GhostComponent>(), Is.Zero);
+        });
 
         // Ghost again.
-        conHost.ExecuteCommand("ghost");
+        conHost.ExecuteCommand(ghostCommand);
         await pair.RunTicksSync(10);
-        var otherGhost = session.AttachedEntity;
-        Assert.That(entMan.HasComponent<GhostComponent>(otherGhost));
-        Assert.That(otherGhost, Is.Not.EqualTo(originalMob));
-        Assert.That(otherGhost, Is.Not.EqualTo(ghostRole));
-        Assert.That(session.ContentData()?.Mind, Is.EqualTo(newMindId));
-        Assert.That(newMind.OwnedEntity, Is.EqualTo(ghostRole));
-        Assert.That(newMind.VisitingEntity, Is.EqualTo(session.AttachedEntity));
+        var ghostTwo = session.AttachedEntity;
+        Assert.Multiple(() =>
+        {
+            // Check that the new ghost is a new entity
+            Assert.That(entMan.HasComponent<GhostComponent>(ghostTwo));
+            Assert.That(ghostTwo, Is.Not.EqualTo(originalPlayerMob));
+            Assert.That(ghostTwo, Is.Not.EqualTo(ghostRole));
+            Assert.That(session.ContentData()?.Mind, Is.EqualTo(ghostRoleMindId));
+
+            if(adminGhost)
+            {
+                // aghost case, the ghost role mind should be owned by the ghost role entity,
+                // the ghost role mind is visiting the new ghost
+                Assert.That(ghostRoleMind.OwnedEntity, Is.EqualTo(ghostRole));
+                Assert.That(ghostRoleMind.VisitingEntity, Is.EqualTo(ghostTwo));
+            }
+            else
+            {
+                // player ghost, can't return. The mind is owned by the ghost, and is not visiting.
+                Assert.That(ghostRoleMind.OwnedEntity, Is.EqualTo(ghostTwo));
+                Assert.That(ghostRoleMind.VisitingEntity, Is.Null);
+            }
+
+            // Check that the original mind is still not attached to a user
+            Assert.That(originalPlayerMind.UserId, Is.Null);
+
+            // Check that original owners of other minds are still tracked
+            Assert.That(originalPlayerMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+            Assert.That(ghostRoleMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+
+            // Check that there is exactly one ghost
+            Assert.That(entMan.Count<GhostComponent>(), Is.EqualTo(1));
+        });
+
+        if (!adminGhost)
+        {
+            // End of the normal player ghost role test
+            await pair.CleanReturnAsync();
+            return;
+        }
 
         // Next, control the original entity again:
-        await server.WaitPost(() => mindSystem.SetUserId(originalMindId, session.UserId));
+        await server.WaitPost(() => mindSystem.SetUserId(originalPlayerMindId, session.UserId));
         await pair.RunTicksSync(10);
-        Assert.That(session.AttachedEntity, Is.EqualTo(originalMob));
-        Assert.That(originalMind.OwnedEntity, Is.EqualTo(originalMob));
-        Assert.That(originalMind.VisitingEntity, Is.Null);
 
-        // the ghost-role mind is unaffected, though the ghost will have deleted itself
-        Assert.That(newMind.OwnedEntity, Is.EqualTo(ghostRole));
-        Assert.That(newMind.VisitingEntity, Is.Null);
-        Assert.That(entMan.Deleted(otherGhost));
+        Assert.Multiple(() =>
+        {
+            // Check that we are attached
+            Assert.That(session.AttachedEntity, Is.EqualTo(originalPlayerMob));
+
+            // Check the ownership of the original mind
+            Assert.That(originalPlayerMind.OwnedEntity, Is.EqualTo(originalPlayerMob));
+            Assert.That(originalPlayerMind.VisitingEntity, Is.Null);
+            Assert.That(originalPlayerMind.UserId, Is.EqualTo(session.UserId));
+
+            // Check that the ghost-role mind is unaffected
+            Assert.That(ghostRoleMind.OwnedEntity, Is.EqualTo(ghostRole));
+            Assert.That(ghostRoleMind.VisitingEntity, Is.Null);
+
+            // Check that the second ghost is deleted
+            Assert.That(entMan.Deleted(ghostTwo));
+
+            // Check that the original owners of the previous minds are still tracked
+            Assert.That(originalPlayerMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+            Assert.That(ghostRoleMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+
+            // Check that there is are no lingereing ghosts
+            Assert.That(entMan.Count<GhostComponent>(), Is.Zero);
+        });
 
         await pair.CleanReturnAsync();
     }
diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.cs b/Content.IntegrationTests/Tests/Minds/MindTests.cs
index d4d551f4e0..60e98b69fe 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTests.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTests.cs
@@ -24,6 +24,8 @@ namespace Content.IntegrationTests.Tests.Minds;
 [TestFixture]
 public sealed partial class MindTests
 {
+    private static readonly ProtoId<DamageTypePrototype> BluntDamageType = "Blunt";
+
     [TestPrototypes]
     private const string Prototypes = @"
 - type: entity
@@ -144,7 +146,7 @@ public sealed partial class MindTests
         await server.WaitAssertion(() =>
         {
             var damageable = entMan.GetComponent<DamageableComponent>(entity);
-            if (!protoMan.TryIndex<DamageTypePrototype>("Blunt", out var prototype))
+            if (!protoMan.TryIndex(BluntDamageType, out var prototype))
             {
                 return;
             }
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index 2965facb3a..72decb6a3b 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -73,6 +73,8 @@ namespace Content.IntegrationTests.Tests
             //CrystallEdge Map replacement end
         };
 
+        private static readonly ProtoId<EntityCategoryPrototype> DoNotMapCategory = "DoNotMap";
+
         /// <summary>
         /// Asserts that specific files have been saved as grids and not maps.
         /// </summary>
@@ -250,7 +252,7 @@ namespace Content.IntegrationTests.Tests
                 return;
 
             var yamlEntities = node["entities"];
-            if (!protoManager.TryIndex<EntityCategoryPrototype>("DoNotMap", out var dnmCategory))
+            if (!protoManager.TryIndex(DoNotMapCategory, out var dnmCategory))
                 return;
 
             Assert.Multiple(() =>
diff --git a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
index d68fdafb76..3fee4a146c 100644
--- a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
+++ b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
@@ -17,8 +17,10 @@ namespace Content.IntegrationTests.Tests.Station;
 [TestOf(typeof(StationJobsSystem))]
 public sealed class StationJobsTest
 {
+    private const string StationMapId = "FooStation";
+
     [TestPrototypes]
-    private const string Prototypes = @"
+    private const string Prototypes = $@"
 - type: playTimeTracker
   id: PlayTimeDummyAssistant
 
@@ -35,13 +37,13 @@ public sealed class StationJobsTest
   id: PlayTimeDummyChaplain
 
 - type: gameMap
-  id: FooStation
+  id: {StationMapId}
   minPlayers: 0
-  mapName: FooStation
+  mapName: {StationMapId}
   mapPath: /Maps/Test/empty.yml
   stations:
     Station:
-      mapNameTemplate: FooStation
+      mapNameTemplate: {StationMapId}
       stationProto: StandardNanotrasenStation
       components:
         - type: StationJobs
@@ -87,7 +89,7 @@ public sealed class StationJobsTest
         var server = pair.Server;
 
         var prototypeManager = server.ResolveDependency<IPrototypeManager>();
-        var fooStationProto = prototypeManager.Index<GameMapPrototype>("FooStation");
+        var fooStationProto = prototypeManager.Index<GameMapPrototype>(StationMapId);
         var entSysMan = server.ResolveDependency<IEntityManager>().EntitySysManager;
         var stationJobs = entSysMan.GetEntitySystem<StationJobsSystem>();
         var stationSystem = entSysMan.GetEntitySystem<StationSystem>();
@@ -161,7 +163,7 @@ public sealed class StationJobsTest
         var server = pair.Server;
 
         var prototypeManager = server.ResolveDependency<IPrototypeManager>();
-        var fooStationProto = prototypeManager.Index<GameMapPrototype>("FooStation");
+        var fooStationProto = prototypeManager.Index<GameMapPrototype>(StationMapId);
         var entSysMan = server.ResolveDependency<IEntityManager>().EntitySysManager;
         var stationJobs = entSysMan.GetEntitySystem<StationJobsSystem>();
         var stationSystem = entSysMan.GetEntitySystem<StationSystem>();
diff --git a/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs b/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs
index bcaf4343b6..3645667737 100644
--- a/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs
@@ -5,6 +5,7 @@ using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using Content.Shared.VendingMachines;
+using Robust.Shared.Prototypes;
 
 namespace Content.IntegrationTests.Tests.Vending;
 
@@ -17,6 +18,7 @@ public sealed class VendingInteractionTest : InteractionTest
     private const string RestockBoxProtoId = "InteractionTestRestockBox";
 
     private const string RestockBoxOtherProtoId = "InteractionTestRestockBoxOther";
+    private static readonly ProtoId<DamageTypePrototype> TestDamageType = "Blunt";
 
     [TestPrototypes]
     private const string TestPrototypes = $@"
@@ -196,7 +198,7 @@ public sealed class VendingInteractionTest : InteractionTest
         Assert.That(damageableComp.Damage.GetTotal(), Is.EqualTo(FixedPoint2.Zero), $"{VendingMachineProtoId} started with unexpected damage.");
 
         // Damage the vending machine to the point that it breaks
-        var damageType = ProtoMan.Index<DamageTypePrototype>("Blunt");
+        var damageType = ProtoMan.Index(TestDamageType);
         var damage = new DamageSpecifier(damageType, FixedPoint2.New(100));
         await Server.WaitPost(() => damageableSys.TryChangeDamage(SEntMan.GetEntity(Target), damage, ignoreResistances: true));
         await RunTicks(5);
diff --git a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
index 610e05fa2c..46d44273bf 100644
--- a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
+++ b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
@@ -20,6 +20,8 @@ namespace Content.IntegrationTests.Tests
     [TestOf(typeof(VendingMachineSystem))]
     public sealed class VendingMachineRestockTest : EntitySystem
     {/*
+        private static readonly ProtoId<DamageTypePrototype> TestDamageType = "Blunt";
+
         [TestPrototypes]
         private const string Prototypes = @"
 - type: entity
@@ -293,7 +295,7 @@ namespace Content.IntegrationTests.Tests
                     "Did not start with zero ramen.");
 
                 restock = entityManager.SpawnEntity("TestRestockExplode", coordinates);
-                var damageSpec = new DamageSpecifier(prototypeManager.Index<DamageTypePrototype>("Blunt"), 100);
+                var damageSpec = new DamageSpecifier(prototypeManager.Index(TestDamageType), 100);
                 var damageResult = damageableSystem.TryChangeDamage(restock, damageSpec);
 
 #pragma warning disable NUnit2045
diff --git a/Content.Server/Administration/Logs/AdminLogManager.cs b/Content.Server/Administration/Logs/AdminLogManager.cs
index add51a7775..600311a651 100644
--- a/Content.Server/Administration/Logs/AdminLogManager.cs
+++ b/Content.Server/Administration/Logs/AdminLogManager.cs
@@ -302,6 +302,13 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa
             return;
         }
 
+        // PostgreSQL does not support storing null chars in text values.
+        if (message.Contains('\0'))
+        {
+            _sawmill.Error($"Null character detected in admin log message '{message}'! LogType: {type}, LogImpact: {impact}");
+            message = message.Replace("\0", "");
+        }
+
         var log = new AdminLog
         {
             Id = NextLogId,
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index 56bbc225cc..78433db129 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -383,8 +383,13 @@ public sealed class AdminSystem : EntitySystem
         {
             _chat.DeleteMessagesBy(uid);
 
+            var eraseEvent = new EraseEvent(uid);
+
             if (!_minds.TryGetMind(uid, out var mindId, out var mind) || mind.OwnedEntity == null || TerminatingOrDeleted(mind.OwnedEntity.Value))
+            {
+                RaiseLocalEvent(ref eraseEvent);
                 return;
+            }
 
             var entity = mind.OwnedEntity.Value;
 
@@ -444,6 +449,8 @@ public sealed class AdminSystem : EntitySystem
 
             if (_playerManager.TryGetSessionById(uid, out var session))
                 _gameTicker.SpawnObserver(session);
+
+            RaiseLocalEvent(ref eraseEvent);
         }
 
     private void OnSessionPlayTimeUpdated(ICommonSession session)
@@ -451,3 +458,10 @@ public sealed class AdminSystem : EntitySystem
         UpdatePlayerList(session);
     }
 }
+
+/// <summary>
+/// Event fired after a player is erased by an admin
+/// </summary>
+/// <param name="PlayerNetUserId">NetUserId of the player that was the target of the Erase</param>
+[ByRefEvent]
+public record struct EraseEvent(NetUserId PlayerNetUserId);
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
index 182ba1ecdb..d8a5503d6f 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@@ -24,25 +24,14 @@ public sealed partial class AdminVerbSystem
     [Dependency] private readonly GameTicker _gameTicker = default!;
     [Dependency] private readonly OutfitSystem _outfit = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultTraitorRule = "Traitor";
+    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 ProtoId<StartingGearPrototype> PirateGearId = "PirateGear";
 
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultInitialInfectedRule = "Zombie";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultNukeOpRule = "LoneOpsSpawn";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultRevsRule = "Revolutionary";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultThiefRule = "Thief";
-
-    [ValidatePrototypeId<StartingGearPrototype>]
-    private const string PirateGearId = "PirateGear";
-
-    private readonly EntProtoId _paradoxCloneRuleId = "ParadoxCloneSpawn";
+    private static readonly EntProtoId ParadoxCloneRuleId = "ParadoxCloneSpawn";
 
     //CP14
     [ValidatePrototypeId<EntityPrototype>]
@@ -195,7 +184,7 @@ public sealed partial class AdminVerbSystem
             Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "ParadoxClone"),
             Act = () =>
             {
-                var ruleEnt = _gameTicker.AddGameRule(_paradoxCloneRuleId);
+                var ruleEnt = _gameTicker.AddGameRule(ParadoxCloneRuleId);
 
                 if (!TryComp<ParadoxCloneRuleComponent>(ruleEnt, out var paradoxCloneRuleComp))
                     return;
diff --git a/Content.Server/Advertise/Components/AdvertiseComponent.cs b/Content.Server/Advertise/Components/AdvertiseComponent.cs
deleted file mode 100644
index 94650234bb..0000000000
--- a/Content.Server/Advertise/Components/AdvertiseComponent.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using Content.Server.Advertise.EntitySystems;
-using Content.Shared.Dataset;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Advertise.Components;
-
-/// <summary>
-/// Makes this entity periodically advertise by speaking a randomly selected
-/// message from a specified dataset into local chat.
-/// </summary>
-[RegisterComponent, Access(typeof(AdvertiseSystem))]
-public sealed partial class AdvertiseComponent : Component
-{
-    /// <summary>
-    /// Minimum time in seconds to wait before saying a new ad, in seconds. Has to be larger than or equal to 1.
-    /// </summary>
-    [DataField]
-    public int MinimumWait { get; private set; } = 8 * 60;
-
-    /// <summary>
-    /// Maximum time in seconds to wait before saying a new ad, in seconds. Has to be larger than or equal
-    /// to <see cref="MinimumWait"/>
-    /// </summary>
-    [DataField]
-    public int MaximumWait { get; private set; } = 10 * 60;
-
-    /// <summary>
-    /// If true, the delay before the first advertisement (at MapInit) will ignore <see cref="MinimumWait"/>
-    /// and instead be rolled between 0 and <see cref="MaximumWait"/>. This only applies to the initial delay;
-    /// <see cref="MinimumWait"/> will be respected after that.
-    /// </summary>
-    [DataField]
-    public bool Prewarm = true;
-
-    /// <summary>
-    /// The identifier for the advertisements dataset prototype.
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<LocalizedDatasetPrototype> Pack { get; private set; }
-
-    /// <summary>
-    /// The next time an advertisement will be said.
-    /// </summary>
-    [DataField]
-    public TimeSpan NextAdvertisementTime { get; set; } = TimeSpan.Zero;
-
-}
diff --git a/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs b/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
deleted file mode 100644
index 7f2e128183..0000000000
--- a/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using Content.Server.Advertise.Components;
-using Content.Server.Chat.Systems;
-using Content.Server.Power.Components;
-using Content.Shared.VendingMachines;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Advertise.EntitySystems;
-
-public sealed class AdvertiseSystem : EntitySystem
-{
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
-
-    /// <summary>
-    /// The maximum amount of time between checking if advertisements should be displayed
-    /// </summary>
-    private readonly TimeSpan _maximumNextCheckDuration = TimeSpan.FromSeconds(15);
-
-    /// <summary>
-    /// The next time the game will check if advertisements should be displayed
-    /// </summary>
-    private TimeSpan _nextCheckTime = TimeSpan.MinValue;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<AdvertiseComponent, MapInitEvent>(OnMapInit);
-
-        SubscribeLocalEvent<ApcPowerReceiverComponent, AttemptAdvertiseEvent>(OnPowerReceiverAttemptAdvertiseEvent);
-        SubscribeLocalEvent<VendingMachineComponent, AttemptAdvertiseEvent>(OnVendingAttemptAdvertiseEvent);
-
-        _nextCheckTime = TimeSpan.MinValue;
-    }
-
-    private void OnMapInit(EntityUid uid, AdvertiseComponent advert, MapInitEvent args)
-    {
-        var prewarm = advert.Prewarm;
-        RandomizeNextAdvertTime(advert, prewarm);
-        _nextCheckTime = MathHelper.Min(advert.NextAdvertisementTime, _nextCheckTime);
-    }
-
-    private void RandomizeNextAdvertTime(AdvertiseComponent advert, bool prewarm = false)
-    {
-        var minDuration = prewarm ? 0 : Math.Max(1, advert.MinimumWait);
-        var maxDuration = Math.Max(minDuration, advert.MaximumWait);
-        var waitDuration = TimeSpan.FromSeconds(_random.Next(minDuration, maxDuration));
-
-        advert.NextAdvertisementTime = _gameTiming.CurTime + waitDuration;
-    }
-
-    public void SayAdvertisement(EntityUid uid, AdvertiseComponent? advert = null)
-    {
-        if (!Resolve(uid, ref advert))
-            return;
-
-        var attemptEvent = new AttemptAdvertiseEvent(uid);
-        RaiseLocalEvent(uid, ref attemptEvent);
-        if (attemptEvent.Cancelled)
-            return;
-
-        if (_prototypeManager.TryIndex(advert.Pack, out var advertisements))
-            _chat.TrySendInGameICMessage(uid, Loc.GetString(_random.Pick(advertisements.Values)), InGameICChatType.Speak, hideChat: true);
-    }
-
-    public override void Update(float frameTime)
-    {
-        var currentGameTime = _gameTiming.CurTime;
-        if (_nextCheckTime > currentGameTime)
-            return;
-
-        // _nextCheckTime starts at TimeSpan.MinValue, so this has to SET the value, not just increment it.
-        _nextCheckTime = currentGameTime + _maximumNextCheckDuration;
-
-        var query = EntityQueryEnumerator<AdvertiseComponent>();
-        while (query.MoveNext(out var uid, out var advert))
-        {
-            if (currentGameTime > advert.NextAdvertisementTime)
-            {
-                SayAdvertisement(uid, advert);
-                // The timer is always refreshed when it expires, to prevent mass advertising (ex: all the vending machines have no power, and get it back at the same time).
-                RandomizeNextAdvertTime(advert);
-            }
-            _nextCheckTime = MathHelper.Min(advert.NextAdvertisementTime, _nextCheckTime);
-        }
-    }
-
-
-    private static void OnPowerReceiverAttemptAdvertiseEvent(EntityUid uid, ApcPowerReceiverComponent powerReceiver, ref AttemptAdvertiseEvent args)
-    {
-        args.Cancelled |= !powerReceiver.Powered;
-    }
-
-    private static void OnVendingAttemptAdvertiseEvent(EntityUid uid, VendingMachineComponent machine, ref AttemptAdvertiseEvent args)
-    {
-        args.Cancelled |= machine.Broken;
-    }
-}
-
-[ByRefEvent]
-public record struct AttemptAdvertiseEvent(EntityUid? Advertiser)
-{
-    public bool Cancelled = false;
-}
diff --git a/Content.Server/Animals/Components/ParrotListenerComponent.cs b/Content.Server/Animals/Components/ParrotListenerComponent.cs
new file mode 100644
index 0000000000..9d0c8a2d01
--- /dev/null
+++ b/Content.Server/Animals/Components/ParrotListenerComponent.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Whitelist;
+
+namespace Content.Server.Animals.Components;
+
+/// <summary>
+/// Makes an entity able to listen to messages from IC chat and attempt to commit them to memory
+/// </summary>
+[RegisterComponent]
+public sealed partial class ParrotListenerComponent : Component
+{
+    /// <summary>
+    /// Whitelist for purposes of limiting which entities a parrot will listen to
+    ///
+    /// This is here because parrots can learn via local chat or radio from other parrots. this can quickly devolve from
+    /// SQUAWK! Polly wants a cracker! BRAAWK
+    /// to
+    /// BRAAWK! SQUAWK! RAWWK! Polly wants a cracker! AAWK! AWWK! Cracker! SQUAWK! BRAWWK! SQUAWK!
+    /// This is limited somewhat by the message length limit on ParrotMemoryComponent, but can be prevented entirely here
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// Blacklist for purposes of ignoring entities
+    /// As above, this is here to force parrots to ignore certain entities.
+    /// For example, polly will be consistently mapped around EngiDrobes, which will consistently say stuff like
+    /// "Guaranteed to protect your feet from industrial accidents!"
+    /// If polly ends up constantly advertising engineering drip, this can be used to prevent it.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
+}
diff --git a/Content.Server/Animals/Components/ParrotMemoryComponent.cs b/Content.Server/Animals/Components/ParrotMemoryComponent.cs
new file mode 100644
index 0000000000..69908a0a9e
--- /dev/null
+++ b/Content.Server/Animals/Components/ParrotMemoryComponent.cs
@@ -0,0 +1,57 @@
+using Robust.Shared.Network;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Server.Animals.Components;
+
+/// <summary>
+/// Makes an entity able to memorize chat/radio messages
+/// </summary>
+[RegisterComponent]
+[AutoGenerateComponentPause]
+public sealed partial class ParrotMemoryComponent : Component
+{
+    /// <summary>
+    /// List of SpeechMemory records this entity has learned
+    /// </summary>
+    [DataField]
+    public List<SpeechMemory> SpeechMemories = [];
+
+    /// <summary>
+    /// The % chance an entity with this component learns a phrase when learning is off cooldown
+    /// </summary>
+    [DataField]
+    public float LearnChance = 0.6f;
+
+    /// <summary>
+    /// Time after which another attempt can be made at learning a phrase
+    /// </summary>
+    [DataField]
+    public TimeSpan LearnCooldown = TimeSpan.FromMinutes(1);
+
+    /// <summary>
+    /// Next time at which the parrot can attempt to learn something
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
+    public TimeSpan NextLearnInterval = TimeSpan.Zero;
+
+    /// <summary>
+    /// The number of speech entries that are remembered
+    /// </summary>
+    [DataField]
+    public int MaxSpeechMemory = 50;
+
+    /// <summary>
+    /// Minimum length of a speech entry
+    /// </summary>
+    [DataField]
+    public int MinEntryLength = 4;
+
+    /// <summary>
+    /// Maximum length of a speech entry
+    /// </summary>
+    [DataField]
+    public int MaxEntryLength = 50;
+}
+
+public record struct SpeechMemory(NetUserId? NetUserId, string Message);
diff --git a/Content.Server/Animals/Systems/ParrotMemorySystem.cs b/Content.Server/Animals/Systems/ParrotMemorySystem.cs
new file mode 100644
index 0000000000..eb3429821c
--- /dev/null
+++ b/Content.Server/Animals/Systems/ParrotMemorySystem.cs
@@ -0,0 +1,247 @@
+using Content.Server.Administration.Logs;
+using Content.Server.Administration.Managers;
+using Content.Server.Administration.Systems;
+using Content.Server.Animals.Components;
+using Content.Server.Mind;
+using Content.Server.Popups;
+using Content.Server.Radio;
+using Content.Server.Speech;
+using Content.Server.Speech.Components;
+using Content.Server.Vocalization.Systems;
+using Content.Shared.Database;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
+using Robust.Shared.Network;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Animals.Systems;
+
+/// <summary>
+/// The ParrotMemorySystem handles remembering messages received through local chat (activelistener) or a radio
+/// (radiovocalizer) and stores them in a list. When an entity with a VocalizerComponent attempts to vocalize, this will
+/// try to set the message from memory.
+/// </summary>
+public sealed partial class ParrotMemorySystem : EntitySystem
+{
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IAdminManager _admin = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly MindSystem _mind = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EraseEvent>(OnErase);
+
+        SubscribeLocalEvent<ParrotMemoryComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
+
+        SubscribeLocalEvent<ParrotListenerComponent, MapInitEvent>(ListenerOnMapInit);
+
+        SubscribeLocalEvent<ParrotListenerComponent, ListenEvent>(OnListen);
+        SubscribeLocalEvent<ParrotListenerComponent, HeadsetRadioReceiveRelayEvent>(OnHeadsetReceive);
+
+        SubscribeLocalEvent<ParrotMemoryComponent, TryVocalizeEvent>(OnTryVocalize);
+    }
+
+    private void OnErase(ref EraseEvent args)
+    {
+        DeletePlayerMessages(args.PlayerNetUserId);
+    }
+
+    private void OnGetVerbs(Entity<ParrotMemoryComponent> entity, ref GetVerbsEvent<Verb> args)
+    {
+        var user = args.User;
+
+        // limit this to admins
+        if (!_admin.IsAdmin(user))
+            return;
+
+        // simple verb that just clears the memory list
+        var clearMemoryVerb = new Verb()
+        {
+            Text = Loc.GetString("parrot-verb-clear-memory"),
+            Category = VerbCategory.Admin,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/clear-parrot.png")),
+            Act = () =>
+            {
+                entity.Comp.SpeechMemories.Clear();
+                _popup.PopupEntity(Loc.GetString("parrot-popup-memory-cleared"), entity, user, PopupType.Medium);
+            },
+        };
+
+        args.Verbs.Add(clearMemoryVerb);
+    }
+
+    private void ListenerOnMapInit(Entity<ParrotListenerComponent> entity, ref MapInitEvent args)
+    {
+        // If an entity has a ParrotListenerComponent it really ought to have an ActiveListenerComponent
+        if (!HasComp<ActiveListenerComponent>(entity))
+            Log.Warning($"Entity {ToPrettyString(entity)} has a ParrotListenerComponent but was not given an ActiveListenerComponent");
+    }
+
+    private void OnListen(Entity<ParrotListenerComponent> entity, ref ListenEvent args)
+    {
+
+        TryLearn(entity.Owner, args.Message, args.Source);
+    }
+
+    private void OnHeadsetReceive(Entity<ParrotListenerComponent> entity, ref HeadsetRadioReceiveRelayEvent args)
+    {
+        var message = args.RelayedEvent.Message;
+        var source = args.RelayedEvent.MessageSource;
+
+        TryLearn(entity.Owner, message, source);
+    }
+
+    /// <summary>
+    /// Called when an entity with a ParrotMemoryComponent tries to vocalize.
+    /// This function picks a message from memory and sets the event to handled
+    /// </summary>
+    private void OnTryVocalize(Entity<ParrotMemoryComponent> entity, ref TryVocalizeEvent args)
+    {
+        // return if this was already handled
+        if (args.Handled)
+            return;
+
+        // if there are no memories, return
+        if (entity.Comp.SpeechMemories.Count == 0)
+            return;
+
+        // get a random memory from the memory list
+        var memory = _random.Pick(entity.Comp.SpeechMemories);
+
+        args.Message = memory.Message;
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Try to learn a new message, returning early if this entity cannot learn a new message,
+    /// the message doesn't pass certain checks, or the chance for learning a new message fails
+    /// </summary>
+    /// <param name="entity">Entity learning a new word</param>
+    /// <param name="incomingMessage">Message to learn</param>
+    /// <param name="source">Source EntityUid of the message</param>
+    public void TryLearn(Entity<ParrotMemoryComponent?, ParrotListenerComponent?> entity, string incomingMessage, EntityUid source)
+    {
+        if (!Resolve(entity, ref entity.Comp1, ref entity.Comp2))
+            return;
+
+        if (!_whitelist.CheckBoth(source, entity.Comp2.Blacklist, entity.Comp2.Whitelist))
+            return;
+
+        if (source.Equals(entity) || _mobState.IsIncapacitated(entity))
+            return;
+
+        // can't learn too soon after having already learnt something else
+        if (_gameTiming.CurTime < entity.Comp1.NextLearnInterval)
+            return;
+
+        // remove whitespace around message, if any
+        var message = incomingMessage.Trim();
+
+        // ignore messages containing tildes. This is a crude way to ignore whispers that are too far away
+        // TODO: this isn't great. This should be replaced with a const or we should have a better way to check faraway messages
+        if (message.Contains('~'))
+            return;
+
+        // ignore empty messages. These probably aren't sent anyway but just in case
+        if (string.IsNullOrWhiteSpace(message))
+            return;
+
+        // ignore messages that are too short or too long
+        if (message.Length < entity.Comp1.MinEntryLength || message.Length > entity.Comp1.MaxEntryLength)
+            return;
+
+        // only from this point this message has a chance of being learned
+        // set new time for learn interval, regardless of whether the learning succeeds
+        entity.Comp1.NextLearnInterval = _gameTiming.CurTime + entity.Comp1.LearnCooldown;
+
+        // decide if this message passes the learning chance
+        if (!_random.Prob(entity.Comp1.LearnChance))
+            return;
+
+        // actually commit this message to memory
+        Learn((entity, entity.Comp1), message, source);
+    }
+
+    /// <summary>
+    /// Actually learn a message and commit it to memory
+    /// </summary>
+    /// <param name="entity">Entity learning a new word</param>
+    /// <param name="message">Message to learn</param>
+    /// <param name="source">Source EntityUid of the message</param>
+    private void Learn(Entity<ParrotMemoryComponent> entity, string message, EntityUid source)
+    {
+        // log a low-priority chat type log to the admin logger
+        // specifies what message was learnt by what entity, and who taught the message to that entity
+        _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Parroting entity {ToPrettyString(entity):entity} learned the phrase \"{message}\" from {ToPrettyString(source):speaker}");
+
+        NetUserId? sourceNetUserId = null;
+        if (_mind.TryGetMind(source, out _, out var mind))
+        {
+            sourceNetUserId = mind.UserId;
+        }
+
+        var newMemory = new SpeechMemory(sourceNetUserId, message);
+
+        // add a new message if there is space in the memory
+        if (entity.Comp.SpeechMemories.Count < entity.Comp.MaxSpeechMemory)
+        {
+            entity.Comp.SpeechMemories.Add(newMemory);
+            return;
+        }
+
+        // if there's no space in memory, replace something at random
+        var replaceIdx = _random.Next(entity.Comp.SpeechMemories.Count);
+        entity.Comp.SpeechMemories[replaceIdx] = newMemory;
+    }
+
+    /// <summary>
+    /// Delete all messages from a specified player on all ParrotMemoryComponents
+    /// </summary>
+    /// <param name="playerNetUserId">The player of whom to delete messages</param>
+    private void DeletePlayerMessages(NetUserId playerNetUserId)
+    {
+        // query to enumerate all entities with a memorycomponent
+        var query = EntityQueryEnumerator<ParrotMemoryComponent>();
+        while (query.MoveNext(out _, out var memory))
+        {
+            DeletePlayerMessages(memory, playerNetUserId);
+        }
+    }
+
+    /// <summary>
+    /// Delete all messages from a specified player on a given ParrotMemoryComponent
+    /// </summary>
+    /// <param name="memoryComponent">The ParrotMemoryComponent on which to delete messages</param>
+    /// <param name="playerNetUserId">The player of whom to delete messages</param>
+    private void DeletePlayerMessages(ParrotMemoryComponent memoryComponent, NetUserId playerNetUserId)
+    {
+        // this is a sort of expensive operation that is hopefully rare and performed on just a few parrots
+        // with limited memory
+        for (var i = 0; i < memoryComponent.SpeechMemories.Count; i++)
+        {
+            var memory = memoryComponent.SpeechMemories[i];
+
+            // netuserid may be null if the message was learnt from a non-player entity
+            if (memory.NetUserId is null)
+                continue;
+
+            // skip if this memory was not learnt from the target user
+            if (!memory.NetUserId.Equals(playerNetUserId))
+                continue;
+
+            // order isn't important in this list so we can use the faster means of removing
+            memoryComponent.SpeechMemories.RemoveSwap(i);
+        }
+    }
+}
diff --git a/Content.Server/Anomaly/AnomalySystem.cs b/Content.Server/Anomaly/AnomalySystem.cs
index b0de3de8f3..9ac0ce7c94 100644
--- a/Content.Server/Anomaly/AnomalySystem.cs
+++ b/Content.Server/Anomaly/AnomalySystem.cs
@@ -44,8 +44,7 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
     public const float MinParticleVariation = 0.8f;
     public const float MaxParticleVariation = 1.2f;
 
-    [ValidatePrototypeId<WeightedRandomPrototype>]
-    const string WeightListProto = "AnomalyBehaviorList";
+    private static readonly ProtoId<WeightedRandomPrototype> WeightListProto = "AnomalyBehaviorList";
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -189,7 +188,7 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
     #region Behavior
     private string GetRandomBehavior()
     {
-        var weightList = _prototype.Index<WeightedRandomPrototype>(WeightListProto);
+        var weightList = _prototype.Index(WeightListProto);
         return weightList.Pick(_random);
     }
 
diff --git a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs
index e93fcc6e8f..3c8a4de2df 100644
--- a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs
+++ b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Arcade;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Server.Arcade.SpaceVillain;
 
@@ -90,8 +89,8 @@ public sealed partial class SpaceVillainArcadeComponent : SharedSpaceVillainArca
     /// The prototypes that can be dispensed as a reward for winning the game.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("possibleRewards", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string> PossibleRewards = new();
+    [DataField]
+    public List<EntProtoId> PossibleRewards = new();
 
     /// <summary>
     /// The minimum number of prizes the arcade machine can have.
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
index cca529fd58..24463442cd 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
@@ -596,8 +596,17 @@ namespace Content.Server.Atmos.EntitySystems
             if (!reconsiderAdjacent)
                 return;
 
+            // Before updating the adjacent tile flags that determine whether air is allowed to flow
+            // or not, we explicitly update airtight data on these tiles right now.
+            // This ensures that UpdateAdjacentTiles has updated data before updating flags.
+            // This allows monstermos' floodfill check that determines if firelocks have dropped
+            // to work correctly.
+            UpdateAirtightData(ent.Owner, ent.Comp1, ent.Comp3, tile);
+            UpdateAirtightData(ent.Owner, ent.Comp1, ent.Comp3, other);
+
             UpdateAdjacentTiles(ent, tile);
             UpdateAdjacentTiles(ent, other);
+
             InvalidateVisuals(ent, tile);
             InvalidateVisuals(ent, other);
         }
diff --git a/Content.Server/Atmos/PressureEvent.cs b/Content.Server/Atmos/PressureEvent.cs
deleted file mode 100644
index 9c0b36a281..0000000000
--- a/Content.Server/Atmos/PressureEvent.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-namespace Content.Server.Atmos
-{
-    public abstract class PressureEvent : EntityEventArgs
-    {
-        /// <summary>
-        ///     The environment pressure.
-        /// </summary>
-        public float Pressure { get; }
-
-        /// <summary>
-        ///     The modifier for the apparent pressure.
-        ///     This number will be added to the environment pressure for calculation purposes.
-        ///     It can be negative to reduce the felt pressure, or positive to increase it.
-        /// </summary>
-        /// <remarks>
-        ///     Do not set this directly. Add to it, or subtract from it to modify it.
-        /// </remarks>
-        public float Modifier { get; set; } = 0f;
-
-        /// <summary>
-        ///     The multiplier for the apparent pressure.
-        ///     The environment pressure will be multiplied by this for calculation purposes.
-        /// </summary>
-        /// <remarks>
-        ///     Do not set, add to or subtract from this directly. Multiply this by your multiplier only.
-        /// </remarks>
-        public float Multiplier { get; set; } = 1f;
-
-        protected PressureEvent(float pressure)
-        {
-            Pressure = pressure;
-        }
-    }
-
-    public sealed class LowPressureEvent : PressureEvent
-    {
-        public LowPressureEvent(float pressure) : base(pressure) { }
-    }
-
-    public sealed class HighPressureEvent : PressureEvent
-    {
-        public HighPressureEvent(float pressure) : base(pressure) { }
-    }
-}
diff --git a/Content.Server/Bed/BedSystem.cs b/Content.Server/Bed/BedSystem.cs
index 91b31c782b..8cfb28acb6 100644
--- a/Content.Server/Bed/BedSystem.cs
+++ b/Content.Server/Bed/BedSystem.cs
@@ -1,23 +1,15 @@
-using Content.Server.Bed.Components;
-using Content.Server.Power.EntitySystems;
 using Content.Shared.Bed;
 using Content.Shared.Bed.Components;
 using Content.Shared.Bed.Sleep;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Events;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Damage;
-using Content.Shared.Emag.Systems;
 using Content.Shared.Mobs.Systems;
-using Content.Shared.Power;
 
 namespace Content.Server.Bed
 {
     public sealed class BedSystem : SharedBedSystem
     {
         [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-        [Dependency] private readonly EmagSystem _emag = default!;
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
 
         private EntityQuery<SleepingComponent> _sleepingQuery;
@@ -27,11 +19,6 @@ namespace Content.Server.Bed
             base.Initialize();
 
             _sleepingQuery = GetEntityQuery<SleepingComponent>();
-
-            SubscribeLocalEvent<StasisBedComponent, StrappedEvent>(OnStasisStrapped);
-            SubscribeLocalEvent<StasisBedComponent, UnstrappedEvent>(OnStasisUnstrapped);
-            SubscribeLocalEvent<StasisBedComponent, PowerChangedEvent>(OnPowerChanged);
-            SubscribeLocalEvent<StasisBedComponent, GotEmaggedEvent>(OnEmagged);
         }
 
         public override void Update(float frameTime)
@@ -63,61 +50,5 @@ namespace Content.Server.Bed
                 }
             }
         }
-
-        private void UpdateAppearance(EntityUid uid, bool isOn)
-        {
-            _appearance.SetData(uid, StasisBedVisuals.IsOn, isOn);
-        }
-
-        private void OnStasisStrapped(Entity<StasisBedComponent> bed, ref StrappedEvent args)
-        {
-            if (!HasComp<BodyComponent>(args.Buckle) || !this.IsPowered(bed, EntityManager))
-                return;
-
-            var metabolicEvent = new ApplyMetabolicMultiplierEvent(args.Buckle, bed.Comp.Multiplier, true);
-            RaiseLocalEvent(args.Buckle, ref metabolicEvent);
-        }
-
-        private void OnStasisUnstrapped(Entity<StasisBedComponent> bed, ref UnstrappedEvent args)
-        {
-            if (!HasComp<BodyComponent>(args.Buckle) || !this.IsPowered(bed, EntityManager))
-                return;
-
-            var metabolicEvent = new ApplyMetabolicMultiplierEvent(args.Buckle, bed.Comp.Multiplier, false);
-            RaiseLocalEvent(args.Buckle, ref metabolicEvent);
-        }
-
-        private void OnPowerChanged(EntityUid uid, StasisBedComponent component, ref PowerChangedEvent args)
-        {
-            UpdateAppearance(uid, args.Powered);
-            UpdateMetabolisms(uid, component, args.Powered);
-        }
-
-        private void OnEmagged(EntityUid uid, StasisBedComponent component, ref GotEmaggedEvent args)
-        {
-            if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
-                return;
-
-            if (_emag.CheckFlag(uid, EmagType.Interaction))
-                return;
-
-            // Reset any metabolisms first so they receive the multiplier correctly
-            UpdateMetabolisms(uid, component, false);
-            component.Multiplier = 1 / component.Multiplier;
-            UpdateMetabolisms(uid, component, true);
-            args.Handled = true;
-        }
-
-        private void UpdateMetabolisms(EntityUid uid, StasisBedComponent component, bool shouldApply)
-        {
-            if (!TryComp<StrapComponent>(uid, out var strap) || strap.BuckledEntities.Count == 0)
-                return;
-
-            foreach (var buckledEntity in strap.BuckledEntities)
-            {
-                var metabolicEvent = new ApplyMetabolicMultiplierEvent(buckledEntity, component.Multiplier, shouldApply);
-                RaiseLocalEvent(buckledEntity, ref metabolicEvent);
-            }
-        }
     }
 }
diff --git a/Content.Server/Bed/Components/StasisBedComponent.cs b/Content.Server/Bed/Components/StasisBedComponent.cs
deleted file mode 100644
index 160bd0ac67..0000000000
--- a/Content.Server/Bed/Components/StasisBedComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Content.Server.Bed.Components
-{
-    [RegisterComponent]
-    public sealed partial class StasisBedComponent : Component
-    {
-        /// <summary>
-        /// What the metabolic update rate will be multiplied by (higher = slower metabolism)
-        /// </summary>
-        [ViewVariables(VVAccess.ReadOnly)] // Writing is is not supported. ApplyMetabolicMultiplierEvent needs to be refactored first
-        [DataField]
-        public float Multiplier = 10f;
-    }
-}
diff --git a/Content.Server/Body/Commands/AddHandCommand.cs b/Content.Server/Body/Commands/AddHandCommand.cs
index 3e006c539c..4d2805333a 100644
--- a/Content.Server/Body/Commands/AddHandCommand.cs
+++ b/Content.Server/Body/Commands/AddHandCommand.cs
@@ -1,12 +1,13 @@
 using System.Linq;
 using Content.Server.Administration;
 using Content.Server.Body.Systems;
+using Content.Server.Hands.Systems;
 using Content.Shared.Administration;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
+using Content.Shared.Hands.Components;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 
 namespace Content.Server.Body.Commands
 {
@@ -15,10 +16,9 @@ namespace Content.Server.Body.Commands
     {
         [Dependency] private readonly IEntityManager _entManager = default!;
         [Dependency] private readonly IPrototypeManager _protoManager = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
 
-        [ValidatePrototypeId<EntityPrototype>]
-        public const string DefaultHandPrototype = "LeftHandHuman";
+        private static readonly EntProtoId DefaultHandPrototype = "LeftHandHuman";
+        private static int _handIdAccumulator;
 
         public string Command => "addhand";
         public string Description => "Adds a hand to your entity.";
@@ -115,9 +115,17 @@ namespace Content.Server.Body.Commands
 
             if (!_entManager.TryGetComponent(entity, out BodyComponent? body) || body.RootContainer.ContainedEntity == null)
             {
-                var text = $"You have no body{(_random.Prob(0.2f) ? " and you must scream." : ".")}";
+                var location = _entManager.GetComponentOrNull<BodyPartComponent>(hand)?.Symmetry switch
+                {
+                    BodyPartSymmetry.None => HandLocation.Middle,
+                    BodyPartSymmetry.Left => HandLocation.Left,
+                    BodyPartSymmetry.Right => HandLocation.Right,
+                    _ => HandLocation.Right
+                };
+                _entManager.DeleteEntity(hand);
 
-                shell.WriteLine(text);
+                // You have no body and you must scream.
+                _entManager.System<HandsSystem>().AddHand(entity, $"{hand}-cmd-{_handIdAccumulator++}", location);
                 return;
             }
 
diff --git a/Content.Server/Body/Components/MetabolizerComponent.cs b/Content.Server/Body/Components/MetabolizerComponent.cs
index 3699267ebf..5821b0d944 100644
--- a/Content.Server/Body/Components/MetabolizerComponent.cs
+++ b/Content.Server/Body/Components/MetabolizerComponent.cs
@@ -26,6 +26,18 @@ namespace Content.Server.Body.Components
         [DataField]
         public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
 
+        /// <summary>
+        /// Multiplier applied to <see cref="UpdateInterval"/> for adjusting based on metabolic rate multiplier.
+        /// </summary>
+        [DataField]
+        public float UpdateIntervalMultiplier = 1f;
+
+        /// <summary>
+        /// Adjusted update interval based off of the multiplier value.
+        /// </summary>
+        [ViewVariables]
+        public TimeSpan AdjustedUpdateInterval => UpdateInterval * UpdateIntervalMultiplier;
+
         /// <summary>
         ///     From which solution will this metabolizer attempt to metabolize chemicals
         /// </summary>
@@ -46,14 +58,14 @@ namespace Content.Server.Body.Components
         /// </summary>
         [DataField]
         [Access(typeof(MetabolizerSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
-        public HashSet<ProtoId<MetabolizerTypePrototype>>? MetabolizerTypes = null;
+        public HashSet<ProtoId<MetabolizerTypePrototype>>? MetabolizerTypes;
 
         /// <summary>
         ///     Should this metabolizer remove chemicals that have no metabolisms defined?
         ///     As a stop-gap, basically.
         /// </summary>
         [DataField]
-        public bool RemoveEmpty = false;
+        public bool RemoveEmpty;
 
         /// <summary>
         ///     How many reagents can this metabolizer process at once?
@@ -67,7 +79,7 @@ namespace Content.Server.Body.Components
         ///     A list of metabolism groups that this metabolizer will act on, in order of precedence.
         /// </summary>
         [DataField("groups")]
-        public List<MetabolismGroupEntry>? MetabolismGroups = default!;
+        public List<MetabolismGroupEntry>? MetabolismGroups;
     }
 
     /// <summary>
@@ -78,7 +90,7 @@ namespace Content.Server.Body.Components
     public sealed partial class MetabolismGroupEntry
     {
         [DataField(required: true)]
-        public ProtoId<MetabolismGroupPrototype> Id = default!;
+        public ProtoId<MetabolismGroupPrototype> Id;
 
         [DataField("rateModifier")]
         public FixedPoint2 MetabolismRateModifier = 1.0;
diff --git a/Content.Server/Body/Components/RespiratorComponent.cs b/Content.Server/Body/Components/RespiratorComponent.cs
index 19585e9f00..2ba7b04b3e 100644
--- a/Content.Server/Body/Components/RespiratorComponent.cs
+++ b/Content.Server/Body/Components/RespiratorComponent.cs
@@ -1,5 +1,4 @@
 using Content.Server.Body.Systems;
-using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Chat.Prototypes;
 using Content.Shared.Damage;
@@ -8,19 +7,9 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.Body.Components
 {
-    [RegisterComponent, Access(typeof(RespiratorSystem))]
+    [RegisterComponent, Access(typeof(RespiratorSystem)), AutoGenerateComponentPause]
     public sealed partial class RespiratorComponent : Component
     {
-        /// <summary>
-        ///     Gas container for this entity
-        /// </summary>
-        [DataField]
-        public GasMixture Air = new()
-        {
-            Volume = 6, // 6 liters, the average lung capacity for a human according to Google
-            Temperature = Atmospherics.NormalBodyTemperature
-        };
-
         /// <summary>
         ///     Volume of our breath in liters
         /// </summary>
@@ -36,7 +25,7 @@ namespace Content.Server.Body.Components
         /// <summary>
         ///     The next time that this body will inhale or exhale.
         /// </summary>
-        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
         public TimeSpan NextUpdate;
 
         /// <summary>
@@ -46,6 +35,18 @@ namespace Content.Server.Body.Components
         [DataField]
         public TimeSpan UpdateInterval = TimeSpan.FromSeconds(2);
 
+        /// <summary>
+        /// Multiplier applied to <see cref="UpdateInterval"/> for adjusting based on metabolic rate multiplier.
+        /// </summary>
+        [DataField]
+        public float UpdateIntervalMultiplier = 1f;
+
+        /// <summary>
+        /// Adjusted update interval based off of the multiplier value.
+        /// </summary>
+        [ViewVariables]
+        public TimeSpan AdjustedUpdateInterval => UpdateInterval * UpdateIntervalMultiplier;
+
         /// <summary>
         ///     Saturation level. Reduced by UpdateInterval each tick.
         ///     Can be thought of as 'how many seconds you have until you start suffocating' in this configuration.
diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs
index 72c91fe2be..77f17b384d 100644
--- a/Content.Server/Body/Systems/InternalsSystem.cs
+++ b/Content.Server/Body/Systems/InternalsSystem.cs
@@ -48,7 +48,7 @@ public sealed class InternalsSystem : SharedInternalsSystem
             return;
 
         // Could the entity metabolise the air in the linked gas tank?
-        if (!_respirator.CanMetabolizeGas(uid, tank.Value.Comp.Air))
+        if (!_respirator.CanMetabolizeInhaledAir(uid, tank.Value.Comp.Air))
             return;
 
         ToggleInternals(uid, uid, force: false, component, ToggleMode.On);
diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
index 5577b42a06..c59f87f576 100644
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ b/Content.Server/Body/Systems/MetabolizerSystem.cs
@@ -2,6 +2,7 @@ using Content.Server.Body.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Organ;
+using Content.Shared.Body.Systems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
@@ -18,7 +19,8 @@ using Robust.Shared.Timing;
 
 namespace Content.Server.Body.Systems
 {
-    public sealed class MetabolizerSystem : EntitySystem
+    /// <inheritdoc/>
+    public sealed class MetabolizerSystem : SharedMetabolizerSystem
     {
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -45,7 +47,7 @@ namespace Content.Server.Body.Systems
 
         private void OnMapInit(Entity<MetabolizerComponent> ent, ref MapInitEvent args)
         {
-            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
+            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.AdjustedUpdateInterval;
         }
 
         private void OnUnpaused(Entity<MetabolizerComponent> ent, ref EntityUnpausedEvent args)
@@ -65,20 +67,9 @@ namespace Content.Server.Body.Systems
             }
         }
 
-        private void OnApplyMetabolicMultiplier(
-            Entity<MetabolizerComponent> ent,
-            ref ApplyMetabolicMultiplierEvent args)
+        private void OnApplyMetabolicMultiplier(Entity<MetabolizerComponent> ent, ref ApplyMetabolicMultiplierEvent args)
         {
-            // TODO REFACTOR THIS
-            // This will slowly drift over time due to floating point errors.
-            // Instead, raise an event with the base rates and allow modifiers to get applied to it.
-            if (args.Apply)
-            {
-                ent.Comp.UpdateInterval *= args.Multiplier;
-                return;
-            }
-
-            ent.Comp.UpdateInterval /= args.Multiplier;
+            ent.Comp.UpdateIntervalMultiplier = args.Multiplier;
         }
 
         public override void Update(float frameTime)
@@ -99,7 +90,7 @@ namespace Content.Server.Body.Systems
                 if (_gameTiming.CurTime < metab.NextUpdate)
                     continue;
 
-                metab.NextUpdate += metab.UpdateInterval;
+                metab.NextUpdate += metab.AdjustedUpdateInterval;
                 TryMetabolize((uid, metab));
             }
         }
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index bc57108720..c327f235de 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -48,33 +48,32 @@ public sealed class RespiratorSystem : EntitySystem
         // We want to process lung reagents before we inhale new reagents.
         UpdatesAfter.Add(typeof(MetabolizerSystem));
         SubscribeLocalEvent<RespiratorComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<RespiratorComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<RespiratorComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
+
+        // BodyComp stuff
         SubscribeLocalEvent<BodyComponent, InhaledGasEvent>(OnGasInhaled);
         SubscribeLocalEvent<BodyComponent, ExhaledGasEvent>(OnGasExhaled);
+        SubscribeLocalEvent<BodyComponent, CanMetabolizeGasEvent>(CanBodyMetabolizeGas);
+        SubscribeLocalEvent<BodyComponent, SuffocationEvent>(OnSuffocation);
+        SubscribeLocalEvent<BodyComponent, StopSuffocatingEvent>(OnStopSuffocating);
     }
 
     private void OnMapInit(Entity<RespiratorComponent> ent, ref MapInitEvent args)
     {
-        ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
-    }
-
-    private void OnUnpaused(Entity<RespiratorComponent> ent, ref EntityUnpausedEvent args)
-    {
-        ent.Comp.NextUpdate += args.PausedTime;
+        ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.AdjustedUpdateInterval;
     }
 
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
 
-        var query = EntityQueryEnumerator<RespiratorComponent, BodyComponent>();
-        while (query.MoveNext(out var uid, out var respirator, out var body))
+        var query = EntityQueryEnumerator<RespiratorComponent>();
+        while (query.MoveNext(out var uid, out var respirator))
         {
             if (_gameTiming.CurTime < respirator.NextUpdate)
                 continue;
 
-            respirator.NextUpdate += respirator.UpdateInterval;
+            respirator.NextUpdate += respirator.AdjustedUpdateInterval;
 
             if (_mobState.IsDead(uid))
                 continue;
@@ -86,11 +85,11 @@ public sealed class RespiratorSystem : EntitySystem
                 switch (respirator.Status)
                 {
                     case RespiratorStatus.Inhaling:
-                        Inhale(uid);
+                        Inhale((uid, respirator));
                         respirator.Status = RespiratorStatus.Exhaling;
                         break;
                     case RespiratorStatus.Exhaling:
-                        Exhale(uid);
+                        Exhale((uid, respirator));
                         respirator.Status = RespiratorStatus.Inhaling;
                         break;
                 }
@@ -117,10 +116,10 @@ public sealed class RespiratorSystem : EntitySystem
         }
     }
 
-    public bool Inhale(Entity<RespiratorComponent?> entity)
+    public void Inhale(Entity<RespiratorComponent?> entity)
     {
         if (!Resolve(entity, ref entity.Comp, logMissing: false))
-            return false;
+            return;
 
         // Inhale gas
         var ev = new InhaleLocationEvent
@@ -132,23 +131,22 @@ public sealed class RespiratorSystem : EntitySystem
         ev.Gas ??= _atmosSys.GetContainingMixture(entity.Owner, excite: true);
 
         if (ev.Gas is null)
-        {
-            return false;
-        }
+            return;
 
         var gas = ev.Gas.RemoveVolume(entity.Comp.BreathVolume);
 
         var inhaleEv = new InhaledGasEvent(gas);
         RaiseLocalEvent(entity, ref inhaleEv);
 
-        return inhaleEv.Handled && inhaleEv.Succeeded;
-    }
-
-    public void Exhale(Entity<RespiratorComponent?> entity)
-    {
-        if (!Resolve(entity, ref entity.Comp, logMissing: false))
+        if (inhaleEv.Handled && inhaleEv.Succeeded)
             return;
 
+        // If nothing could inhale the gas give it back.
+        _atmosSys.Merge(ev.Gas, gas);
+    }
+
+    public void Exhale(Entity<RespiratorComponent> entity)
+    {
         // exhale gas
 
         var ev = new ExhaleLocationEvent();
@@ -163,8 +161,16 @@ public sealed class RespiratorSystem : EntitySystem
             ev.Gas ??= GasMixture.SpaceGas;
         }
 
-        var exhaleEv = new ExhaledGasEvent(ev.Gas);
-        RaiseLocalEvent(entity, ref exhaleEv);
+        Exhale(entity!, ev.Gas);
+    }
+
+    public void Exhale(Entity<RespiratorComponent?> entity, GasMixture gas)
+    {
+        if (!Resolve(entity, ref entity.Comp, logMissing: false))
+            return;
+
+        var ev = new ExhaledGasEvent(gas);
+        RaiseLocalEvent(entity, ref ev);
     }
 
     /// <summary>
@@ -182,52 +188,76 @@ public sealed class RespiratorSystem : EntitySystem
     }
 
     /// <summary>
-    /// Check whether or not an entity can metabolize inhaled air without suffocating or taking damage (i.e., no toxic
-    /// gasses).
+    /// Checks if it's safe for a given entity to breathe the air from the environment it is currently situated in.
     /// </summary>
+    /// <param name="ent">The entity attempting to metabolize the gas.</param>
+    /// <returns>Returns true only if the air is not toxic, and it wouldn't suffocate.</returns>
     public bool CanMetabolizeInhaledAir(Entity<RespiratorComponent?> ent)
     {
         if (!Resolve(ent, ref ent.Comp))
             return false;
 
-        if (!Inhale(ent))
-            return false;
+        // Get the gas at our location but don't actually remove it from the gas mixture.
+        var ev = new InhaleLocationEvent
+        {
+            Respirator = ent.Comp,
+        };
+        RaiseLocalEvent(ent, ref ev);
 
-        // If we don't have a body we can't be poisoned by gas, yet...
-        var success = TryMetabolizeGas((ent, ent.Comp));
+        ev.Gas ??= _atmosSys.GetContainingMixture(ent.Owner, excite: true);
 
-        // Don't keep that gas in our lungs lest it poisons a poor nuclear operative.
-        Exhale(ent);
-        return success;
+        // If there's no air to breathe or we can't metabolize it then internals should be on.
+        return ev.Gas is not null && CanMetabolizeInhaledAir(ent, ev.Gas);
     }
 
     /// <summary>
-    /// Check whether or not an entity can metabolize the given gas mixture without suffocating or taking damage
-    /// (i.e., no toxic gasses).
+    /// Checks if a given entity can safely metabolize a given gas mixture.
     /// </summary>
-    public bool CanMetabolizeGas(Entity<RespiratorComponent?> ent, GasMixture gas)
+    /// <param name="ent">The entity attempting to metabolize the gas.</param>
+    /// <param name="gas">The gas mixture we are trying to metabolize.</param>
+    /// <returns>Returns true only if the gas mixture is not toxic, and it wouldn't suffocate.</returns>
+    public bool CanMetabolizeInhaledAir(Entity<RespiratorComponent?> ent, GasMixture gas)
     {
         if (!Resolve(ent, ref ent.Comp))
             return false;
 
-        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
-        if (organs.Count == 0)
+        var ev = new CanMetabolizeGasEvent(gas);
+        RaiseLocalEvent(ent, ref ev);
+
+        if (!ev.Handled || ev.Toxic)
             return false;
 
-        gas = new GasMixture(gas);
-        var lungRatio = 1.0f / organs.Count;
-        gas.Multiply(MathF.Min(lungRatio * gas.Volume / ent.Comp.BreathVolume, lungRatio));
-        var solution = _lungSystem.GasToReagent(gas);
+        return ev.Saturation > ent.Comp.UpdateInterval.TotalSeconds;
+    }
 
-        float saturation = 0;
+    /// <summary>
+    /// Tries to safely metabolize the current solutions in a body's lungs.
+    /// </summary>
+    private void CanBodyMetabolizeGas(Entity<BodyComponent> ent, ref CanMetabolizeGasEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
+        if (organs.Count == 0)
+            return;
+
+        var solution = _lungSystem.GasToReagent(args.Gas);
+
+        var saturation = 0f;
         foreach (var organ in organs)
         {
             saturation += GetSaturation(solution, organ.Owner, out var toxic);
-            if (toxic)
-                return false;
+            if (!toxic)
+                continue;
+
+            args.Handled = true;
+            args.Toxic = true;
+            return;
         }
 
-        return saturation > ent.Comp.UpdateInterval.TotalSeconds;
+        args.Handled = true;
+        args.Saturation = saturation;
     }
 
     public bool TryInhaleGasToBody(Entity<BodyComponent?> entity, GasMixture gas)
@@ -271,30 +301,6 @@ public sealed class RespiratorSystem : EntitySystem
         _atmosSys.Merge(gas, outGas);
     }
 
-    /// <summary>
-    /// Tries to safely metabolize the current solutions in a body's lungs.
-    /// </summary>
-    private bool TryMetabolizeGas(Entity<RespiratorComponent, BodyComponent?> ent)
-    {
-        if (!Resolve(ent, ref ent.Comp2))
-            return false;
-
-        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
-        if (organs.Count == 0)
-            return false;
-
-        float saturation = 0;
-        foreach (var organ in organs)
-        {
-            var solution = _lungSystem.GasToReagent(organ.Comp1.Air);
-            saturation += GetSaturation(solution, organ.Owner, out var toxic);
-            if (toxic)
-                return false;
-        }
-
-        return saturation > ent.Comp1.UpdateInterval.TotalSeconds;
-    }
-
     /// <summary>
     /// Get the amount of saturation that would be generated if the lung were to metabolize the given solution.
     /// </summary>
@@ -360,15 +366,11 @@ public sealed class RespiratorSystem : EntitySystem
 
         _damageableSys.TryChangeDamage(ent, ent.Comp.Damage, interruptsDoAfters: false);
 
-        if (ent.Comp.SuffocationCycles >= ent.Comp.SuffocationCycleThreshold)
-        {
-            // TODO: This is not going work with multiple different lungs, if that ever becomes a possibility
-            var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
-            foreach (var entity in organs)
-            {
-                _alertsSystem.ShowAlert(ent, entity.Comp1.Alert);
-            }
-        }
+        if (ent.Comp.SuffocationCycles < ent.Comp.SuffocationCycleThreshold)
+            return;
+
+        var ev = new SuffocationEvent();
+        RaiseLocalEvent(ent, ref ev);
     }
 
     private void StopSuffocation(Entity<RespiratorComponent> ent)
@@ -378,6 +380,22 @@ public sealed class RespiratorSystem : EntitySystem
 
         _damageableSys.TryChangeDamage(ent, ent.Comp.DamageRecovery);
 
+        var ev = new StopSuffocatingEvent();
+        RaiseLocalEvent(ent, ref ev);
+    }
+
+    private void OnSuffocation(Entity<BodyComponent> ent, ref SuffocationEvent args)
+    {
+        // TODO: This is not going work with multiple different lungs, if that ever becomes a possibility
+        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
+        foreach (var entity in organs)
+        {
+            _alertsSystem.ShowAlert(ent, entity.Comp1.Alert);
+        }
+    }
+
+    private void OnStopSuffocating(Entity<BodyComponent> ent, ref StopSuffocatingEvent args)
+    {
         // TODO: This is not going work with multiple different lungs, if that ever becomes a possibility
         var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
         foreach (var entity in organs)
@@ -396,31 +414,16 @@ public sealed class RespiratorSystem : EntitySystem
             Math.Clamp(respirator.Saturation, respirator.MinSaturation, respirator.MaxSaturation);
     }
 
-    private void OnApplyMetabolicMultiplier(
-        Entity<RespiratorComponent> ent,
-        ref ApplyMetabolicMultiplierEvent args)
+    private void OnApplyMetabolicMultiplier(Entity<RespiratorComponent> ent, ref ApplyMetabolicMultiplierEvent args)
     {
-        // TODO REFACTOR THIS
-        // This will slowly drift over time due to floating point errors.
-        // Instead, raise an event with the base rates and allow modifiers to get applied to it.
-        if (args.Apply)
-        {
-            ent.Comp.UpdateInterval *= args.Multiplier;
-            ent.Comp.Saturation *= args.Multiplier;
-            ent.Comp.MaxSaturation *= args.Multiplier;
-            ent.Comp.MinSaturation *= args.Multiplier;
-            return;
-        }
-
-        // This way we don't have to worry about it breaking if the stasis bed component is destroyed
-        ent.Comp.UpdateInterval /= args.Multiplier;
-        ent.Comp.Saturation /= args.Multiplier;
-        ent.Comp.MaxSaturation /= args.Multiplier;
-        ent.Comp.MinSaturation /= args.Multiplier;
+        ent.Comp.UpdateIntervalMultiplier = args.Multiplier;
     }
 
     private void OnGasInhaled(Entity<BodyComponent> entity, ref InhaledGasEvent args)
     {
+        if (args.Handled)
+            return;
+
         args.Handled = true;
 
         args.Succeeded = TryInhaleGasToBody((entity, entity.Comp), args.Gas);
@@ -428,20 +431,65 @@ public sealed class RespiratorSystem : EntitySystem
 
     private void OnGasExhaled(Entity<BodyComponent> entity, ref ExhaledGasEvent args)
     {
+        if (args.Handled)
+            return;
+
         args.Handled = true;
 
         RemoveGasFromBody(entity, args.Gas);
     }
 }
 
+/// <summary>
+/// Event raised when an entity first tries to inhale that returns a GasMixture from a given location.
+/// </summary>
+/// <param name="Gas">The gas that gets returned, null if there is none.</param>
+/// <param name="Respirator">The Respirator component of the entity attempting to inhale</param>
 [ByRefEvent]
 public record struct InhaleLocationEvent(GasMixture? Gas, RespiratorComponent Respirator);
 
+/// <summary>
+/// Event raised when an entity first tries to exhale a gas, determines where the gas they're exhaling will be sent.
+/// </summary>
+/// <param name="Gas">The gas mixture that the exhaled gas will be merged into.</param>
 [ByRefEvent]
 public record struct ExhaleLocationEvent(GasMixture? Gas);
 
+/// <summary>
+/// Event raised when an entity successfully inhales a gas, attempts to find a place to put the gas.
+/// </summary>
+/// <param name="Gas">The gas we're inhaling.</param>
+/// <param name="Handled">Whether a system has responded appropriately.</param>
+/// <param name="Succeeded">Whether we successfully managed to inhale the gas</param>
 [ByRefEvent]
 public record struct InhaledGasEvent(GasMixture Gas, bool Handled = false, bool Succeeded = false);
 
+/// <summary>
+/// Event raised when an entity is exhaling
+/// </summary>
+/// <param name="Gas">The gas mixture we're exhaling into.</param>
+/// <param name="Handled">Whether we have successfully exhaled or not.</param>
 [ByRefEvent]
 public record struct ExhaledGasEvent(GasMixture Gas, bool Handled = false);
+
+/// <summary>
+/// Raised when an entity starts suffocating and when suffocation progresses.
+/// </summary>
+[ByRefEvent]
+public record struct SuffocationEvent;
+
+/// <summary>
+/// Raised when an entity that was suffocating stops suffocating.
+/// </summary>
+[ByRefEvent]
+public record struct StopSuffocatingEvent;
+
+/// <summary>
+/// An event raised to inhalation handlers that asks them nicely to simulate what it would be like to metabolize
+/// a given volume of gas, without actually metabolizing it.
+/// </summary>
+/// <param name="Gas">The gas mixture we are testing.</param>
+/// <param name="Toxic">Whether the gas returns as toxic to any respirator.</param>
+/// <param name="Saturation">The amount of saturation we got from the gas.</param>
+[ByRefEvent]
+public record struct CanMetabolizeGasEvent(GasMixture Gas, bool Toxic = false, float Saturation = 0f, bool Handled = false);
diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs
index ae182cbe7e..ee7ca4f584 100644
--- a/Content.Server/Botany/SeedPrototype.cs
+++ b/Content.Server/Botany/SeedPrototype.cs
@@ -1,17 +1,14 @@
 using Content.Server.Botany.Components;
 using Content.Server.Botany.Systems;
+using Content.Server.EntityEffects;
 using Content.Shared.Atmos;
 using Content.Shared.Database;
-using Content.Shared.EntityEffects;
 using Content.Shared.Random;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 using Robust.Shared.Utility;
 
-using Content.Server.EntityEffects;
-
 namespace Content.Server.Botany;
 
 [Prototype]
@@ -133,8 +130,8 @@ public partial class SeedData
     /// <summary>
     ///     The entity prototype this seed spawns when it gets harvested.
     /// </summary>
-    [DataField("productPrototypes", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string> ProductPrototypes = new();
+    [DataField]
+    public List<EntProtoId> ProductPrototypes = new();
 
     [DataField] public Dictionary<string, SeedChemQuantity> Chemicals = new();
 
@@ -243,8 +240,8 @@ public partial class SeedData
     /// <summary>
     ///     The seed prototypes this seed may mutate into when prompted to.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(PrototypeIdListSerializer<SeedPrototype>))]
-    public List<string> MutationPrototypes = new();
+    [DataField]
+    public List<ProtoId<SeedPrototype>> MutationPrototypes = new();
 
     /// <summary>
     ///  Log impact for when the seed is planted.
@@ -270,8 +267,8 @@ public partial class SeedData
             Mysterious = Mysterious,
 
             PacketPrototype = PacketPrototype,
-            ProductPrototypes = new List<string>(ProductPrototypes),
-            MutationPrototypes = new List<string>(MutationPrototypes),
+            ProductPrototypes = new List<EntProtoId>(ProductPrototypes),
+            MutationPrototypes = new List<ProtoId<SeedPrototype>>(MutationPrototypes),
             Chemicals = new Dictionary<string, SeedChemQuantity>(Chemicals),
             ConsumeGasses = new Dictionary<Gas, float>(ConsumeGasses),
             ExudeGasses = new Dictionary<Gas, float>(ExudeGasses),
@@ -330,8 +327,8 @@ public partial class SeedData
             Mysterious = other.Mysterious,
 
             PacketPrototype = other.PacketPrototype,
-            ProductPrototypes = new List<string>(other.ProductPrototypes),
-            MutationPrototypes = new List<string>(other.MutationPrototypes),
+            ProductPrototypes = new List<EntProtoId>(other.ProductPrototypes),
+            MutationPrototypes = new List<ProtoId<SeedPrototype>>(other.MutationPrototypes),
 
             Chemicals = new Dictionary<string, SeedChemQuantity>(Chemicals),
             ConsumeGasses = new Dictionary<Gas, float>(ConsumeGasses),
diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs
index 37b68d9475..ee35db48e3 100644
--- a/Content.Server/Botany/Systems/MutationSystem.cs
+++ b/Content.Server/Botany/Systems/MutationSystem.cs
@@ -9,13 +9,15 @@ namespace Content.Server.Botany;
 
 public sealed class MutationSystem : EntitySystem
 {
+    private static ProtoId<RandomPlantMutationListPrototype> RandomPlantMutations = "RandomPlantMutations";
+
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     private RandomPlantMutationListPrototype _randomMutations = default!;
 
     public override void Initialize()
     {
-        _randomMutations = _prototypeManager.Index<RandomPlantMutationListPrototype>("RandomPlantMutations");
+        _randomMutations = _prototypeManager.Index(RandomPlantMutations);
     }
 
     /// <summary>
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index 456d979959..934517eadc 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -29,8 +29,7 @@ public sealed partial class CargoSystem
     [Dependency] private readonly NameIdentifierSystem _nameIdentifier = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSys = default!;
 
-    [ValidatePrototypeId<NameIdentifierGroupPrototype>]
-    private const string BountyNameIdentifierGroup = "Bounty";
+    private static readonly ProtoId<NameIdentifierGroupPrototype> BountyNameIdentifierGroup = "Bounty";
 
     private EntityQuery<StackComponent> _stackQuery;
     private EntityQuery<ContainerManagerComponent> _containerQuery;
diff --git a/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
index 5247aafbd5..b1b23b2732 100644
--- a/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
+++ b/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
@@ -16,8 +16,7 @@ public sealed class CrewManifestCartridgeSystem : EntitySystem
     [Dependency] private readonly CrewManifestSystem _crewManifest = default!;
     [Dependency] private readonly StationSystem _stationSystem = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string CartridgePrototypeName = "CrewManifestCartridge";
+    private static readonly EntProtoId CartridgePrototypeName = "CrewManifestCartridge";
 
     /// <summary>
     /// Flag that shows that if crew manifest is allowed to be viewed from 'unsecure' entities,
diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
index 75acd2493b..ee891e0870 100644
--- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
@@ -1,5 +1,7 @@
 using System.Collections.Frozen;
+using Content.Server.Popups;
 using Content.Shared.Chat.Prototypes;
+using Content.Shared.Emoting;
 using Content.Shared.Speech;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -10,6 +12,8 @@ namespace Content.Server.Chat.Systems;
 // emotes using emote prototype
 public partial class ChatSystem
 {
+    [Dependency] private readonly PopupSystem _popupSystem = default!;
+
     private FrozenDictionary<string, EmotePrototype> _wordEmoteDict = FrozenDictionary<string, EmotePrototype>.Empty;
 
     protected override void OnPrototypeReload(PrototypesReloadedEventArgs obj)
@@ -51,7 +55,8 @@ public partial class ChatSystem
     /// <param name="range">Conceptual range of transmission, if it shows in the chat window, if it shows to far-away ghosts or ghosts at all...</param>
     /// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>. If this is set, the event will not get raised.</param>
     /// <param name="forceEmote">Bypasses whitelist/blacklist/availibility checks for if the entity can use this emote</param>
-    public void TryEmoteWithChat(
+    /// <returns>True if an emote was performed. False if the emote is unvailable, cancelled, etc.</returns>
+    public bool TryEmoteWithChat(
         EntityUid source,
         string emoteId,
         ChatTransmitRange range = ChatTransmitRange.Normal,
@@ -62,8 +67,8 @@ public partial class ChatSystem
         )
     {
         if (!_prototypeManager.TryIndex<EmotePrototype>(emoteId, out var proto))
-            return;
-        TryEmoteWithChat(source, proto, range, hideLog: hideLog, nameOverride, ignoreActionBlocker: ignoreActionBlocker, forceEmote: forceEmote);
+            return false;
+        return TryEmoteWithChat(source, proto, range, hideLog: hideLog, nameOverride, ignoreActionBlocker: ignoreActionBlocker, forceEmote: forceEmote);
     }
 
     /// <summary>
@@ -76,7 +81,8 @@ public partial class ChatSystem
     /// <param name="range">Conceptual range of transmission, if it shows in the chat window, if it shows to far-away ghosts or ghosts at all...</param>
     /// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>. If this is set, the event will not get raised.</param>
     /// <param name="forceEmote">Bypasses whitelist/blacklist/availibility checks for if the entity can use this emote</param>
-    public void TryEmoteWithChat(
+    /// <returns>True if an emote was performed. False if the emote is unvailable, cancelled, etc.</returns>
+    public bool TryEmoteWithChat(
         EntityUid source,
         EmotePrototype emote,
         ChatTransmitRange range = ChatTransmitRange.Normal,
@@ -84,43 +90,46 @@ public partial class ChatSystem
         string? nameOverride = null,
         bool ignoreActionBlocker = false,
         bool forceEmote = false
-        )
+    )
     {
         if (!forceEmote && !AllowedToUseEmote(source, emote))
-            return;
+            return false;
+
+        var didEmote = TryEmoteWithoutChat(source, emote, ignoreActionBlocker);
 
         // check if proto has valid message for chat
-        if (emote.ChatMessages.Count != 0)
+        if (didEmote && emote.ChatMessages.Count != 0)
         {
             // not all emotes are loc'd, but for the ones that are we pass in entity
             var action = Loc.GetString(_random.Pick(emote.ChatMessages), ("entity", source));
             SendEntityEmote(source, action, range, nameOverride, hideLog: hideLog, checkEmote: false, ignoreActionBlocker: ignoreActionBlocker);
         }
 
-        // do the rest of emote event logic here
-        TryEmoteWithoutChat(source, emote, ignoreActionBlocker);
+        return didEmote;
     }
 
     /// <summary>
     ///     Makes selected entity to emote using <see cref="EmotePrototype"/> without sending any messages to chat.
     /// </summary>
-    public void TryEmoteWithoutChat(EntityUid uid, string emoteId, bool ignoreActionBlocker = false)
+    /// <returns>True if an emote was performed. False if the emote is unvailable, cancelled, etc.</returns>
+    public bool TryEmoteWithoutChat(EntityUid uid, string emoteId, bool ignoreActionBlocker = false)
     {
         if (!_prototypeManager.TryIndex<EmotePrototype>(emoteId, out var proto))
-            return;
+            return false;
 
-        TryEmoteWithoutChat(uid, proto, ignoreActionBlocker);
+        return TryEmoteWithoutChat(uid, proto, ignoreActionBlocker);
     }
 
     /// <summary>
     ///     Makes selected entity to emote using <see cref="EmotePrototype"/> without sending any messages to chat.
     /// </summary>
-    public void TryEmoteWithoutChat(EntityUid uid, EmotePrototype proto, bool ignoreActionBlocker = false)
+    /// <returns>True if an emote was performed. False if the emote is unvailable, cancelled, etc.</returns>
+    public bool TryEmoteWithoutChat(EntityUid uid, EmotePrototype proto, bool ignoreActionBlocker = false)
     {
         if (!_actionBlocker.CanEmote(uid) && !ignoreActionBlocker)
-            return;
+            return false;
 
-        InvokeEmoteEvent(uid, proto);
+        return TryInvokeEmoteEvent(uid, proto);
     }
 
     /// <summary>
@@ -160,17 +169,17 @@ public partial class ChatSystem
     /// </summary>
     /// <param name="uid"></param>
     /// <param name="textInput"></param>
-    private void TryEmoteChatInput(EntityUid uid, string textInput)
+    /// <returns>True if the chat message should be displayed (because the emote was explicitly cancelled), false if it should not be.</returns>
+    private bool TryEmoteChatInput(EntityUid uid, string textInput)
     {
         var actionTrimmedLower = TrimPunctuation(textInput.ToLower());
         if (!_wordEmoteDict.TryGetValue(actionTrimmedLower, out var emote))
-            return;
+            return true;
 
         if (!AllowedToUseEmote(uid, emote))
-            return;
+            return true;
 
-        InvokeEmoteEvent(uid, emote);
-        return;
+        return TryInvokeEmoteEvent(uid, emote);
 
         static string TrimPunctuation(string textInput)
         {
@@ -220,11 +229,50 @@ public partial class ChatSystem
         return true;
     }
 
-
-    private void InvokeEmoteEvent(EntityUid uid, EmotePrototype proto)
+    /// <summary>
+    /// Creates and raises <see cref="BeforeEmoteEvent"/> and then <see cref="EmoteEvent"/> to let other systems do things like play audio.
+    /// In the case that the Before event is cancelled, EmoteEvent will NOT be raised, and will optionally show a message to the player
+    /// explaining why the emote didn't happen.
+    /// </summary>
+    /// <param name="uid">The entity which is emoting</param>
+    /// <param name="proto">The emote which is being performed</param>
+    /// <returns>True if the emote was performed, false otherwise.</returns>
+    private bool TryInvokeEmoteEvent(EntityUid uid, EmotePrototype proto)
     {
+        var beforeEv = new BeforeEmoteEvent(uid, proto);
+        RaiseLocalEvent(uid, ref beforeEv);
+
+        if (beforeEv.Cancelled)
+        {
+            if (beforeEv.Blocker != null)
+            {
+                _popupSystem.PopupEntity(
+                    Loc.GetString(
+                        "chat-system-emote-cancelled-blocked",
+                        ("emote", Loc.GetString(proto.Name).ToLower()),
+                        ("blocker", beforeEv.Blocker.Value)
+                    ),
+                    uid,
+                    uid
+                );
+            }
+            else
+            {
+                _popupSystem.PopupEntity(
+                    Loc.GetString("chat-system-emote-cancelled-generic",
+                        ("emote", Loc.GetString(proto.Name).ToLower())),
+                    uid,
+                    uid
+                );
+            }
+
+            return false;
+        }
+
         var ev = new EmoteEvent(proto);
         RaiseLocalEvent(uid, ref ev);
+
+        return true;
     }
 }
 
@@ -233,9 +281,8 @@ public partial class ChatSystem
 ///     Use it to play sound, change sprite or something else.
 /// </summary>
 [ByRefEvent]
-public struct EmoteEvent
+public sealed class EmoteEvent : HandledEntityEventArgs
 {
-    public bool Handled;
     public readonly EmotePrototype Emote;
 
     public EmoteEvent(EmotePrototype emote)
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 177818a1f3..f1f07bee3d 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -8,6 +8,7 @@ using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
 using Content.Server.Speech.Prototypes;
 using Content.Server.Speech.EntitySystems;
+using Content.Server.Speech.Prototypes;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.ActionBlocker;
@@ -543,7 +544,7 @@ public sealed partial class ChatSystem : SharedChatSystem
             if (MessageRangeCheck(session, data, range) != MessageRangeCheckResult.Full)
                 continue; // Won't get logged to chat, and ghosts are too far away to see the pop-up, so we just won't send it to them.
 
-            if (data.Range <= WhisperClearRange)
+            if (data.Range <= WhisperClearRange || data.Observer)
                 _chatManager.ChatMessageToOne(ChatChannel.Whisper, message, wrappedMessage, source, false, session.Channel);
             //If listener is too far, they only hear fragments of the message
             else if (_examineSystem.InRangeUnOccluded(source, listener, WhisperMuffledRange))
@@ -600,8 +601,10 @@ public sealed partial class ChatSystem : SharedChatSystem
             ("entity", ent),
             ("message", FormattedMessage.RemoveMarkupOrThrow(action)));
 
-        if (checkEmote)
-            TryEmoteChatInput(source, action);
+        if (checkEmote &&
+            !TryEmoteChatInput(source, action))
+            return;
+
         SendInVoiceRange(ChatChannel.Emotes, action, wrappedMessage, source, range, author);
         if (!hideLog)
             if (name != Name(source))
@@ -816,8 +819,7 @@ public sealed partial class ChatSystem : SharedChatSystem
         return message;
     }
 
-    [ValidatePrototypeId<ReplacementAccentPrototype>]
-    public const string ChatSanitize_Accent = "chatsanitize";
+    public static readonly ProtoId<ReplacementAccentPrototype> ChatSanitize_Accent = "chatsanitize";
 
     public string SanitizeMessageReplaceWords(string message)
     {
diff --git a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs
index db6c9c5397..7dbf8e0d2a 100644
--- a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs
+++ b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs
@@ -1,6 +1,6 @@
-using Content.Server.Animals.Systems;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Chemistry.Components;
 
@@ -19,19 +19,19 @@ public sealed partial class TransformableContainerComponent : Component
     /// It will revert to this when emptied.
     ///     /// It defaults to the description of the parent entity unless overwritten.
     /// </summary>
-    [DataField("initialDescription")]
+    [DataField]
     public string? InitialDescription;
+
     /// <summary>
     /// This stores whatever primary reagent is currently in the container.
     /// It is used to help determine if a transformation is needed on solution update.
     /// </summary>
-    [DataField("currentReagent")]
-    public ReagentPrototype? CurrentReagent;
+    [DataField]
+    public ProtoId<ReagentPrototype>? CurrentReagent;
 
     /// <summary>
     /// This returns whether this container in a transformed or initial state.
     /// </summary>
-    ///
-    [DataField("transformed")]
+    [DataField]
     public bool Transformed;
 }
diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
index 6e2e2a91bc..64350cbda1 100644
--- a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
@@ -39,8 +39,7 @@ namespace Content.Server.Chemistry.EntitySystems
         [Dependency] private readonly LabelSystem _labelSystem = default!;
         [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
 
-        [ValidatePrototypeId<EntityPrototype>]
-        private const string PillPrototypeId = "Pill";
+        private static readonly EntProtoId PillPrototypeId = "Pill";
 
         public override void Initialize()
         {
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs
deleted file mode 100644
index bccd594706..0000000000
--- a/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Content.Server.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Chemistry.EntitySystems;
-
-public sealed class SolutionRegenerationSystem : EntitySystem
-{
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<SolutionRegenerationComponent, SolutionContainerManagerComponent>();
-        while (query.MoveNext(out var uid, out var regen, out var manager))
-        {
-            if (_timing.CurTime < regen.NextRegenTime)
-                continue;
-
-            // timer ignores if its full, it's just a fixed cycle
-            regen.NextRegenTime = _timing.CurTime + regen.Duration;
-            if (_solutionContainer.ResolveSolution((uid, manager), regen.SolutionName, ref regen.SolutionRef, out var solution))
-            {
-                var amount = FixedPoint2.Min(solution.AvailableVolume, regen.Generated.Volume);
-                if (amount <= FixedPoint2.Zero)
-                    continue;
-
-                // dont bother cloning and splitting if adding the whole thing
-                Solution generated;
-                if (amount == regen.Generated.Volume)
-                {
-                    generated = regen.Generated;
-                }
-                else
-                {
-                    generated = regen.Generated.Clone().SplitSolution(amount);
-                }
-
-                _solutionContainer.TryAddSolution(regen.SolutionRef.Value, generated);
-            }
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
index 57875fc16a..48d547d1e0 100644
--- a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
@@ -45,8 +45,8 @@ public sealed class TransformableContainerSystem : EntitySystem
         //the biggest reagent in the solution decides the appearance
         var reagentId = solution.GetPrimaryReagentId();
 
-        //If biggest reagent didn't changed - don't change anything at all
-        if (entity.Comp.CurrentReagent != null && entity.Comp.CurrentReagent.ID == reagentId?.Prototype)
+        //If biggest reagent didn't change - don't change anything at all
+        if (entity.Comp.CurrentReagent != null && entity.Comp.CurrentReagent == reagentId?.Prototype)
         {
             return;
         }
@@ -66,7 +66,7 @@ public sealed class TransformableContainerSystem : EntitySystem
 
     private void OnRefreshNameModifiers(Entity<TransformableContainerComponent> entity, ref RefreshNameModifiersEvent args)
     {
-        if (entity.Comp.CurrentReagent is { } currentReagent)
+        if (_prototypeManager.TryIndex(entity.Comp.CurrentReagent, out var currentReagent))
         {
             args.AddModifier("transformable-container-component-glass", priority: -1, ("reagent", currentReagent.LocalizedName));
         }
diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs
index 73476ece17..2bad4e0b96 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -21,6 +21,8 @@ namespace Content.Server.Cluwne;
 
 public sealed class CluwneSystem : EntitySystem
 {
+    private static readonly ProtoId<DamageGroupPrototype> GeneticDamageGroup = "Genetic";
+
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
@@ -53,7 +55,7 @@ public sealed class CluwneSystem : EntitySystem
             RemComp<CluwneComponent>(uid);
             RemComp<ClumsyComponent>(uid);
             RemComp<AutoEmoteComponent>(uid);
-            var damageSpec = new DamageSpecifier(_prototypeManager.Index<DamageGroupPrototype>("Genetic"), 300);
+            var damageSpec = new DamageSpecifier(_prototypeManager.Index(GeneticDamageGroup), 300);
             _damageableSystem.TryChangeDamage(uid, damageSpec);
         }
     }
diff --git a/Content.Server/Construction/Commands/TileWallsCommand.cs b/Content.Server/Construction/Commands/TileWallsCommand.cs
index a27caec423..ca87795b06 100644
--- a/Content.Server/Construction/Commands/TileWallsCommand.cs
+++ b/Content.Server/Construction/Commands/TileWallsCommand.cs
@@ -6,6 +6,7 @@ using Robust.Shared.Console;
 using Robust.Shared.Map;
 using Robust.Server.GameObjects;
 using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Construction.Commands;
 
@@ -20,12 +21,9 @@ public sealed class TileWallsCommand : IConsoleCommand
     public string Description => "Puts an underplating tile below every wall on a grid.";
     public string Help => $"Usage: {Command} <gridId> | {Command}";
 
-    [ValidatePrototypeId<ContentTileDefinition>]
-    public const string TilePrototypeId = "Plating";
-
-    [ValidatePrototypeId<TagPrototype>]
-    public const string WallTag = "Wall";
-    public const string DiagonalTag = "Diagonal";
+    public static readonly ProtoId<ContentTileDefinition> TilePrototypeId = "Plating";
+    public static readonly ProtoId<TagPrototype> WallTag = "Wall";
+    public static readonly ProtoId<TagPrototype> DiagonalTag = "Diagonal";
 
     public void Execute(IConsoleShell shell, string argStr, string[] args)
     {
diff --git a/Content.Server/Damage/Components/ExaminableDamageComponent.cs b/Content.Server/Damage/Components/ExaminableDamageComponent.cs
index 46a86012ad..26e9e40692 100644
--- a/Content.Server/Damage/Components/ExaminableDamageComponent.cs
+++ b/Content.Server/Damage/Components/ExaminableDamageComponent.cs
@@ -1,16 +1,18 @@
-using Content.Shared.Damage.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Content.Shared.Dataset;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Damage.Components;
 
 /// <summary>
-///     This component shows entity damage severity when it is examined by player.
+/// This component shows entity damage severity when it is examined by player.
 /// </summary>
 [RegisterComponent]
 public sealed partial class ExaminableDamageComponent : Component
 {
-    [DataField("messages", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<ExaminableDamagePrototype>))]
-    public string? MessagesProtoId;
-
-    public ExaminableDamagePrototype? MessagesProto;
+    /// <summary>
+    /// ID of the <see cref="LocalizedDatasetPrototype"/> containing messages to display a different damage levels.
+    /// The first message will be used at 0 damage with the others equally distributed across the range from undamaged to fully damaged.
+    /// </summary>
+    [DataField]
+    public ProtoId<LocalizedDatasetPrototype>? Messages;
 }
diff --git a/Content.Server/Damage/Systems/ExaminableDamageSystem.cs b/Content.Server/Damage/Systems/ExaminableDamageSystem.cs
index c80e19a53d..155cf08962 100644
--- a/Content.Server/Damage/Systems/ExaminableDamageSystem.cs
+++ b/Content.Server/Damage/Systems/ExaminableDamageSystem.cs
@@ -1,9 +1,6 @@
-using System.Linq;
-using Content.Server.Damage.Components;
+using Content.Server.Damage.Components;
 using Content.Server.Destructible;
-using Content.Server.Destructible.Thresholds.Triggers;
 using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
 using Content.Shared.Examine;
 using Content.Shared.Rounding;
 using Robust.Shared.Prototypes;
@@ -12,59 +9,42 @@ namespace Content.Server.Damage.Systems;
 
 public sealed class ExaminableDamageSystem : EntitySystem
 {
+    [Dependency] private readonly DestructibleSystem _destructible = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
 
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<ExaminableDamageComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<ExaminableDamageComponent, ExaminedEvent>(OnExamine);
     }
 
-    private void OnInit(EntityUid uid, ExaminableDamageComponent component, ComponentInit args)
+    private void OnExamine(Entity<ExaminableDamageComponent> ent, ref ExaminedEvent args)
     {
-        if (component.MessagesProtoId == null)
+        if (!_prototype.TryIndex(ent.Comp.Messages, out var proto) || proto.Values.Count == 0)
             return;
-        component.MessagesProto = _prototype.Index<ExaminableDamagePrototype>(component.MessagesProtoId);
+
+        var percent = GetDamagePercent(ent);
+        var level = ContentHelpers.RoundToNearestLevels(percent, 1, proto.Values.Count - 1);
+        var msg = Loc.GetString(proto.Values[level]);
+        args.PushMarkup(msg, -99);
     }
 
-    private void OnExamine(EntityUid uid, ExaminableDamageComponent component, ExaminedEvent args)
+    /// <summary>
+    /// Returns a value between 0 and 1 representing how damaged the entity is,
+    /// where 0 is undamaged and 1 is fully damaged.
+    /// </summary>
+    /// <returns>How damaged the entity is from 0 to 1</returns>
+    private float GetDamagePercent(Entity<ExaminableDamageComponent> ent)
     {
-        if (component.MessagesProto == null)
-            return;
-
-        var messages = component.MessagesProto.Messages;
-        if (messages.Length == 0)
-            return;
-
-        var level = GetDamageLevel(uid, component);
-        var msg = Loc.GetString(messages[level]);
-        args.PushMarkup(msg,-99);
-    }
-
-    private int GetDamageLevel(EntityUid uid, ExaminableDamageComponent? component = null,
-        DamageableComponent? damageable = null, DestructibleComponent? destructible = null)
-    {
-        if (!Resolve(uid, ref component, ref damageable, ref destructible))
-            return 0;
-
-        if (component.MessagesProto == null)
-            return 0;
-
-        var maxLevels = component.MessagesProto.Messages.Length - 1;
-        if (maxLevels <= 0)
-            return 0;
-
-        var trigger = (DamageTrigger?) destructible.Thresholds
-            .LastOrDefault(threshold => threshold.Trigger is DamageTrigger)?.Trigger;
-        if (trigger == null)
+        if (!TryComp<DamageableComponent>(ent, out var damageable))
             return 0;
 
         var damage = damageable.TotalDamage;
-        var damageThreshold = trigger.Damage;
-        var fraction = damageThreshold == 0 ? 0f : (float) damage / damageThreshold;
+        var damageThreshold = _destructible.DestroyedAt(ent);
 
-        var level = ContentHelpers.RoundToNearestLevels(fraction, 1, maxLevels);
-        return level;
+        if (damageThreshold == 0)
+            return 0;
+
+        return (damage / damageThreshold).Float();
     }
 }
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs
index e02ed87322..96fa4dd438 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs
@@ -19,6 +19,8 @@ namespace Content.Server.Destructible.Thresholds.Behaviors;
 [DataDefinition]
 public sealed partial class WeightedSpawnEntityBehavior : IThresholdBehavior
 {
+    private static readonly EntProtoId TempEntityProtoId = "TemporaryEntityForTimedDespawnSpawners";
+
     /// <summary>
     /// A table of entities with assigned weights to randomly pick from
     /// </summary>
@@ -64,7 +66,7 @@ public sealed partial class WeightedSpawnEntityBehavior : IThresholdBehavior
         if (SpawnAfter != 0)
         {
             // if it fails to get the spawner, this won't ever work so just return
-            if (!system.PrototypeManager.TryIndex("TemporaryEntityForTimedDespawnSpawners", out var tempSpawnerProto))
+            if (!system.PrototypeManager.TryIndex(TempEntityProtoId, out var tempSpawnerProto))
                 return;
 
             // spawn the spawner, assign it a lifetime, and assign the entity that it will spawn when despawned
diff --git a/Content.Server/Devour/DevourSystem.cs b/Content.Server/Devour/DevourSystem.cs
deleted file mode 100644
index 88edc3ec4c..0000000000
--- a/Content.Server/Devour/DevourSystem.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Shared.Body.Events;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Devour;
-using Content.Shared.Devour.Components;
-using Content.Shared.Humanoid;
-
-namespace Content.Server.Devour;
-
-public sealed class DevourSystem : SharedDevourSystem
-{
-    [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<DevourerComponent, DevourDoAfterEvent>(OnDoAfter);
-        SubscribeLocalEvent<DevourerComponent, BeingGibbedEvent>(OnGibContents);
-    }
-
-    private void OnDoAfter(EntityUid uid, DevourerComponent component, DevourDoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled)
-            return;
-
-        var ichorInjection = new Solution(component.Chemical, component.HealRate);
-
-        if (component.FoodPreference == FoodPreference.All ||
-            (component.FoodPreference == FoodPreference.Humanoid && HasComp<HumanoidAppearanceComponent>(args.Args.Target)))
-        {
-            if (component.ShouldStoreDevoured && args.Args.Target is not null)
-            {
-                ContainerSystem.Insert(args.Args.Target.Value, component.Stomach);
-            }
-            _bloodstreamSystem.TryAddToChemicals(uid, ichorInjection);
-        }
-
-        //TODO: Figure out a better way of removing structures via devour that still entails standing still and waiting for a DoAfter. Somehow.
-        //If it's not human, it must be a structure
-        else if (args.Args.Target != null)
-        {
-            QueueDel(args.Args.Target.Value);
-        }
-
-        _audioSystem.PlayPvs(component.SoundDevour, uid);
-    }
-
-    private void OnGibContents(EntityUid uid, DevourerComponent component, ref BeingGibbedEvent args)
-    {
-        if (!component.ShouldStoreDevoured)
-            return;
-
-        // For some reason we have two different systems that should handle gibbing,
-        // and for some another reason GibbingSystem, which should empty all containers, doesn't get involved in this process
-        ContainerSystem.EmptyContainer(component.Stomach);
-    }
-}
-
diff --git a/Content.Server/Disposal/Tube/DisposalTubeSystem.cs b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
index 24653ce8d4..7e63bc4e23 100644
--- a/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
+++ b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
@@ -428,7 +428,7 @@ namespace Content.Server.Disposal.Tube
 
             foreach (var entity in from.Container.ContainedEntities.ToArray())
             {
-                _disposableSystem.TryInsert(holder, entity, holderComponent);
+                _containerSystem.Insert(entity, holderComponent.Container);
             }
 
             _atmosSystem.Merge(holderComponent.Air, from.Air);
diff --git a/Content.Server/Disposal/Unit/DisposableSystem.cs b/Content.Server/Disposal/Unit/DisposableSystem.cs
index 091a91c14e..d307488110 100644
--- a/Content.Server/Disposal/Unit/DisposableSystem.cs
+++ b/Content.Server/Disposal/Unit/DisposableSystem.cs
@@ -43,6 +43,8 @@ namespace Content.Server.Disposal.Unit
             _xformQuery = GetEntityQuery<TransformComponent>();
 
             SubscribeLocalEvent<DisposalHolderComponent, ComponentStartup>(OnComponentStartup);
+            SubscribeLocalEvent<DisposalHolderComponent, ContainerIsInsertingAttemptEvent>(CanInsert);
+            SubscribeLocalEvent<DisposalHolderComponent, EntInsertedIntoContainerMessage>(OnInsert);
         }
 
         private void OnComponentStartup(EntityUid uid, DisposalHolderComponent holder, ComponentStartup args)
@@ -50,34 +52,16 @@ namespace Content.Server.Disposal.Unit
             holder.Container = _containerSystem.EnsureContainer<Container>(uid, nameof(DisposalHolderComponent));
         }
 
-        public bool TryInsert(EntityUid uid, EntityUid toInsert, DisposalHolderComponent? holder = null)
+        private void CanInsert(Entity<DisposalHolderComponent> ent, ref ContainerIsInsertingAttemptEvent args)
         {
-            if (!Resolve(uid, ref holder))
-                return false;
-            if (!CanInsert(uid, toInsert, holder))
-                return false;
-
-            if (!_containerSystem.Insert(toInsert, holder.Container))
-                return false;
-
-            if (_physicsQuery.TryGetComponent(toInsert, out var physBody))
-                _physicsSystem.SetCanCollide(toInsert, false, body: physBody);
-
-            return true;
+            if (!HasComp<ItemComponent>(args.EntityUid) && !HasComp<BodyComponent>(args.EntityUid))
+                args.Cancel();
         }
 
-        private bool CanInsert(EntityUid uid, EntityUid toInsert, DisposalHolderComponent? holder = null)
+        private void OnInsert(Entity<DisposalHolderComponent> ent, ref EntInsertedIntoContainerMessage args)
         {
-            if (!Resolve(uid, ref holder))
-                return false;
-
-            if (!_containerSystem.CanInsert(toInsert, holder.Container))
-            {
-                return false;
-            }
-
-            return HasComp<ItemComponent>(toInsert) ||
-                   HasComp<BodyComponent>(toInsert);
+            if (_physicsQuery.TryGetComponent(args.Entity, out var physBody))
+                _physicsSystem.SetCanCollide(args.Entity, false, body: physBody);
         }
 
         public void ExitDisposals(EntityUid uid, DisposalHolderComponent? holder = null, TransformComponent? holderTransform = null)
diff --git a/Content.Server/Drowsiness/DrowsinessSystem.cs b/Content.Server/Drowsiness/DrowsinessSystem.cs
index 6de270abcc..13fdc42e10 100644
--- a/Content.Server/Drowsiness/DrowsinessSystem.cs
+++ b/Content.Server/Drowsiness/DrowsinessSystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.StatusEffectNew;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.Drowsiness;
 using Content.Shared.StatusEffectNew;
diff --git a/Content.Server/Electrocution/ElectrocuteCommand.cs b/Content.Server/Electrocution/ElectrocuteCommand.cs
index c0d0ecf740..6bc3977544 100644
--- a/Content.Server/Electrocution/ElectrocuteCommand.cs
+++ b/Content.Server/Electrocution/ElectrocuteCommand.cs
@@ -2,6 +2,7 @@ using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.StatusEffect;
 using Robust.Shared.Console;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Electrocution;
 
@@ -13,8 +14,7 @@ public sealed class ElectrocuteCommand : LocalizedEntityCommands
 
     public override string Command => "electrocute";
 
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    private const string ElectrocutionStatusEffect = "Electrocution";
+    private static readonly ProtoId<StatusEffectPrototype> ElectrocutionStatusEffect = "Electrocution";
 
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs
index 8647f087fc..18a4d52ac2 100644
--- a/Content.Server/Electrocution/ElectrocutionSystem.cs
+++ b/Content.Server/Electrocution/ElectrocutionSystem.cs
@@ -40,7 +40,6 @@ namespace Content.Server.Electrocution;
 public sealed class ElectrocutionSystem : SharedElectrocutionSystem
 {
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
@@ -59,12 +58,8 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
 
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    private const string StatusEffectKey = "Electrocution";
-
-    [ValidatePrototypeId<DamageTypePrototype>]
-    private const string DamageType = "Shock";
-
+    private static readonly ProtoId<StatusEffectPrototype> StatusEffectKey = "Electrocution";
+    private static readonly ProtoId<DamageTypePrototype> DamageType = "Shock";
     private static readonly ProtoId<TagPrototype> WindowTag = "Window";
 
     // Multiply and shift the log scale for shock damage.
@@ -409,7 +404,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
         if (shockDamage is { } dmg)
         {
             var actual = _damageable.TryChangeDamage(uid,
-                new DamageSpecifier(_prototypeManager.Index<DamageTypePrototype>(DamageType), dmg), origin: sourceUid);
+                new DamageSpecifier(_prototypeManager.Index(DamageType), dmg), origin: sourceUid);
 
             if (actual != null)
             {
diff --git a/Content.Server/EntityEffects/EntityEffectSystem.cs b/Content.Server/EntityEffects/EntityEffectSystem.cs
index e18b3b1470..54270ca53d 100644
--- a/Content.Server/EntityEffects/EntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/EntityEffectSystem.cs
@@ -48,6 +48,8 @@ namespace Content.Server.EntityEffects;
 
 public sealed class EntityEffectSystem : EntitySystem
 {
+    private static readonly ProtoId<WeightedRandomFillSolutionPrototype> RandomPickBotanyReagent = "RandomPickBotanyReagent";
+
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
     [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
@@ -854,7 +856,7 @@ public sealed class EntityEffectSystem : EntitySystem
             return;
 
         var chemicals = plantholder.Seed.Chemicals;
-        var randomChems = _protoManager.Index<WeightedRandomFillSolutionPrototype>("RandomPickBotanyReagent").Fills;
+        var randomChems = _protoManager.Index(RandomPickBotanyReagent).Fills;
 
         // Add a random amount of a random chemical to this set of chemicals
         if (randomChems != null)
diff --git a/Content.Server/EntityList/SpawnEntityListCommand.cs b/Content.Server/EntityList/SpawnEntityListCommand.cs
index 07bc26996e..f70b0ccb07 100644
--- a/Content.Server/EntityList/SpawnEntityListCommand.cs
+++ b/Content.Server/EntityList/SpawnEntityListCommand.cs
@@ -43,7 +43,7 @@ namespace Content.Server.EntityList
 
             var i = 0;
 
-            foreach (var entity in prototype.Entities(_prototypeManager))
+            foreach (var entity in prototype.GetEntities(_prototypeManager))
             {
                 EntityManager.SpawnEntity(entity.ID, EntityManager.GetComponent<TransformComponent>(attached).Coordinates);
                 i++;
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 0cdc6d6b23..c50b1e53fa 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -70,14 +70,13 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem
     ///     find errors. However some components, like rogue arrows, or some commands like the admin-smite need to have
     ///     a "default" option specified outside of yaml data-fields. Hence this const string.
     /// </remarks>
-    [ValidatePrototypeId<ExplosionPrototype>]
-    public const string DefaultExplosionPrototypeId = "Default";
+    public static readonly ProtoId<ExplosionPrototype> DefaultExplosionPrototypeId = "Default";
 
     public override void Initialize()
     {
         base.Initialize();
 
-        DebugTools.Assert(_prototypeManager.HasIndex<ExplosionPrototype>(DefaultExplosionPrototypeId));
+        DebugTools.Assert(_prototypeManager.HasIndex(DefaultExplosionPrototypeId));
 
         // handled in ExplosionSystem.GridMap.cs
         SubscribeLocalEvent<GridRemovalEvent>(OnGridRemoved);
diff --git a/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
index dbb96e06a5..6953010e46 100644
--- a/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
@@ -58,6 +58,11 @@ public sealed class ProjectileGrenadeSystem : EntitySystem
         var grenadeCoord = _transformSystem.GetMapCoordinates(uid);
         var shootCount = 0;
         var totalCount = component.Container.ContainedEntities.Count + component.UnspawnedCount;
+
+        // Just in case
+        if (totalCount == 0)
+            return;
+
         var segmentAngle = 360 / totalCount;
 
         while (TrySpawnContents(grenadeCoord, component, out var contentUid))
diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
index 1177c24304..c7348b0856 100644
--- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
@@ -1,346 +1,6 @@
-using System.Numerics;
-using Content.Server.Popups;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.FixedPoint;
 using Content.Shared.Fluids;
-using Content.Shared.Fluids.Components;
-using Content.Shared.Interaction;
-using Content.Shared.Timing;
-using Content.Shared.Weapons.Melee;
-using Robust.Server.Audio;
-using Robust.Server.GameObjects;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
 
 namespace Content.Server.Fluids.EntitySystems;
 
 /// <inheritdoc/>
-public sealed class AbsorbentSystem : SharedAbsorbentSystem
-{
-    private static readonly EntProtoId Sparkles = "PuddleSparkle";
-
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
-    [Dependency] private readonly AudioSystem _audio = default!;
-    [Dependency] private readonly PopupSystem _popups = default!;
-    [Dependency] private readonly PuddleSystem _puddleSystem = default!;
-    [Dependency] private readonly SharedMeleeWeaponSystem _melee = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
-    [Dependency] private readonly MapSystem _mapSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<AbsorbentComponent, ComponentInit>(OnAbsorbentInit);
-        SubscribeLocalEvent<AbsorbentComponent, AfterInteractEvent>(OnAfterInteract);
-        SubscribeLocalEvent<AbsorbentComponent, UserActivateInWorldEvent>(OnActivateInWorld);
-        SubscribeLocalEvent<AbsorbentComponent, SolutionContainerChangedEvent>(OnAbsorbentSolutionChange);
-    }
-
-    private void OnAbsorbentInit(EntityUid uid, AbsorbentComponent component, ComponentInit args)
-    {
-        // TODO: I know dirty on init but no prediction moment.
-        UpdateAbsorbent(uid, component);
-    }
-
-    private void OnAbsorbentSolutionChange(EntityUid uid, AbsorbentComponent component, ref SolutionContainerChangedEvent args)
-    {
-        UpdateAbsorbent(uid, component);
-    }
-
-    private void UpdateAbsorbent(EntityUid uid, AbsorbentComponent component)
-    {
-        if (!_solutionContainerSystem.TryGetSolution(uid, component.SolutionName, out _, out var solution))
-            return;
-
-        var oldProgress = component.Progress.ShallowClone();
-        component.Progress.Clear();
-
-        var mopReagent = solution.GetTotalPrototypeQuantity(_puddleSystem.GetAbsorbentReagents(solution));
-        if (mopReagent > FixedPoint2.Zero)
-        {
-            component.Progress[solution.GetColorWithOnly(_prototype, _puddleSystem.GetAbsorbentReagents(solution))] = mopReagent.Float();
-        }
-
-        var otherColor = solution.GetColorWithout(_prototype, _puddleSystem.GetAbsorbentReagents(solution));
-        var other = (solution.Volume - mopReagent).Float();
-
-        if (other > 0f)
-        {
-            component.Progress[otherColor] = other;
-        }
-
-        var remainder = solution.AvailableVolume;
-
-        if (remainder > FixedPoint2.Zero)
-        {
-            component.Progress[Color.DarkGray] = remainder.Float();
-        }
-
-        if (component.Progress.Equals(oldProgress))
-            return;
-
-        Dirty(uid, component);
-    }
-
-    private void OnActivateInWorld(EntityUid uid, AbsorbentComponent component, UserActivateInWorldEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        Mop(uid, args.Target, uid, component);
-        args.Handled = true;
-    }
-
-    private void OnAfterInteract(EntityUid uid, AbsorbentComponent component, AfterInteractEvent args)
-    {
-        if (!args.CanReach || args.Handled || args.Target == null)
-            return;
-
-        Mop(args.User, args.Target.Value, args.Used, component);
-        args.Handled = true;
-    }
-
-    public void Mop(EntityUid user, EntityUid target, EntityUid used, AbsorbentComponent component)
-    {
-        if (!_solutionContainerSystem.TryGetSolution(used, component.SolutionName, out var absorberSoln))
-            return;
-
-        if (TryComp<UseDelayComponent>(used, out var useDelay)
-            && _useDelay.IsDelayed((used, useDelay)))
-            return;
-
-        // If it's a puddle try to grab from
-        if (!TryPuddleInteract(user, used, target, component, useDelay, absorberSoln.Value) && component.UseAbsorberSolution)
-        {
-            // If it's refillable try to transfer
-            if (!TryRefillableInteract(user, used, target, component, useDelay, absorberSoln.Value))
-                return;
-        }
-    }
-
-    /// <summary>
-    ///     Logic for an absorbing entity interacting with a refillable.
-    /// </summary>
-    private bool TryRefillableInteract(EntityUid user, EntityUid used, EntityUid target, AbsorbentComponent component, UseDelayComponent? useDelay, Entity<SolutionComponent> absorbentSoln)
-    {
-        if (!TryComp(target, out RefillableSolutionComponent? refillable))
-            return false;
-
-        if (!_solutionContainerSystem.TryGetRefillableSolution((target, refillable, null), out var refillableSoln, out var refillableSolution))
-            return false;
-
-        if (refillableSolution.Volume <= 0)
-        {
-            // Target empty - only transfer absorbent contents into refillable
-            if (!TryTransferFromAbsorbentToRefillable(user, used, target, component, absorbentSoln, refillableSoln.Value))
-                return false;
-        }
-        else
-        {
-            // Target non-empty - do a two-way transfer
-            if (!TryTwoWayAbsorbentRefillableTransfer(user, used, target, component, absorbentSoln, refillableSoln.Value))
-                return false;
-        }
-
-        _audio.PlayPvs(component.TransferSound, target);
-        if (useDelay != null)
-            _useDelay.TryResetDelay((used, useDelay));
-        return true;
-    }
-
-    /// <summary>
-    ///     Logic for an transferring solution from absorber to an empty refillable.
-    /// </summary>
-    private bool TryTransferFromAbsorbentToRefillable(
-        EntityUid user,
-        EntityUid used,
-        EntityUid target,
-        AbsorbentComponent component,
-        Entity<SolutionComponent> absorbentSoln,
-        Entity<SolutionComponent> refillableSoln)
-    {
-        var absorbentSolution = absorbentSoln.Comp.Solution;
-        if (absorbentSolution.Volume <= 0)
-        {
-            _popups.PopupEntity(Loc.GetString("mopping-system-target-container-empty", ("target", target)), user, user);
-            return false;
-        }
-
-        var refillableSolution = refillableSoln.Comp.Solution;
-        var transferAmount = component.PickupAmount < refillableSolution.AvailableVolume ?
-            component.PickupAmount :
-            refillableSolution.AvailableVolume;
-
-        if (transferAmount <= 0)
-        {
-            _popups.PopupEntity(Loc.GetString("mopping-system-full", ("used", used)), used, user);
-            return false;
-        }
-
-        // Prioritize transferring non-evaporatives if absorbent has any
-        var contaminants = _solutionContainerSystem.SplitSolutionWithout(absorbentSoln, transferAmount, _puddleSystem.GetAbsorbentReagents(absorbentSoln.Comp.Solution));
-        if (contaminants.Volume > 0)
-        {
-            _solutionContainerSystem.TryAddSolution(refillableSoln, contaminants);
-        }
-        else
-        {
-            var evaporatives = _solutionContainerSystem.SplitSolution(absorbentSoln, transferAmount);
-            _solutionContainerSystem.TryAddSolution(refillableSoln, evaporatives);
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    ///     Logic for an transferring contaminants to a non-empty refillable & reabsorbing water if any available.
-    /// </summary>
-    private bool TryTwoWayAbsorbentRefillableTransfer(
-        EntityUid user,
-        EntityUid used,
-        EntityUid target,
-        AbsorbentComponent component,
-        Entity<SolutionComponent> absorbentSoln,
-        Entity<SolutionComponent> refillableSoln)
-    {
-        var contaminantsFromAbsorbent = _solutionContainerSystem.SplitSolutionWithout(absorbentSoln, component.PickupAmount, _puddleSystem.GetAbsorbentReagents(absorbentSoln.Comp.Solution));
-
-        var absorbentSolution = absorbentSoln.Comp.Solution;
-        if (contaminantsFromAbsorbent.Volume == FixedPoint2.Zero && absorbentSolution.AvailableVolume == FixedPoint2.Zero)
-        {
-            // Nothing to transfer to refillable and no room to absorb anything extra
-            _popups.PopupEntity(Loc.GetString("mopping-system-puddle-space", ("used", used)), user, user);
-
-            // We can return cleanly because nothing was split from absorbent solution
-            return false;
-        }
-
-        var waterPulled = component.PickupAmount < absorbentSolution.AvailableVolume ?
-            component.PickupAmount :
-            absorbentSolution.AvailableVolume;
-
-        var refillableSolution = refillableSoln.Comp.Solution;
-        var waterFromRefillable = refillableSolution.SplitSolutionWithOnly(waterPulled, _puddleSystem.GetAbsorbentReagents(refillableSoln.Comp.Solution));
-        _solutionContainerSystem.UpdateChemicals(refillableSoln);
-
-        if (waterFromRefillable.Volume == FixedPoint2.Zero && contaminantsFromAbsorbent.Volume == FixedPoint2.Zero)
-        {
-            // Nothing to transfer in either direction
-            _popups.PopupEntity(Loc.GetString("mopping-system-target-container-empty-water", ("target", target)), user, user);
-
-            // We can return cleanly because nothing was split from refillable solution
-            return false;
-        }
-
-        var anyTransferOccurred = false;
-
-        if (waterFromRefillable.Volume > FixedPoint2.Zero)
-        {
-            // transfer water to absorbent
-            _solutionContainerSystem.TryAddSolution(absorbentSoln, waterFromRefillable);
-            anyTransferOccurred = true;
-        }
-
-        if (contaminantsFromAbsorbent.Volume > 0)
-        {
-            if (refillableSolution.AvailableVolume <= 0)
-            {
-                _popups.PopupEntity(Loc.GetString("mopping-system-full", ("used", target)), user, user);
-            }
-            else
-            {
-                // transfer as much contaminants to refillable as will fit
-                var contaminantsForRefillable = contaminantsFromAbsorbent.SplitSolution(refillableSolution.AvailableVolume);
-                _solutionContainerSystem.TryAddSolution(refillableSoln, contaminantsForRefillable);
-                anyTransferOccurred = true;
-            }
-
-            // absorb everything that did not fit in the refillable back by the absorbent
-            _solutionContainerSystem.TryAddSolution(absorbentSoln, contaminantsFromAbsorbent);
-        }
-
-        return anyTransferOccurred;
-    }
-
-    /// <summary>
-    ///     Logic for an absorbing entity interacting with a puddle.
-    /// </summary>
-    private bool TryPuddleInteract(EntityUid user, EntityUid used, EntityUid target, AbsorbentComponent absorber, UseDelayComponent? useDelay, Entity<SolutionComponent> absorberSoln)
-    {
-        if (!TryComp(target, out PuddleComponent? puddle))
-            return false;
-
-        if (!_solutionContainerSystem.ResolveSolution(target, puddle.SolutionName, ref puddle.Solution, out var puddleSolution) || puddleSolution.Volume <= 0)
-            return false;
-
-        // Check if the puddle has any non-evaporative reagents
-        if (_puddleSystem.CanFullyEvaporate(puddleSolution))
-        {
-            _popups.PopupEntity(Loc.GetString("mopping-system-puddle-evaporate", ("target", target)), user, user);
-            return true;
-        }
-
-        Solution puddleSplit;
-        var isRemoved = false;
-        if (absorber.UseAbsorberSolution)
-        {
-            // Check if we have any evaporative reagents on our absorber to transfer
-            var absorberSolution = absorberSoln.Comp.Solution;
-            var available = absorberSolution.GetTotalPrototypeQuantity(_puddleSystem.GetAbsorbentReagents(absorberSolution));
-
-            // No material
-            if (available == FixedPoint2.Zero)
-            {
-                _popups.PopupEntity(Loc.GetString("mopping-system-no-water", ("used", used)), user, user);
-                return true;
-            }
-
-            var transferMax = absorber.PickupAmount;
-            var transferAmount = available > transferMax ? transferMax : available;
-
-            puddleSplit = puddleSolution.SplitSolutionWithout(transferAmount, _puddleSystem.GetAbsorbentReagents(puddleSolution));
-            var absorberSplit = absorberSolution.SplitSolutionWithOnly(puddleSplit.Volume, _puddleSystem.GetAbsorbentReagents(absorberSolution));
-
-            // Do tile reactions first
-            var transform = Transform(target);
-            var gridUid = transform.GridUid;
-            if (TryComp(gridUid, out MapGridComponent? mapGrid))
-            {
-                var tileRef = _mapSystem.GetTileRef(gridUid.Value, mapGrid, transform.Coordinates);
-                _puddleSystem.DoTileReactions(tileRef, absorberSplit);
-            }
-            _solutionContainerSystem.AddSolution(puddle.Solution.Value, absorberSplit);
-        }
-        else
-        {
-            puddleSplit = puddleSolution.SplitSolutionWithout(absorber.PickupAmount, _puddleSystem.GetAbsorbentReagents(puddleSolution));
-            // Despawn if we're done
-            if (puddleSolution.Volume == FixedPoint2.Zero)
-            {
-                // Spawn a *sparkle*
-                Spawn(Sparkles, GetEntityQuery<TransformComponent>().GetComponent(target).Coordinates);
-                QueueDel(target);
-                isRemoved = true;
-            }
-        }
-
-        _solutionContainerSystem.AddSolution(absorberSoln, puddleSplit);
-
-        _audio.PlayPvs(absorber.PickupSound, isRemoved ? used : target);
-        if (useDelay != null)
-            _useDelay.TryResetDelay((used, useDelay));
-
-        var userXform = Transform(user);
-        var targetPos = _transform.GetWorldPosition(target);
-        var localPos = Vector2.Transform(targetPos, _transform.GetInvWorldMatrix(userXform));
-        localPos = userXform.LocalRotation.RotateVec(localPos);
-
-        _melee.DoLunge(user, used, Angle.Zero, localPos, null, false);
-
-        return true;
-    }
-}
+public sealed class AbsorbentSystem : SharedAbsorbentSystem;
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
index 5ff3c61b9e..3c386dae97 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
@@ -61,6 +61,7 @@ public sealed partial class PuddleSystem
             if (!_solutionContainerSystem.ResolveSolution(uid, puddle.SolutionName, ref puddle.Solution, out var puddleSolution))
                 continue;
 
+            // Yes, this means that 50u water + 50u holy water evaporates twice as fast as 100u water.
             foreach ((string evaporatingReagent, FixedPoint2 evaporatingSpeed) in GetEvaporationSpeeds(puddleSolution))
             {
                 var reagentTick = evaporation.EvaporationAmount * EvaporationCooldown.TotalSeconds * evaporatingSpeed;
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
index 66469916d8..9e8fdd715e 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
@@ -51,7 +51,6 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly ReactiveSystem _reactive = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
     [Dependency] private readonly SharedPopupSystem _popups = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
@@ -61,17 +60,6 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
 
-    [ValidatePrototypeId<ReagentPrototype>]
-    private const string Blood = "Blood";
-
-    [ValidatePrototypeId<ReagentPrototype>]
-    private const string Slime = "Slime";
-
-    [ValidatePrototypeId<ReagentPrototype>]
-    private const string CopperBlood = "CopperBlood";
-
-    private static string[] _standoutReagents = [Blood, Slime, CopperBlood];
-
     // Using local deletion queue instead of the standard queue so that we can easily "undelete" if a puddle
     // loses & then gains reagents in a single tick.
     private HashSet<EntityUid> _deletionQueue = [];
@@ -92,7 +80,6 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
 
         // Shouldn't need re-anchoring.
         SubscribeLocalEvent<PuddleComponent, AnchorStateChangedEvent>(OnAnchorChanged);
-        SubscribeLocalEvent<PuddleComponent, SolutionContainerChangedEvent>(OnSolutionUpdate);
         SubscribeLocalEvent<PuddleComponent, SpreadNeighborsEvent>(OnPuddleSpread);
         SubscribeLocalEvent<PuddleComponent, SlipEvent>(OnPuddleSlip);
 
@@ -325,11 +312,13 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
         TickEvaporation();
     }
 
-    private void OnSolutionUpdate(Entity<PuddleComponent> entity, ref SolutionContainerChangedEvent args)
+    protected override void OnSolutionUpdate(Entity<PuddleComponent> entity, ref SolutionContainerChangedEvent args)
     {
         if (args.SolutionId != entity.Comp.SolutionName)
             return;
 
+        base.OnSolutionUpdate(entity, ref args);
+
         if (args.Solution.Volume <= 0)
         {
             _deletionQueue.Add(entity);
@@ -340,46 +329,6 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
         UpdateSlip((entity, entity.Comp), args.Solution);
         UpdateSlow(entity, args.Solution);
         //UpdateEvaporation(entity, args.Solution); //CP14 Force evaporation under sky via YML
-        UpdateAppearance(entity, entity.Comp);
-    }
-
-    private void UpdateAppearance(EntityUid uid, PuddleComponent? puddleComponent = null,
-        AppearanceComponent? appearance = null)
-    {
-        if (!Resolve(uid, ref puddleComponent, ref appearance, false))
-        {
-            return;
-        }
-
-        var volume = FixedPoint2.Zero;
-        Color color = Color.White;
-
-        if (_solutionContainerSystem.ResolveSolution(uid, puddleComponent.SolutionName, ref puddleComponent.Solution,
-                out var solution))
-        {
-            volume = solution.Volume / puddleComponent.OverflowVolume;
-
-            // Make blood stand out more
-            // Kinda EH
-            // Could potentially do alpha per-solution but future problem.
-
-            color = solution.GetColorWithout(_prototypeManager, _standoutReagents);
-            color = color.WithAlpha(0.7f);
-
-            foreach (var standout in _standoutReagents)
-            {
-                var quantity = solution.GetTotalPrototypeQuantity(standout);
-                if (quantity <= FixedPoint2.Zero)
-                    continue;
-
-                var interpolateValue = quantity.Float() / solution.Volume.Float();
-                color = Color.InterpolateBetween(color,
-                    _prototypeManager.Index<ReagentPrototype>(standout).SubstanceColor, interpolateValue);
-            }
-        }
-
-        _appearance.SetData(uid, PuddleVisuals.CurrentVolume, volume.Float(), appearance);
-        _appearance.SetData(uid, PuddleVisuals.SolutionColor, color, appearance);
     }
 
     private void UpdateSlip(Entity<PuddleComponent> entity, Solution solution)
@@ -456,15 +405,15 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
         // A puddle with 10 units of lube vs a puddle with 10 of lube and 20 catchup should stun and launch forward the same amount.
         if (slipperyUnits > 0)
         {
-            slipComp.SlipData.LaunchForwardsMultiplier = (float)(launchMult/slipperyUnits);
-            slipComp.SlipData.ParalyzeTime = (stunTimer/(float)slipperyUnits);
+            slipComp.SlipData.LaunchForwardsMultiplier = (float)(launchMult / slipperyUnits);
+            slipComp.SlipData.ParalyzeTime = stunTimer / (float)slipperyUnits;
         }
 
         // Only make it super slippery if there is enough super slippery units for its own puddle
         slipComp.SlipData.SuperSlippery = superSlipperyUnits >= smallPuddleThreshold;
 
         // Lower tile friction based on how slippery it is, lets items slide across a puddle of lube
-        slipComp.SlipData.SlipFriction = (float)(puddleFriction/solution.Volume);
+        slipComp.SlipData.SlipFriction = (float)(puddleFriction / solution.Volume);
         _tile.SetModifier(entity, slipComp.SlipData.SlipFriction);
 
         Dirty(entity, slipComp);
@@ -754,20 +703,6 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
 
     #endregion
 
-    public void DoTileReactions(TileRef tileRef, Solution solution)
-    {
-        for (var i = solution.Contents.Count - 1; i >= 0; i--)
-        {
-            var (reagent, quantity) = solution.Contents[i];
-            var proto = _prototypeManager.Index<ReagentPrototype>(reagent.Prototype);
-            var removed = proto.ReactionTile(tileRef, quantity, EntityManager, reagent.Data);
-            if (removed <= FixedPoint2.Zero)
-                continue;
-
-            solution.RemoveReagent(reagent, removed);
-        }
-    }
-
     /// <summary>
     /// Tries to get the relevant puddle entity for a tile.
     /// </summary>
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index a6c50d257b..d758b36197 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -36,11 +36,8 @@ namespace Content.Server.GameTicking
         [Dependency] private readonly SharedJobSystem _jobs = default!;
         [Dependency] private readonly AdminSystem _admin = default!;
 
-        [ValidatePrototypeId<EntityPrototype>]
-        public const string ObserverPrototypeName = "MobObserver";
-
-        [ValidatePrototypeId<EntityPrototype>]
-        public const string AdminObserverPrototypeName = "AdminObserver";
+        public static readonly EntProtoId ObserverPrototypeName = "MobObserver";
+        public static readonly EntProtoId AdminObserverPrototypeName = "AdminObserver";
 
         /// <summary>
         /// How many players have joined the round through normal methods.
diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs
index fa8314cd27..55bf51db02 100644
--- a/Content.Server/GameTicking/GameTicker.cs
+++ b/Content.Server/GameTicking/GameTicker.cs
@@ -93,7 +93,7 @@ namespace Content.Server.GameTicking
             InitializePlayer();
             InitializeLobbyBackground();
             InitializeGamePreset();
-            DebugTools.Assert(_prototypeManager.Index<JobPrototype>(FallbackOverflowJob).Name == FallbackOverflowJobName,
+            DebugTools.Assert(_prototypeManager.Index(FallbackOverflowJob).Name == FallbackOverflowJobName,
                 "Overflow role does not have the correct name!");
             InitializeGameRules();
             InitializeReplays();
diff --git a/Content.Server/GameTicking/Presets/GamePresetPrototype.cs b/Content.Server/GameTicking/Presets/GamePresetPrototype.cs
index 0c8aae85e8..85c05ec743 100644
--- a/Content.Server/GameTicking/Presets/GamePresetPrototype.cs
+++ b/Content.Server/GameTicking/Presets/GamePresetPrototype.cs
@@ -1,8 +1,6 @@
-
 using Content.Server.Maps;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Server.GameTicking.Presets
 {
@@ -33,8 +31,8 @@ namespace Content.Server.GameTicking.Presets
         [DataField("maxPlayers")]
         public int? MaxPlayers;
 
-        [DataField("rules", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-        public IReadOnlyList<string> Rules { get; private set; } = Array.Empty<string>();
+        [DataField]
+        public IReadOnlyList<EntProtoId> Rules { get; private set; } = Array.Empty<EntProtoId>();
 
         /// <summary>
         /// If specified, the gamemode will only be run with these maps.
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index 616a1e48ff..f687c9dcc7 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -25,6 +25,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using System.Linq;
 using Content.Shared.Store.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.GameTicking.Rules;
 
@@ -38,11 +39,8 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
     [Dependency] private readonly StoreSystem _store = default!;
     [Dependency] private readonly TagSystem _tag = default!;
 
-    [ValidatePrototypeId<CurrencyPrototype>]
-    private const string TelecrystalCurrencyPrototype = "Telecrystal";
-
-    [ValidatePrototypeId<TagPrototype>]
-    private const string NukeOpsUplinkTagPrototype = "NukeOpsUplink";
+    private static readonly ProtoId<CurrencyPrototype> TelecrystalCurrencyPrototype = "Telecrystal";
+    private static readonly ProtoId<TagPrototype> NukeOpsUplinkTagPrototype = "NukeOpsUplink";
 
 
     public override void Initialize()
@@ -485,7 +483,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
 
         SetWinType(ent, WinType.CrewMajor, false);
 
-        if (nukeops.RoundEndBehavior == RoundEndBehavior.Nothing) // It's still worth checking if operatives have all died, even if the round-end behaviour is nothing. 
+        if (nukeops.RoundEndBehavior == RoundEndBehavior.Nothing) // It's still worth checking if operatives have all died, even if the round-end behaviour is nothing.
             return; // Shouldn't actually try to end the round in the case of nothing though.
 
         _roundEndSystem.DoRoundEndBehavior(nukeops.RoundEndBehavior,
diff --git a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
index 83471cdbc1..a88cf6b428 100644
--- a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
+++ b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
@@ -36,8 +36,9 @@ public sealed class GatewayGeneratorSystem : EntitySystem
     [Dependency] private readonly SharedSalvageSystem _salvage = default!;
     [Dependency] private readonly TileSystem _tile = default!;
 
-    [ValidatePrototypeId<LocalizedDatasetPrototype>]
-    private const string PlanetNames = "NamesBorer";
+    private static readonly ProtoId<LocalizedDatasetPrototype> PlanetNames = "NamesBorer";
+    private static readonly ProtoId<BiomeTemplatePrototype> BiomeTemplate = "Continental";
+    private static readonly ProtoId<DungeonConfigPrototype> DungeonConfig = "Experiment";
 
     // TODO:
     // Fix shader some more
@@ -101,7 +102,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
         var random = new Random(seed);
         var mapUid = _maps.CreateMap();
 
-        var gatewayName = _salvage.GetFTLName(_protoManager.Index<LocalizedDatasetPrototype>(PlanetNames), seed);
+        var gatewayName = _salvage.GetFTLName(_protoManager.Index(PlanetNames), seed);
         _metadata.SetEntityName(mapUid, gatewayName);
 
         var origin = new Vector2i(random.Next(-MaxOffset, MaxOffset), random.Next(-MaxOffset, MaxOffset));
@@ -111,7 +112,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
         };
         AddComp(mapUid, restricted);
 
-        _biome.EnsurePlanet(mapUid, _protoManager.Index<BiomeTemplatePrototype>("Continental"), seed);
+        _biome.EnsurePlanet(mapUid, _protoManager.Index(BiomeTemplate), seed);
 
         var grid = Comp<MapGridComponent>(mapUid);
 
@@ -183,7 +184,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
         var dungeonRotation = _dungeon.GetDungeonRotation(seed);
         var dungeonPosition = (origin + dungeonRotation.RotateVec(new Vector2i(0, dungeonDistance))).Floored();
 
-        _dungeon.GenerateDungeon(_protoManager.Index<DungeonConfigPrototype>("Experiment"), args.MapUid, grid, dungeonPosition, seed);
+        _dungeon.GenerateDungeon(_protoManager.Index(DungeonConfig), args.MapUid, grid, dungeonPosition, seed);
 
         // TODO: Dungeon mobs + loot.
 
diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index 24c1601217..1c10d08dcd 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -74,6 +74,7 @@ namespace Content.Server.Ghost
         private EntityQuery<PhysicsComponent> _physicsQuery;
 
         private static readonly ProtoId<TagPrototype> AllowGhostShownByEventTag = "AllowGhostShownByEvent";
+        private static readonly ProtoId<DamageTypePrototype> AsphyxiationDamageType = "Asphyxiation";
 
         public override void Initialize()
         {
@@ -588,7 +589,7 @@ namespace Content.Server.Ghost
                         dealtDamage = playerDeadThreshold - damageable.TotalDamage;
                     }
 
-                    DamageSpecifier damage = new(_prototypeManager.Index<DamageTypePrototype>("Asphyxiation"), dealtDamage);
+                    DamageSpecifier damage = new(_prototypeManager.Index(AsphyxiationDamageType), dealtDamage);
 
                     _damageable.TryChangeDamage(playerEntity, damage, true);
                 }
diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
index 23d8a6e8ea..cd0330ded8 100644
--- a/Content.Server/Ghost/Roles/GhostRoleSystem.cs
+++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
@@ -510,6 +510,11 @@ public sealed class GhostRoleSystem : EntitySystem
 
         DebugTools.AssertNotNull(player.ContentData());
 
+        // After taking a ghost role, the player cannot return to the original body, so wipe the player's current mind
+        // unless it is a visiting mind
+        if(_mindSystem.TryGetMind(player.UserId, out _, out var mind) && !mind.IsVisitingEntity)
+            _mindSystem.WipeMind(player);
+
         var newMind = _mindSystem.CreateMind(player.UserId,
             Comp<MetaDataComponent>(mob).EntityName);
 
diff --git a/Content.Server/Implants/Components/AutoImplantComponent.cs b/Content.Server/Implants/Components/AutoImplantComponent.cs
index e082354d8b..48cfabf58f 100644
--- a/Content.Server/Implants/Components/AutoImplantComponent.cs
+++ b/Content.Server/Implants/Components/AutoImplantComponent.cs
@@ -1,5 +1,4 @@
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Server.Implants.Components;
 
@@ -12,6 +11,6 @@ public sealed partial class AutoImplantComponent : Component
     /// <summary>
     /// List of implants to inject.
     /// </summary>
-    [DataField("implants", required: true, customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string> Implants = new();
+    [DataField(required: true)]
+    public List<EntProtoId> Implants = new();
 }
diff --git a/Content.Server/Info/ShowRulesCommand.cs b/Content.Server/Info/ShowRulesCommand.cs
index eb3fb08db0..c6cc585270 100644
--- a/Content.Server/Info/ShowRulesCommand.cs
+++ b/Content.Server/Info/ShowRulesCommand.cs
@@ -10,55 +10,46 @@ using Robust.Shared.Network;
 namespace Content.Server.Info;
 
 [AdminCommand(AdminFlags.Admin)]
-public sealed class ShowRulesCommand : IConsoleCommand
+public sealed class ShowRulesCommand : LocalizedCommands
 {
-    [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly IConfigurationManager _configuration = default!;
+    [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
 
-    public string Command => "showrules";
-    public string Description => "Opens the rules popup for the specified player.";
-    public string Help => "showrules <username> [seconds]";
-    public async void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "showrules";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        string target;
-        float seconds;
-
-        switch (args.Length)
+        if (args.Length is < 1 or > 2)
         {
-            case 1:
-            {
-                target = args[0];
-                seconds = _configuration.GetCVar(CCVars.RulesWaitTime);
-                break;
-            }
-            case 2:
-            {
-                if (!float.TryParse(args[1], out seconds))
-                {
-                    shell.WriteError($"{args[1]} is not a valid amount of seconds.\n{Help}");
-                    return;
-                }
-
-                target = args[0];
-                break;
-            }
-            default:
-            {
-                shell.WriteLine(Help);
-                return;
-            }
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+            return;
         }
 
+        var seconds = _configuration.GetCVar(CCVars.RulesWaitTime);
 
-        if (!_player.TryGetSessionByUsername(target, out var player))
+        if (args.Length == 2 && !float.TryParse(args[1], out seconds))
         {
-            shell.WriteError("Unable to find a player with that name.");
-           return;
+            shell.WriteError(Loc.GetString("cmd-showrules-invalid-seconds", ("seconds", args[1])));
+            return;
+        }
+
+        if (!_player.TryGetSessionByUsername(args[0], out var player))
+        {
+            shell.WriteError(Loc.GetString("shell-target-player-does-not-exist"));
+            return;
         }
 
         var coreRules = _configuration.GetCVar(CCVars.RulesFile);
-        var message = new SendRulesInformationMessage { PopupTime = seconds, CoreRules = coreRules, ShouldShowRules = true};
+        var message = new SendRulesInformationMessage
+            { PopupTime = seconds, CoreRules = coreRules, ShouldShowRules = true };
         _net.ServerSendMessage(message, player.Channel);
     }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        return args.Length == 1
+            ? CompletionResult.FromOptions(CompletionHelper.SessionNames(players: _player))
+            : CompletionResult.Empty;
+    }
 }
diff --git a/Content.Server/Jobs/AddImplantSpecial.cs b/Content.Server/Jobs/AddImplantSpecial.cs
index 83193e7056..3967a08d9e 100644
--- a/Content.Server/Jobs/AddImplantSpecial.cs
+++ b/Content.Server/Jobs/AddImplantSpecial.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Roles;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 
 namespace Content.Server.Jobs;
 
@@ -12,8 +11,8 @@ namespace Content.Server.Jobs;
 [UsedImplicitly]
 public sealed partial class AddImplantSpecial : JobSpecial
 {
-    [DataField("implants", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<EntityPrototype>))]
-    public HashSet<String> Implants { get; private set; } = new();
+    [DataField]
+    public HashSet<EntProtoId> Implants { get; private set; } = new();
 
     public override void AfterEquip(EntityUid mob)
     {
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index 07ced93085..f5c8c4d0d8 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -70,8 +70,7 @@ namespace Content.Server.Kitchen.EntitySystems
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
         [Dependency] private readonly SharedSuicideSystem _suicide = default!;
 
-        [ValidatePrototypeId<EntityPrototype>]
-        private const string MalfunctionSpark = "Spark";
+        private static readonly EntProtoId MalfunctionSpark = "Spark";
 
         private static readonly ProtoId<TagPrototype> MetalTag = "Metal";
         private static readonly ProtoId<TagPrototype> PlasticTag = "Plastic";
diff --git a/Content.Server/MagicMirror/MagicMirrorSystem.cs b/Content.Server/MagicMirror/MagicMirrorSystem.cs
index 37302999ed..0fd00fca24 100644
--- a/Content.Server/MagicMirror/MagicMirrorSystem.cs
+++ b/Content.Server/MagicMirror/MagicMirrorSystem.cs
@@ -137,13 +137,13 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
         if (component.Target is not { } target)
             return;
 
-                // Check if the target getting their hair altered has any clothes that hides their hair
+        // Check if the target getting their hair altered has any clothes that hides their hair
         if (CheckHeadSlotOrClothes(message.Actor, component.Target.Value))
         {
             _popup.PopupEntity(
                 component.Target == message.Actor
                     ? Loc.GetString("magic-mirror-blocked-by-hat-self")
-                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target"),
+                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target", ("target", Identity.Entity(message.Actor, EntityManager))),
                 message.Actor,
                 message.Actor,
                 PopupType.Medium);
@@ -222,7 +222,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
             _popup.PopupEntity(
                 component.Target == message.Actor
                     ? Loc.GetString("magic-mirror-blocked-by-hat-self")
-                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target"),
+                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target", ("target", Identity.Entity(message.Actor, EntityManager))),
                 message.Actor,
                 message.Actor,
                 PopupType.Medium);
@@ -301,7 +301,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
             _popup.PopupEntity(
                 component.Target == message.Actor
                     ? Loc.GetString("magic-mirror-blocked-by-hat-self")
-                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target"),
+                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target", ("target", Identity.Entity(message.Actor, EntityManager))),
                 message.Actor,
                 message.Actor,
                 PopupType.Medium);
diff --git a/Content.Server/Mapping/MappingCommand.cs b/Content.Server/Mapping/MappingCommand.cs
index 96a21573f6..8081b8e45f 100644
--- a/Content.Server/Mapping/MappingCommand.cs
+++ b/Content.Server/Mapping/MappingCommand.cs
@@ -146,7 +146,7 @@ namespace Content.Server.Mapping
 
             // map successfully created. run misc helpful mapping commands
             if (player.AttachedEntity is { Valid: true } playerEntity &&
-                EntityManager.GetComponent<MetaDataComponent>(playerEntity).EntityPrototype?.ID != GameTicker.AdminObserverPrototypeName)
+                (EntityManager.GetComponent<MetaDataComponent>(playerEntity).EntityPrototype is not { } proto || proto != GameTicker.AdminObserverPrototypeName))
             {
                 shell.ExecuteCommand("aghost");
             }
diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs
index 1e9acbd568..7de0d630e0 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.Repairable;
 using Content.Server.Stack;
 using Content.Server.Wires;
 using Content.Shared.Body.Systems;
@@ -19,6 +18,7 @@ using Content.Shared.Materials;
 using Content.Shared.Mind;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Power;
+using Content.Shared.Repairable;
 using Content.Shared.Stacks;
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
diff --git a/Content.Server/Materials/ProduceMaterialExtractorSystem.cs b/Content.Server/Materials/ProduceMaterialExtractorSystem.cs
index 5a46930499..251dea7fc6 100644
--- a/Content.Server/Materials/ProduceMaterialExtractorSystem.cs
+++ b/Content.Server/Materials/ProduceMaterialExtractorSystem.cs
@@ -4,6 +4,7 @@ using Content.Server.Materials.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Interaction;
+using Content.Shared.Popups;
 using Robust.Server.Audio;
 
 namespace Content.Server.Materials;
@@ -13,6 +14,7 @@ public sealed class ProduceMaterialExtractorSystem : EntitySystem
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly MaterialStorageSystem _materialStorage = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -39,7 +41,16 @@ public sealed class ProduceMaterialExtractorSystem : EntitySystem
         var matAmount = solution.Value.Comp.Solution.Contents
             .Where(r => ent.Comp.ExtractionReagents.Contains(r.Reagent.Prototype))
             .Sum(r => r.Quantity.Float());
-        _materialStorage.TryChangeMaterialAmount(ent, ent.Comp.ExtractedMaterial, (int) matAmount);
+
+        var changed = (int)matAmount;
+
+        if (changed == 0)
+        {
+            _popup.PopupEntity(Loc.GetString("material-extractor-comp-wrongreagent", ("used", args.Used)), args.User, args.User);
+            return;
+        }
+
+        _materialStorage.TryChangeMaterialAmount(ent, ent.Comp.ExtractedMaterial, changed);
 
         _audio.PlayPvs(ent.Comp.ExtractSound, ent);
         QueueDel(args.Used);
diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
index 42e455a47f..e029071574 100644
--- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
+++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
@@ -17,9 +17,9 @@ using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
 using Content.Shared.Jittering;
+using Content.Shared.Materials;
 using Content.Shared.Medical;
 using Content.Shared.Mind;
-using Content.Shared.Materials;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition.Components;
@@ -30,6 +30,7 @@ using Robust.Server.Player;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
 namespace Content.Server.Medical.BiomassReclaimer
@@ -53,8 +54,7 @@ namespace Content.Server.Medical.BiomassReclaimer
         [Dependency] private readonly SharedMindSystem _minds = default!;
         [Dependency] private readonly InventorySystem _inventory = default!;
 
-        [ValidatePrototypeId<MaterialPrototype>]
-        public const string BiomassPrototype = "Biomass";
+        public static readonly ProtoId<MaterialPrototype> BiomassPrototype = "Biomass";
 
         public override void Update(float frameTime)
         {
diff --git a/Content.Server/Medical/VomitSystem.cs b/Content.Server/Medical/VomitSystem.cs
index 66cc9bf5f6..7b8be07a15 100644
--- a/Content.Server/Medical/VomitSystem.cs
+++ b/Content.Server/Medical/VomitSystem.cs
@@ -32,8 +32,7 @@ namespace Content.Server.Medical
         [Dependency] private readonly ForensicsSystem _forensics = default!;
         [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
 
-        [ValidatePrototypeId<SoundCollectionPrototype>]
-        private const string VomitCollection = "Vomit";
+        private static readonly ProtoId<SoundCollectionPrototype> VomitCollection = "Vomit";
 
         private readonly SoundSpecifier _vomitSound = new SoundCollectionSpecifier(VomitCollection,
             AudioParams.Default.WithVariation(0.2f).WithVolume(-4f));
diff --git a/Content.Server/Movement/Systems/PullController.cs b/Content.Server/Movement/Systems/PullController.cs
index 40345a5867..f2bbdc247b 100644
--- a/Content.Server/Movement/Systems/PullController.cs
+++ b/Content.Server/Movement/Systems/PullController.cs
@@ -85,7 +85,7 @@ public sealed class PullController : VirtualController
     {
         CommandBinds.Builder
             .Bind(ContentKeyFunctions.MovePulledObject, new PointerInputCmdHandler(OnRequestMovePulledObject))
-            .Register<PullingSystem>();
+            .Register<PullController>();
 
         _physicsQuery = GetEntityQuery<PhysicsComponent>();
         _pullableQuery = GetEntityQuery<PullableComponent>();
diff --git a/Content.Server/Power/Components/BaseNetConnectorComponent.cs b/Content.Server/Power/Components/BaseNetConnectorComponent.cs
index b22950c1a1..464bbd6f39 100644
--- a/Content.Server/Power/Components/BaseNetConnectorComponent.cs
+++ b/Content.Server/Power/Components/BaseNetConnectorComponent.cs
@@ -4,6 +4,7 @@ using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Shared.NodeContainer;
 using Content.Shared.NodeContainer.NodeGroups;
+using Content.Shared.Power;
 
 namespace Content.Server.Power.Components
 {
@@ -94,11 +95,4 @@ namespace Content.Server.Power.Components
             TryFindAndSetNet();
         }
     }
-
-    public enum Voltage
-    {
-        High = NodeGroupID.HVPower,
-        Medium = NodeGroupID.MVPower,
-        Apc = NodeGroupID.Apc,
-    }
 }
diff --git a/Content.Server/Power/EntitySystems/PowerChargeSystem.cs b/Content.Server/Power/EntitySystems/PowerChargeSystem.cs
index 7935af155a..671a880874 100644
--- a/Content.Server/Power/EntitySystems/PowerChargeSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerChargeSystem.cs
@@ -85,8 +85,8 @@ public sealed class PowerChargeSystem : EntitySystem
         if (!Resolve(uid, ref powerReceiver))
             return;
 
-        if (user is { } )
-            _adminLogger.Add(LogType.Action, on ? LogImpact.Medium : LogImpact.High, $"{ToPrettyString(user):player} set ${ToPrettyString(uid):target} to {(on ? "on" : "off")}");
+        if (user is { })
+            _adminLogger.Add(LogType.Action, on ? LogImpact.Medium : LogImpact.High, $"{ToPrettyString(user):player} set {ToPrettyString(uid):target} to {(on ? "on" : "off")}");
 
         component.SwitchedOn = on;
         UpdatePowerState(component, powerReceiver);
diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
index 9dc0c2c498..1262e231d7 100644
--- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
@@ -45,6 +45,7 @@ namespace Content.Server.Power.EntitySystems
             UpdatesAfter.Add(typeof(NodeGroupSystem));
             _solver = new(_cfg.GetCVar(CCVars.DebugPow3rDisableParallel));
 
+            SubscribeLocalEvent<ApcPowerReceiverComponent, MapInitEvent>(ApcPowerReceiverMapInit);
             SubscribeLocalEvent<ApcPowerReceiverComponent, ComponentInit>(ApcPowerReceiverInit);
             SubscribeLocalEvent<ApcPowerReceiverComponent, ComponentShutdown>(ApcPowerReceiverShutdown);
             SubscribeLocalEvent<ApcPowerReceiverComponent, ComponentRemove>(ApcPowerReceiverRemove);
@@ -74,6 +75,11 @@ namespace Content.Server.Power.EntitySystems
             _solver = new(val);
         }
 
+        private void ApcPowerReceiverMapInit(Entity<ApcPowerReceiverComponent> ent, ref MapInitEvent args)
+        {
+            _appearance.SetData(ent, PowerDeviceVisuals.Powered, ent.Comp.Powered);
+        }
+
         private void ApcPowerReceiverInit(EntityUid uid, ApcPowerReceiverComponent component, ComponentInit args)
         {
             AllocLoad(component.NetworkLoad);
diff --git a/Content.Server/Power/Generator/PowerSwitchableSystem.cs b/Content.Server/Power/Generator/PowerSwitchableSystem.cs
index 7b7d7ce256..25de3bd293 100644
--- a/Content.Server/Power/Generator/PowerSwitchableSystem.cs
+++ b/Content.Server/Power/Generator/PowerSwitchableSystem.cs
@@ -4,6 +4,7 @@ using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.Nodes;
 using Content.Shared.NodeContainer;
+using Content.Shared.Power;
 using Content.Shared.Power.Generator;
 using Content.Shared.Timing;
 using Content.Shared.Verbs;
diff --git a/Content.Server/Procedural/DungeonSystem.cs b/Content.Server/Procedural/DungeonSystem.cs
index 26ce2b01a7..fba61c504b 100644
--- a/Content.Server/Procedural/DungeonSystem.cs
+++ b/Content.Server/Procedural/DungeonSystem.cs
@@ -54,8 +54,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
     private readonly JobQueue _dungeonJobQueue = new(DungeonJobTime);
     private readonly Dictionary<DungeonJob.DungeonJob, CancellationTokenSource> _dungeonJobs = new();
 
-    [ValidatePrototypeId<ContentTileDefinition>]
-    public const string FallbackTileId = "FloorSteel";
+    public static readonly ProtoId<ContentTileDefinition> FallbackTileId = "FloorSteel";
 
     public override void Initialize()
     {
diff --git a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
index d18b044205..e3f8070311 100644
--- a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
+++ b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
@@ -99,7 +99,19 @@ public sealed class HeadsetSystem : SharedHeadsetSystem
 
     private void OnHeadsetReceive(EntityUid uid, HeadsetComponent component, ref RadioReceiveEvent args)
     {
-        if (TryComp(Transform(uid).ParentUid, out ActorComponent? actor))
+        // TODO: change this when a code refactor is done
+        // this is currently done this way because receiving radio messages on an entity otherwise requires that entity
+        // to have an ActiveRadioComponent
+
+        var parent = Transform(uid).ParentUid;
+
+        if (parent.IsValid())
+        {
+            var relayEvent = new HeadsetRadioReceiveRelayEvent(args);
+            RaiseLocalEvent(parent, ref relayEvent);
+        }
+
+        if (TryComp(parent, out ActorComponent? actor))
             _netMan.ServerSendMessage(args.ChatMsg, actor.PlayerSession.Channel);
     }
 
diff --git a/Content.Server/Radio/RadioEvent.cs b/Content.Server/Radio/RadioEvent.cs
index fafa66674e..49ff63f824 100644
--- a/Content.Server/Radio/RadioEvent.cs
+++ b/Content.Server/Radio/RadioEvent.cs
@@ -6,6 +6,12 @@ namespace Content.Server.Radio;
 [ByRefEvent]
 public readonly record struct RadioReceiveEvent(string Message, EntityUid MessageSource, RadioChannelPrototype Channel, EntityUid RadioSource, MsgChatMessage ChatMsg);
 
+/// <summary>
+/// Event raised on the parent entity of a headset radio when a radio message is received
+/// </summary>
+[ByRefEvent]
+public readonly record struct HeadsetRadioReceiveRelayEvent(RadioReceiveEvent RelayedEvent);
+
 /// <summary>
 /// Use this event to cancel sending message per receiver
 /// </summary>
diff --git a/Content.Server/Repairable/RepairableComponent.cs b/Content.Server/Repairable/RepairableComponent.cs
deleted file mode 100644
index bab70f66b5..0000000000
--- a/Content.Server/Repairable/RepairableComponent.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.Tools;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Repairable
-{
-    [RegisterComponent]
-    public sealed partial class RepairableComponent : Component
-    {
-        /// <summary>
-        ///     All the damage to change information is stored in this <see cref="DamageSpecifier"/>.
-        /// </summary>
-        /// <remarks>
-        ///     If this data-field is specified, it will change damage by this amount instead of setting all damage to 0.
-        ///     in order to heal/repair the damage values have to be negative.
-        /// </remarks>
-        [DataField]
-        public DamageSpecifier? Damage;
-
-        [DataField]
-        public int FuelCost = 5;
-
-        [DataField]
-        public ProtoId<ToolQualityPrototype> QualityNeeded = "Welding";
-
-        [DataField]
-        public int DoAfterDelay = 1;
-
-        /// <summary>
-        /// A multiplier that will be applied to the above if an entity is repairing themselves.
-        /// </summary>
-        [DataField]
-        public float SelfRepairPenalty = 3f;
-
-        /// <summary>
-        /// Whether or not an entity is allowed to repair itself.
-        /// </summary>
-        [DataField]
-        public bool AllowSelfRepair = true;
-    }
-}
diff --git a/Content.Server/Repairable/RepairableSystem.cs b/Content.Server/Repairable/RepairableSystem.cs
deleted file mode 100644
index c05a13c387..0000000000
--- a/Content.Server/Repairable/RepairableSystem.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using Content.Server.Administration.Logs;
-using Content.Shared.Damage;
-using Content.Shared.Database;
-using Content.Shared.Interaction;
-using Content.Shared.Popups;
-using Content.Shared.Repairable;
-using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
-
-namespace Content.Server.Repairable
-{
-    public sealed class RepairableSystem : SharedRepairableSystem
-    {
-        [Dependency] private readonly SharedToolSystem _toolSystem = default!;
-        [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-        [Dependency] private readonly SharedPopupSystem _popup = default!;
-        [Dependency] private readonly IAdminLogManager _adminLogger= default!;
-
-        public override void Initialize()
-        {
-            SubscribeLocalEvent<RepairableComponent, InteractUsingEvent>(Repair);
-            SubscribeLocalEvent<RepairableComponent, RepairFinishedEvent>(OnRepairFinished);
-        }
-
-        private void OnRepairFinished(EntityUid uid, RepairableComponent component, RepairFinishedEvent args)
-        {
-            if (args.Cancelled)
-                return;
-
-            if (!TryComp(uid, out DamageableComponent? damageable) || damageable.TotalDamage == 0)
-                return;
-
-            if (component.Damage != null)
-            {
-                var damageChanged = _damageableSystem.TryChangeDamage(uid, component.Damage, true, false, origin: args.User);
-                _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(uid):target} by {damageChanged?.GetTotal()}");
-            }
-
-            else
-            {
-                // Repair all damage
-                _damageableSystem.SetAllDamage(uid, damageable, 0);
-                _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(uid):target} back to full health");
-            }
-
-            var str = Loc.GetString("comp-repairable-repair",
-                ("target", uid),
-                ("tool", args.Used!));
-            _popup.PopupEntity(str, uid, args.User);
-
-            var ev = new RepairedEvent((uid, component), args.User);
-            RaiseLocalEvent(uid, ref ev);
-        }
-
-        public async void Repair(EntityUid uid, RepairableComponent component, InteractUsingEvent args)
-        {
-            if (args.Handled)
-                return;
-
-            // Only try repair the target if it is damaged
-            if (!TryComp<DamageableComponent>(uid, out var damageable) || damageable.TotalDamage == 0)
-                return;
-
-            float delay = component.DoAfterDelay;
-
-            // Add a penalty to how long it takes if the user is repairing itself
-            if (args.User == args.Target)
-            {
-                if (!component.AllowSelfRepair)
-                    return;
-
-                delay *= component.SelfRepairPenalty;
-            }
-
-            // Run the repairing doafter
-            args.Handled = _toolSystem.UseTool(args.Used, args.User, uid, delay, component.QualityNeeded, new RepairFinishedEvent(), component.FuelCost);
-        }
-    }
-
-    /// <summary>
-    /// Event raised on an entity when its successfully repaired.
-    /// </summary>
-    /// <param name="Ent"></param>
-    /// <param name="User"></param>
-    [ByRefEvent]
-    public readonly record struct RepairedEvent(Entity<RepairableComponent> Ent, EntityUid User);
-
-}
diff --git a/Content.Server/Research/Systems/ResearchSystem.Technology.cs b/Content.Server/Research/Systems/ResearchSystem.Technology.cs
index 0237c8712a..3e8888276f 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Technology.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Technology.cs
@@ -2,6 +2,7 @@ using Content.Shared.Database;
 using Content.Shared.Research.Components;
 using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Research.Systems;
 
@@ -165,9 +166,9 @@ public sealed partial class ResearchSystem
             return;
         component.MainDiscipline = null;
         component.CurrentTechnologyCards = new List<string>();
-        component.SupportedDisciplines = new List<string>();
-        component.UnlockedTechnologies = new List<string>();
-        component.UnlockedRecipes = new List<string>();
+        component.SupportedDisciplines = new List<ProtoId<TechDisciplinePrototype>>();
+        component.UnlockedTechnologies = new List<ProtoId<TechnologyPrototype>>();
+        component.UnlockedRecipes = new List<ProtoId<LatheRecipePrototype>>();
         Dirty(uid, component);
     }
 }
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
index 51cbb6d4d5..0ef7b8f533 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
@@ -35,6 +35,7 @@ namespace Content.Server.Revenant.EntitySystems;
 
 public sealed partial class RevenantSystem
 {
+    [Dependency] private readonly EmagSystem _emagSystem = default!;
     [Dependency] private readonly ThrowingSystem _throwing = default!;
     [Dependency] private readonly EntityStorageSystem _entityStorage = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
@@ -345,8 +346,7 @@ public sealed partial class RevenantSystem
                 _whitelistSystem.IsBlacklistPass(component.MalfunctionBlacklist, ent))
                 continue;
 
-            var ev = new GotEmaggedEvent(uid, EmagType.Interaction | EmagType.Access);
-            RaiseLocalEvent(ent, ref ev);
+            _emagSystem.TryEmagEffect(uid, uid, ent);
         }
     }
 }
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
index 0501f5afc3..2d38aee6ea 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
@@ -47,8 +47,7 @@ public sealed partial class RevenantSystem : EntitySystem
     [Dependency] private readonly VisibilitySystem _visibility = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string RevenantShopId = "ActionRevenantShop";
+    private static readonly EntProtoId RevenantShopId = "ActionRevenantShop";
 
     public override void Initialize()
     {
diff --git a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
index a9d8314f57..aa501368de 100644
--- a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
+++ b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
@@ -8,8 +8,8 @@ namespace Content.Server.Salvage;
 
 public sealed partial class SalvageSystem
 {
-    [ValidatePrototypeId<EntityPrototype>]
-    public const string CoordinatesDisk = "CoordinatesDisk";
+    public static readonly EntProtoId CoordinatesDisk = "CoordinatesDisk";
+    public static readonly ProtoId<LocalizedDatasetPrototype> PlanetNames = "NamesBorer";
 
     private void OnSalvageClaimMessage(EntityUid uid, SalvageExpeditionConsoleComponent component, ClaimSalvageMessage args)
     {
@@ -28,7 +28,7 @@ public sealed partial class SalvageSystem
         var mission = GetMission(_prototypeManager.Index<SalvageDifficultyPrototype>(missionparams.Difficulty), missionparams.Seed);
         data.NextOffer = _timing.CurTime + mission.Duration + TimeSpan.FromSeconds(1);
 
-        _labelSystem.Label(cdUid, GetFTLName(_prototypeManager.Index<LocalizedDatasetPrototype>("NamesBorer"), missionparams.Seed));
+        _labelSystem.Label(cdUid, GetFTLName(_prototypeManager.Index(PlanetNames), missionparams.Seed));
         _audio.PlayPvs(component.PrintSound, uid);
 
         UpdateConsoles((station.Value, data));
diff --git a/Content.Server/Salvage/SalvageSystem.Magnet.cs b/Content.Server/Salvage/SalvageSystem.Magnet.cs
index 41d4c2e755..ee5cd792c6 100644
--- a/Content.Server/Salvage/SalvageSystem.Magnet.cs
+++ b/Content.Server/Salvage/SalvageSystem.Magnet.cs
@@ -8,6 +8,7 @@ using Content.Shared.Radio;
 using Content.Shared.Salvage.Magnet;
 using Robust.Shared.Exceptions;
 using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Salvage;
 
@@ -15,8 +16,7 @@ public sealed partial class SalvageSystem
 {
     [Dependency] private readonly IRuntimeLog _runtimeLog = default!;
 
-    [ValidatePrototypeId<RadioChannelPrototype>]
-    private const string MagnetChannel = "Supply";
+    private static readonly ProtoId<RadioChannelPrototype> MagnetChannel = "Supply";
 
     private EntityQuery<SalvageMobRestrictionsComponent> _salvMobQuery;
     private EntityQuery<MobStateComponent> _mobStateQuery;
diff --git a/Content.Server/Salvage/SpawnSalvageMissionJob.cs b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
index cbce4dc692..75b22598f9 100644
--- a/Content.Server/Salvage/SpawnSalvageMissionJob.cs
+++ b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
@@ -100,7 +100,7 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
         destComp.Enabled = true;
         _metaData.SetEntityName(
             mapUid,
-            _entManager.System<SharedSalvageSystem>().GetFTLName(_prototypeManager.Index<LocalizedDatasetPrototype>("NamesBorer"), _missionParams.Seed));
+            _entManager.System<SharedSalvageSystem>().GetFTLName(_prototypeManager.Index(SalvageSystem.PlanetNames), _missionParams.Seed));
         _entManager.AddComponent<FTLBeaconComponent>(mapUid);
 
         // Saving the mission mapUid to a CD is made optional, in case one is somehow made in a process without a CD entity
@@ -255,7 +255,7 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
             }
         }
 
-        var allLoot = _prototypeManager.Index<SalvageLootPrototype>(SharedSalvageSystem.ExpeditionsLootProto);
+        var allLoot = _prototypeManager.Index(SharedSalvageSystem.ExpeditionsLootProto);
         var lootBudget = difficultyProto.LootBudget;
 
         foreach (var rule in allLoot.LootRules)
diff --git a/Content.Server/Shuttles/Commands/FTLDiskCommand.cs b/Content.Server/Shuttles/Commands/FTLDiskCommand.cs
index 63d45e2364..5d7c108e5d 100644
--- a/Content.Server/Shuttles/Commands/FTLDiskCommand.cs
+++ b/Content.Server/Shuttles/Commands/FTLDiskCommand.cs
@@ -25,11 +25,8 @@ public sealed class FTLDiskCommand : LocalizedCommands
 
     public override string Command => "ftldisk";
 
-    [ValidatePrototypeId<EntityPrototype>]
-    public const string CoordinatesDisk = "CoordinatesDisk";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    public const string DiskCase = "DiskCase";
+    public static readonly EntProtoId CoordinatesDisk = "CoordinatesDisk";
+    public static readonly EntProtoId DiskCase = "DiskCase";
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (args.Length == 0)
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
index 95c6ab5a1b..e07b522c5a 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
@@ -6,6 +6,7 @@ using Content.Shared.Access;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.DeviceNetwork;
+using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.Popups;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Events;
@@ -13,7 +14,7 @@ using Content.Shared.Shuttles.Systems;
 using Content.Shared.UserInterface;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
-using Content.Shared.DeviceNetwork.Components;
+using Robust.Shared.Prototypes;
 using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Server.Shuttles.Systems;
@@ -65,8 +66,7 @@ public sealed partial class EmergencyShuttleSystem
 
     private CancellationTokenSource? _roundEndCancelToken;
 
-    [ValidatePrototypeId<AccessLevelPrototype>]
-    private const string EmergencyRepealAllAccess = "EmergencyShuttleRepealAll";
+    private static readonly ProtoId<AccessLevelPrototype> EmergencyRepealAllAccess = "EmergencyShuttleRepealAll";
     private static readonly Color DangerColor = Color.Red;
 
     /// <summary>
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index 94e028b402..9eff1455f9 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -21,6 +21,7 @@ using Content.Shared.Access.Systems;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.DeviceNetwork;
+using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.GameTicking;
 using Content.Shared.Localizations;
 using Content.Shared.Shuttles.Components;
@@ -33,10 +34,10 @@ using Robust.Shared.Configuration;
 using Robust.Shared.EntitySerialization.Systems;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Content.Shared.DeviceNetwork.Components;
 
 namespace Content.Server.Shuttles.Systems;
 
@@ -73,8 +74,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
 
     private bool _emergencyShuttleEnabled;
 
-    [ValidatePrototypeId<TagPrototype>]
-    private const string DockTag = "DockEmergency";
+    private static readonly ProtoId<TagPrototype> DockTag = "DockEmergency";
 
     public override void Initialize()
     {
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
index 1b6040773c..07fb1cb30b 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
@@ -199,7 +199,7 @@ public sealed partial class BorgSystem
             else
             {
                 item = component.ProvidedContainer.ContainedEntities
-                    .FirstOrDefault(ent => Prototype(ent)?.ID == itemProto);
+                    .FirstOrDefault(ent => Prototype(ent)?.ID == itemProto.Id);
                 if (!item.IsValid())
                 {
                     Log.Debug($"no items found: {component.ProvidedContainer.ContainedEntities.Count}");
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index fd40aa8816..0cd407000f 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -1,12 +1,14 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Content.Server.Actions;
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
-using Content.Shared.Body.Events;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Hands.Systems;
 using Content.Server.PowerCell;
 using Content.Shared.Alert;
+using Content.Shared.Body.Events;
 using Content.Shared.Database;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
@@ -29,10 +31,9 @@ using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 
 namespace Content.Server.Silicons.Borgs;
 
@@ -61,8 +62,7 @@ public sealed partial class BorgSystem : SharedBorgSystem
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
     [Dependency] private readonly ISharedPlayerManager _player = default!;
 
-    [ValidatePrototypeId<JobPrototype>]
-    public const string BorgJobId = "Borg";
+    public static readonly ProtoId<JobPrototype> BorgJobId = "Borg";
 
     /// <inheritdoc/>
     public override void Initialize()
diff --git a/Content.Server/Silicons/Laws/IonStormSystem.cs b/Content.Server/Silicons/Laws/IonStormSystem.cs
index 7b848a0ea6..249813edc1 100644
--- a/Content.Server/Silicons/Laws/IonStormSystem.cs
+++ b/Content.Server/Silicons/Laws/IonStormSystem.cs
@@ -22,42 +22,24 @@ public sealed class IonStormSystem : EntitySystem
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
 
     // funny
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Threats = "IonStormThreats";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Objects = "IonStormObjects";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Crew = "IonStormCrew";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Adjectives = "IonStormAdjectives";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Verbs = "IonStormVerbs";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string NumberBase = "IonStormNumberBase";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string NumberMod = "IonStormNumberMod";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Areas = "IonStormAreas";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Feelings = "IonStormFeelings";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string FeelingsPlural = "IonStormFeelingsPlural";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Musts = "IonStormMusts";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Requires = "IonStormRequires";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Actions = "IonStormActions";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Allergies = "IonStormAllergies";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string AllergySeverities = "IonStormAllergySeverities";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Concepts = "IonStormConcepts";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Drinks = "IonStormDrinks";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Foods = "IonStormFoods";
+    private static readonly ProtoId<DatasetPrototype> Threats = "IonStormThreats";
+    private static readonly ProtoId<DatasetPrototype> Objects = "IonStormObjects";
+    private static readonly ProtoId<DatasetPrototype> Crew = "IonStormCrew";
+    private static readonly ProtoId<DatasetPrototype> Adjectives = "IonStormAdjectives";
+    private static readonly ProtoId<DatasetPrototype> Verbs = "IonStormVerbs";
+    private static readonly ProtoId<DatasetPrototype> NumberBase = "IonStormNumberBase";
+    private static readonly ProtoId<DatasetPrototype> NumberMod = "IonStormNumberMod";
+    private static readonly ProtoId<DatasetPrototype> Areas = "IonStormAreas";
+    private static readonly ProtoId<DatasetPrototype> Feelings = "IonStormFeelings";
+    private static readonly ProtoId<DatasetPrototype> FeelingsPlural = "IonStormFeelingsPlural";
+    private static readonly ProtoId<DatasetPrototype> Musts = "IonStormMusts";
+    private static readonly ProtoId<DatasetPrototype> Requires = "IonStormRequires";
+    private static readonly ProtoId<DatasetPrototype> Actions = "IonStormActions";
+    private static readonly ProtoId<DatasetPrototype> Allergies = "IonStormAllergies";
+    private static readonly ProtoId<DatasetPrototype> AllergySeverities = "IonStormAllergySeverities";
+    private static readonly ProtoId<DatasetPrototype> Concepts = "IonStormConcepts";
+    private static readonly ProtoId<DatasetPrototype> Drinks = "IonStormDrinks";
+    private static readonly ProtoId<DatasetPrototype> Foods = "IonStormFoods";
 
     /// <summary>
     /// Randomly alters the laws of an individual silicon.
diff --git a/Content.Server/Speech/AccentSystem.cs b/Content.Server/Speech/AccentSystem.cs
index 7e29f02cae..e413dd52f8 100644
--- a/Content.Server/Speech/AccentSystem.cs
+++ b/Content.Server/Speech/AccentSystem.cs
@@ -1,44 +1,23 @@
 using System.Text.RegularExpressions;
-using Content.Server.Chat;
 using Content.Server.Chat.Systems;
+using Content.Shared.Speech;
 
-namespace Content.Server.Speech
+namespace Content.Server.Speech;
+
+public sealed class AccentSystem : EntitySystem
 {
-    public sealed class AccentSystem : EntitySystem
+    public static readonly Regex SentenceRegex = new(@"(?<=[\.!\?‽])(?![\.!\?‽])", RegexOptions.Compiled);
+
+    public override void Initialize()
     {
-        public static readonly Regex SentenceRegex = new(@"(?<=[\.!\?‽])(?![\.!\?‽])", RegexOptions.Compiled);
-
-        public override void Initialize()
-        {
-            SubscribeLocalEvent<TransformSpeechEvent>(AccentHandler);
-        }
-
-        private void AccentHandler(TransformSpeechEvent args)
-        {
-            var accentEvent = new AccentGetEvent(args.Sender, args.Message);
-
-            RaiseLocalEvent(args.Sender, accentEvent, true);
-            args.Message = accentEvent.Message;
-        }
+        SubscribeLocalEvent<TransformSpeechEvent>(AccentHandler);
     }
 
-    public sealed class AccentGetEvent : EntityEventArgs
+    private void AccentHandler(TransformSpeechEvent args)
     {
-        /// <summary>
-        ///     The entity to apply the accent to.
-        /// </summary>
-        public EntityUid Entity { get; }
+        var accentEvent = new AccentGetEvent(args.Sender, args.Message);
 
-        /// <summary>
-        ///     The message to apply the accent transformation to.
-        ///     Modify this to apply the accent.
-        /// </summary>
-        public string Message { get; set; }
-
-        public AccentGetEvent(EntityUid entity, string message)
-        {
-            Entity = entity;
-            Message = message;
-        }
+        RaiseLocalEvent(args.Sender, accentEvent, true);
+        args.Message = accentEvent.Message;
     }
 }
diff --git a/Content.Server/Speech/Components/EmoteBlockerComponent.cs b/Content.Server/Speech/Components/EmoteBlockerComponent.cs
new file mode 100644
index 0000000000..603fd1b258
--- /dev/null
+++ b/Content.Server/Speech/Components/EmoteBlockerComponent.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Chat.Prototypes;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Speech.Components;
+
+/// <summary>
+/// Suppresses emotes with the given categories or ID.
+/// Additionally, if the Scream Emote would be blocked, also blocks the Scream Action.
+/// </summary>
+[RegisterComponent]
+public sealed partial class EmoteBlockerComponent : Component
+{
+    /// <summary>
+    /// Which categories of emotes are blocked by this component.
+    /// </summary>
+    [DataField]
+    public HashSet<EmoteCategory> BlocksCategories = [];
+
+    /// <summary>
+    /// IDs of which specific emotes are blocked by this component.
+    /// </summary>
+    [DataField]
+    public HashSet<ProtoId<EmotePrototype>> BlocksEmotes = [];
+}
diff --git a/Content.Server/Speech/EntitySystems/BackwardsAccentSystem.cs b/Content.Server/Speech/EntitySystems/BackwardsAccentSystem.cs
index db69c86995..cad96e7d04 100644
--- a/Content.Server/Speech/EntitySystems/BackwardsAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/BackwardsAccentSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems
 {
diff --git a/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs b/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs
index a6e5b68ffc..927b1259ad 100644
--- a/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems
diff --git a/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs b/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs
index 903377477e..8dc358a4b4 100644
--- a/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs b/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
index 47f36cafc4..d4a37a07cd 100644
--- a/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
@@ -4,6 +4,7 @@ using Content.Server.PowerCell;
 using Content.Shared.Speech.Components;
 using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems;
diff --git a/Content.Server/Speech/EntitySystems/EmoteBlockerSystem.cs b/Content.Server/Speech/EntitySystems/EmoteBlockerSystem.cs
new file mode 100644
index 0000000000..3599268359
--- /dev/null
+++ b/Content.Server/Speech/EntitySystems/EmoteBlockerSystem.cs
@@ -0,0 +1,41 @@
+using Content.Server.Speech.Components;
+using Content.Shared.Emoting;
+using Content.Shared.Inventory;
+
+namespace Content.Server.Speech.EntitySystems;
+
+public sealed class EmoteBlockerSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EmoteBlockerComponent, BeforeEmoteEvent>(OnEmoteEvent);
+        SubscribeLocalEvent<EmoteBlockerComponent, InventoryRelayedEvent<BeforeEmoteEvent>>(OnRelayedEmoteEvent);
+    }
+
+    private static void OnRelayedEmoteEvent(Entity<EmoteBlockerComponent> entity, ref InventoryRelayedEvent<BeforeEmoteEvent> args)
+    {
+        OnEmoteEvent(entity, ref args.Args);
+    }
+
+    private static void OnEmoteEvent(Entity<EmoteBlockerComponent> entity, ref BeforeEmoteEvent args)
+    {
+        if (entity.Comp.BlocksEmotes.Contains(args.Emote))
+        {
+            args.Cancel();
+            args.Blocker = entity;
+            return;
+        }
+
+        foreach (var blockedCat in entity.Comp.BlocksCategories)
+        {
+            if (blockedCat == args.Emote.Category)
+            {
+                args.Cancel();
+                args.Blocker = entity;
+                return;
+            }
+        }
+    }
+}
diff --git a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
index 1b7c46e13a..caefe3ef2d 100644
--- a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
@@ -1,5 +1,6 @@
-using Content.Server.Speech.Components;
 using System.Text.RegularExpressions;
+using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
@@ -32,7 +33,7 @@ public sealed class FrenchAccentSystem : EntitySystem
 
         // spaces out ! ? : and ;.
         msg = RegexSpacePunctuation.Replace(msg, " $&");
-        
+
         // replaces th with 'z or 's depending on the case
         foreach (Match match in RegexTh.Matches(msg))
         {
diff --git a/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs b/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs
index 1508a8b2d4..b3f5ff53dc 100644
--- a/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs
+++ b/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs
@@ -1,5 +1,6 @@
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/GermanAccentSystem.cs b/Content.Server/Speech/EntitySystems/GermanAccentSystem.cs
index 1973d38afb..94a5606178 100644
--- a/Content.Server/Speech/EntitySystems/GermanAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/GermanAccentSystem.cs
@@ -1,7 +1,8 @@
 using System.Text;
-using Content.Server.Speech.Components;
-using Robust.Shared.Random;
 using System.Text.RegularExpressions;
+using Content.Server.Speech.Components;
+using Content.Shared.Speech;
+using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs
index 81a57cb848..48a4a4630c 100644
--- a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs b/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
index 5906bf3ed4..6048db5eb2 100644
--- a/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems;
diff --git a/Content.Server/Speech/EntitySystems/MonkeyAccentSystem.cs b/Content.Server/Speech/EntitySystems/MonkeyAccentSystem.cs
index f2813d8245..0f42d93324 100644
--- a/Content.Server/Speech/EntitySystems/MonkeyAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/MonkeyAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems;
diff --git a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs
index 84b79d4ce9..3bf46459ac 100644
--- a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs b/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs
index 57469a25aa..27679c9134 100644
--- a/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Speech.Components;
 using Content.Shared.Chat.Prototypes;
+using Content.Shared.Speech;
 using Content.Shared.Speech.Components;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs b/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs
index 2b3d5aa3d4..ff930e524a 100644
--- a/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems
diff --git a/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs b/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs
index ae8fe522b9..9bd3be25ae 100644
--- a/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems;
diff --git a/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs b/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs
index 84298cbf01..ff2c5913e0 100644
--- a/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 using System.Text.RegularExpressions;
 
diff --git a/Content.Server/Speech/EntitySystems/RatvarianLanguageSystem.cs b/Content.Server/Speech/EntitySystems/RatvarianLanguageSystem.cs
index baa4f6f347..39b040b75f 100644
--- a/Content.Server/Speech/EntitySystems/RatvarianLanguageSystem.cs
+++ b/Content.Server/Speech/EntitySystems/RatvarianLanguageSystem.cs
@@ -1,8 +1,10 @@
 using System.Text;
 using System.Text.RegularExpressions;
+using Content.Shared.Speech;
 using Content.Shared.Speech.Components;
 using Content.Shared.Speech.EntitySystems;
 using Content.Shared.StatusEffect;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Speech.EntitySystems;
 
@@ -10,9 +12,7 @@ public sealed class RatvarianLanguageSystem : SharedRatvarianLanguageSystem
 {
     [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
 
-
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    private const string RatvarianKey = "RatvarianLanguage";
+    private static readonly ProtoId<StatusEffectPrototype> RatvarianKey = "RatvarianLanguage";
 
     // This is the word of Ratvar and those who speak it shall abide by His rules:
     /*
diff --git a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
index 656a72b3f9..5b215e9bea 100644
--- a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
@@ -2,6 +2,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
 using Content.Server.Speech.Prototypes;
+using Content.Shared.Speech;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
diff --git a/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs b/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs
index 49aab38e2b..5c49ecbde7 100644
--- a/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs b/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs
index 8a61c0ea50..d685edc38b 100644
--- a/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems
diff --git a/Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs b/Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs
index 1b773f1a5a..73d8c0665e 100644
--- a/Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems;
diff --git a/Content.Server/Speech/EntitySystems/SlowAccentSystem.cs b/Content.Server/Speech/EntitySystems/SlowAccentSystem.cs
index 5a94b0a4d6..0a4ac02f3f 100644
--- a/Content.Server/Speech/EntitySystems/SlowAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/SlowAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/SlurredSystem.cs b/Content.Server/Speech/EntitySystems/SlurredSystem.cs
index e396cd0b18..5ac1ba037f 100644
--- a/Content.Server/Speech/EntitySystems/SlurredSystem.cs
+++ b/Content.Server/Speech/EntitySystems/SlurredSystem.cs
@@ -1,8 +1,10 @@
 using System.Text;
 using Content.Server.Speech.Components;
 using Content.Shared.Drunk;
+using Content.Shared.Speech;
 using Content.Shared.Speech.EntitySystems;
 using Content.Shared.StatusEffect;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
@@ -14,10 +16,7 @@ public sealed class SlurredSystem : SharedSlurredSystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
-
-
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    private const string SlurKey = "SlurredSpeech";
+    private static readonly ProtoId<StatusEffectPrototype> SlurKey = "SlurredSpeech";
 
     public override void Initialize()
     {
diff --git a/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs b/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
index c1f8a0be30..6bf64ccabd 100644
--- a/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs b/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs
index 08642014c9..cf0c7dfcd2 100644
--- a/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems
 {
diff --git a/Content.Server/Speech/EntitySystems/StutteringSystem.cs b/Content.Server/Speech/EntitySystems/StutteringSystem.cs
index 7658c42379..5531ae4307 100644
--- a/Content.Server/Speech/EntitySystems/StutteringSystem.cs
+++ b/Content.Server/Speech/EntitySystems/StutteringSystem.cs
@@ -1,6 +1,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Content.Shared.Speech.EntitySystems;
 using Content.Shared.StatusEffect;
 using Robust.Shared.Random;
diff --git a/Content.Server/Spider/SpiderSystem.cs b/Content.Server/Spider/SpiderSystem.cs
index 6e2e2b59a2..33142b19b1 100644
--- a/Content.Server/Spider/SpiderSystem.cs
+++ b/Content.Server/Spider/SpiderSystem.cs
@@ -2,16 +2,20 @@ using System.Linq;
 using Content.Server.Popups;
 using Content.Shared.Spider;
 using Content.Shared.Maps;
+using Content.Shared.Mobs.Systems;
 using Robust.Server.GameObjects;
 using Robust.Shared.Map;
+using Robust.Shared.Player;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Spider;
 
 public sealed class SpiderSystem : SharedSpiderSystem
 {
     [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
 
     /// <summary>
     ///     A recycled hashset used to check turfs for spiderwebs.
@@ -24,6 +28,30 @@ public sealed class SpiderSystem : SharedSpiderSystem
         SubscribeLocalEvent<SpiderComponent, SpiderWebActionEvent>(OnSpawnNet);
     }
 
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<SpiderComponent>();
+        while (query.MoveNext(out var uid, out var spider))
+        {
+            spider.NextWebSpawn ??= _timing.CurTime + spider.WebSpawnCooldown;
+
+            if (_timing.CurTime < spider.NextWebSpawn)
+                continue;
+
+            spider.NextWebSpawn += spider.WebSpawnCooldown;
+
+            if (HasComp<ActorComponent>(uid)
+                || _mobState.IsDead(uid)
+                || !spider.SpawnsWebsAsNonPlayer)
+                continue;
+
+            var transform = Transform(uid);
+            SpawnWeb((uid, spider), transform.Coordinates);
+        }
+    }
+
     private void OnSpawnNet(EntityUid uid, SpiderComponent component, SpiderWebActionEvent args)
     {
         if (args.Handled)
@@ -37,30 +65,7 @@ public sealed class SpiderSystem : SharedSpiderSystem
             return;
         }
 
-        var coords = transform.Coordinates;
-
-        // TODO generic way to get certain coordinates
-
-        var result = false;
-        // Spawn web in center
-        if (!IsTileBlockedByWeb(coords))
-        {
-            Spawn(component.WebPrototype, coords);
-            result = true;
-        }
-
-        // Spawn web in other directions
-        for (var i = 0; i < 4; i++)
-        {
-            var direction = (DirectionFlag) (1 << i);
-            coords = transform.Coordinates.Offset(direction.AsDir().ToVec());
-
-            if (!IsTileBlockedByWeb(coords))
-            {
-                Spawn(component.WebPrototype, coords);
-                result = true;
-            }
-        }
+        var result = SpawnWeb((uid, component), transform.Coordinates);
 
         if (result)
         {
@@ -71,6 +76,33 @@ public sealed class SpiderSystem : SharedSpiderSystem
             _popup.PopupEntity(Loc.GetString("spider-web-action-fail"), args.Performer, args.Performer);
     }
 
+    private bool SpawnWeb(Entity<SpiderComponent> ent, EntityCoordinates coords)
+    {
+        var result = false;
+
+        // Spawn web in center
+        if (!IsTileBlockedByWeb(coords))
+        {
+            Spawn(ent.Comp.WebPrototype, coords);
+            result = true;
+        }
+
+        // Spawn web in other directions
+        for (var i = 0; i < 4; i++)
+        {
+            var direction = (DirectionFlag)(1 << i);
+            var outerSpawnCoordinates = coords.Offset(direction.AsDir().ToVec());
+
+            if (IsTileBlockedByWeb(outerSpawnCoordinates))
+                continue;
+
+            Spawn(ent.Comp.WebPrototype, outerSpawnCoordinates);
+            result = true;
+        }
+
+        return result;
+    }
+
     private bool IsTileBlockedByWeb(EntityCoordinates coords)
     {
         _webs.Clear();
@@ -83,4 +115,3 @@ public sealed class SpiderSystem : SharedSpiderSystem
         return false;
     }
 }
-
diff --git a/Content.Server/SprayPainter/SprayPainterSystem.cs b/Content.Server/SprayPainter/SprayPainterSystem.cs
index 9f6da20fda..24ab5e0ea2 100644
--- a/Content.Server/SprayPainter/SprayPainterSystem.cs
+++ b/Content.Server/SprayPainter/SprayPainterSystem.cs
@@ -1,27 +1,134 @@
 using Content.Server.Atmos.Piping.Components;
 using Content.Server.Atmos.Piping.EntitySystems;
+using Content.Server.Charges;
+using Content.Server.Decals;
+using Content.Server.Destructible;
+using Content.Server.Popups;
+using Content.Shared.Atmos.Piping.Unary.Components;
+using Content.Shared.Charges.Components;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.Database;
+using Content.Shared.Decals;
 using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
 using Content.Shared.SprayPainter;
 using Content.Shared.SprayPainter.Components;
+using Robust.Server.Audio;
+using Robust.Server.GameObjects;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.SprayPainter;
 
 /// <summary>
-/// Handles spraying pipes using a spray painter.
-/// Airlocks are handled in shared.
+/// Handles spraying pipes and decals using a spray painter.
+/// Other paintable objects are handled in shared.
 /// </summary>
 public sealed class SprayPainterSystem : SharedSprayPainterSystem
 {
     [Dependency] private readonly AtmosPipeColorSystem _pipeColor = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly DecalSystem _decals = default!;
+    [Dependency] private readonly AudioSystem _audio = default!;
+    [Dependency] private readonly ChargesSystem _charges = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<SprayPainterComponent, SprayPainterPipeDoAfterEvent>(OnPipeDoAfter);
-
+        SubscribeLocalEvent<SprayPainterComponent, AfterInteractEvent>(OnFloorAfterInteract);
         SubscribeLocalEvent<AtmosPipeColorComponent, InteractUsingEvent>(OnPipeInteract);
+        SubscribeLocalEvent<GasCanisterComponent, EntityPaintedEvent>(OnCanisterPainted);
+    }
+
+    /// <summary>
+    /// Handles drawing decals when a spray painter is used to interact with the floor.
+    /// Spray painter must have decal painting enabled and enough charges of paint to paint on the floor.
+    /// </summary>
+    private void OnFloorAfterInteract(Entity<SprayPainterComponent> ent, ref AfterInteractEvent args)
+    {
+        if (args.Handled || !args.CanReach || args.Target != null)
+            return;
+
+        // Includes both off and all other don't cares
+        if (ent.Comp.DecalMode != DecalPaintMode.Add && ent.Comp.DecalMode != DecalPaintMode.Remove)
+            return;
+
+        args.Handled = true;
+        if (TryComp(ent, out LimitedChargesComponent? charges) && charges.LastCharges < ent.Comp.DecalChargeCost)
+        {
+            _popup.PopupEntity(Loc.GetString("spray-painter-interact-no-charges"), args.User, args.User);
+            return;
+        }
+
+        var position = args.ClickLocation;
+        if (ent.Comp.SnapDecals)
+            position = position.SnapToGrid(EntityManager);
+
+        if (ent.Comp.DecalMode == DecalPaintMode.Add)
+        {
+            // Offset painting for adding decals
+            position = position.Offset(new(-0.5f));
+
+            if (!_decals.TryAddDecal(ent.Comp.SelectedDecal, position, out _, ent.Comp.SelectedDecalColor, Angle.FromDegrees(ent.Comp.SelectedDecalAngle), 0, false))
+                return;
+        }
+        else
+        {
+            var gridUid = _transform.GetGrid(args.ClickLocation);
+            if (gridUid is not { } grid || !TryComp<DecalGridComponent>(grid, out var decalGridComp))
+            {
+                _popup.PopupEntity(Loc.GetString("spray-painter-interact-nothing-to-remove"), args.User, args.User);
+                return;
+            }
+
+            var decals = _decals.GetDecalsInRange(grid, position.Position, validDelegate: IsDecalRemovable);
+            if (decals.Count <= 0)
+            {
+                _popup.PopupEntity(Loc.GetString("spray-painter-interact-nothing-to-remove"), args.User, args.User);
+                return;
+            }
+
+            foreach (var decal in decals)
+            {
+                _decals.RemoveDecal(grid, decal.Index, decalGridComp);
+            }
+        }
+
+        _audio.PlayPvs(ent.Comp.SpraySound, ent);
+
+        _charges.TryUseCharges((ent, charges), ent.Comp.DecalChargeCost);
+
+        AdminLogger.Add(LogType.CrayonDraw, LogImpact.Low, $"{EntityManager.ToPrettyString(args.User):user} painted a {ent.Comp.SelectedDecal}");
+    }
+
+    /// <summary>
+    /// Handles drawing decals when a spray painter is used to interact with the floor.
+    /// Spray painter must have decal painting enabled and enough charges of paint to paint on the floor.
+    /// </summary>
+    private bool IsDecalRemovable(Decal decal)
+    {
+        if (!Proto.TryIndex<DecalPrototype>(decal.Id, out var decalProto))
+            return false;
+
+        return (decalProto.Tags.Contains("station")
+            || decalProto.Tags.Contains("markings"))
+            && !decalProto.Tags.Contains("dirty");
+    }
+
+    /// <summary>
+    /// Event handler when gas canisters are painted.
+    /// The canister's color should not change when it's destroyed.
+    /// </summary>
+    private void OnCanisterPainted(Entity<GasCanisterComponent> ent, ref EntityPaintedEvent args)
+    {
+        var dummy = Spawn(args.Prototype);
+
+        var destructibleComp = EnsureComp<DestructibleComponent>(dummy);
+        CopyComp(dummy, ent, destructibleComp);
+
+        Del(dummy);
     }
 
     private void OnPipeDoAfter(Entity<SprayPainterComponent> ent, ref SprayPainterPipeDoAfterEvent args)
@@ -29,14 +136,17 @@ public sealed class SprayPainterSystem : SharedSprayPainterSystem
         if (args.Handled || args.Cancelled)
             return;
 
-        if (args.Args.Target is not {} target)
+        if (args.Args.Target is not { } target)
             return;
 
         if (!TryComp<AtmosPipeColorComponent>(target, out var color))
             return;
 
-        Audio.PlayPvs(ent.Comp.SpraySound, ent);
+        if (TryComp<LimitedChargesComponent>(ent, out var charges) &&
+            !_charges.TryUseCharges((ent, charges), ent.Comp.PipeChargeCost))
+            return;
 
+        Audio.PlayPvs(ent.Comp.SpraySound, ent);
         _pipeColor.SetColor(target, color, args.Color);
 
         args.Handled = true;
@@ -47,13 +157,28 @@ public sealed class SprayPainterSystem : SharedSprayPainterSystem
         if (args.Handled)
             return;
 
-        if (!TryComp<SprayPainterComponent>(args.Used, out var painter) || painter.PickedColor is not {} colorName)
+        if (!TryComp<SprayPainterComponent>(args.Used, out var painter) ||
+            painter.PickedColor is not { } colorName)
             return;
 
         if (!painter.ColorPalette.TryGetValue(colorName, out var color))
             return;
 
-        var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, painter.PipeSprayTime, new SprayPainterPipeDoAfterEvent(color), args.Used, target: ent, used: args.Used)
+        if (TryComp<LimitedChargesComponent>(args.Used, out var charges)
+            && charges.LastCharges < painter.PipeChargeCost)
+        {
+            var msg = Loc.GetString("spray-painter-interact-no-charges");
+            _popup.PopupEntity(msg, args.User, args.User);
+            return;
+        }
+
+        var doAfterEventArgs = new DoAfterArgs(EntityManager,
+            args.User,
+            painter.PipeSprayTime,
+            new SprayPainterPipeDoAfterEvent(color),
+            args.Used,
+            target: ent,
+            used: args.Used)
         {
             BreakOnMove = true,
             BreakOnDamage = true,
diff --git a/Content.Server/Spreader/KudzuSystem.cs b/Content.Server/Spreader/KudzuSystem.cs
index 92e6609fd7..fbc809c15b 100644
--- a/Content.Server/Spreader/KudzuSystem.cs
+++ b/Content.Server/Spreader/KudzuSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Damage;
 using Content.Shared.Spreader;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -14,8 +15,7 @@ public sealed class KudzuSystem : EntitySystem
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
 
-    [ValidatePrototypeId<EdgeSpreaderPrototype>]
-    private const string KudzuGroup = "Kudzu";
+    private static readonly ProtoId<EdgeSpreaderPrototype> KudzuGroup = "Kudzu";
 
     /// <inheritdoc/>
     public override void Initialize()
diff --git a/Content.Server/StationEvents/Components/SolarFlareRuleComponent.cs b/Content.Server/StationEvents/Components/SolarFlareRuleComponent.cs
index 577d7777d7..a47c1925e2 100644
--- a/Content.Server/StationEvents/Components/SolarFlareRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/SolarFlareRuleComponent.cs
@@ -1,6 +1,6 @@
 using Content.Server.StationEvents.Events;
 using Content.Shared.Radio;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 
 namespace Content.Server.StationEvents.Components;
@@ -29,8 +29,8 @@ public sealed partial class SolarFlareRuleComponent : Component
     /// <remarks>
     ///     Channels are not removed from this, so its possible to roll the same channel multiple times.
     /// </remarks>
-    [DataField("extraChannels", customTypeSerializer: typeof(PrototypeIdListSerializer<RadioChannelPrototype>))]
-    public List<String> ExtraChannels = new();
+    [DataField]
+    public List<ProtoId<RadioChannelPrototype>> ExtraChannels = new();
 
     /// <summary>
     ///     Number of times to roll a channel from ExtraChannels.
diff --git a/Content.Server/StationEvents/Components/VentClogRuleComponent.cs b/Content.Server/StationEvents/Components/VentClogRuleComponent.cs
index afb3a36326..d51c48b4ae 100644
--- a/Content.Server/StationEvents/Components/VentClogRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/VentClogRuleComponent.cs
@@ -1,7 +1,7 @@
 using Content.Server.StationEvents.Events;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Audio;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.StationEvents.Components;
 
@@ -12,8 +12,8 @@ public sealed partial class VentClogRuleComponent : Component
     /// Somewhat safe chemicals to put in foam that probably won't instantly kill you.
     /// There is a small chance of using any reagent, ignoring this.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(PrototypeIdListSerializer<ReagentPrototype>))]
-    public IReadOnlyList<string> SafeishVentChemicals = new[]
+    [DataField]
+    public IReadOnlyList<ProtoId<ReagentPrototype>> SafeishVentChemicals = new ProtoId<ReagentPrototype>[]
     {
         "Water", "Blood", "Slime", "SpaceDrugs", "SpaceCleaner", "Nutriment", "Sugar", "SpaceLube", "Ephedrine", "Ale", "Beer", "SpaceGlue"
     };
@@ -45,8 +45,8 @@ public sealed partial class VentClogRuleComponent : Component
     /// <summary>
     /// Reagents that gets the weak numbers used instead of regular ones.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(PrototypeIdListSerializer<ReagentPrototype>))]
-    public IReadOnlyList<string> WeakReagents = new[]
+    [DataField]
+    public IReadOnlyList<ProtoId<ReagentPrototype>> WeakReagents = new ProtoId<ReagentPrototype>[]
     {
         "SpaceLube", "SpaceGlue"
     };
diff --git a/Content.Server/StationEvents/Events/RandomSentienceRule.cs b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
index 3d2e457a34..359c3edae4 100644
--- a/Content.Server/StationEvents/Events/RandomSentienceRule.cs
+++ b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
@@ -11,6 +11,9 @@ namespace Content.Server.StationEvents.Events;
 
 public sealed class RandomSentienceRule : StationEventSystem<RandomSentienceRuleComponent>
 {
+    private static readonly ProtoId<LocalizedDatasetPrototype> DataSourceNames = "RandomSentienceEventData";
+    private static readonly ProtoId<LocalizedDatasetPrototype> IntelligenceLevelNames = "RandomSentienceEventStrength";
+
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     protected override void Started(EntityUid uid, RandomSentienceRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
@@ -72,8 +75,8 @@ public sealed class RandomSentienceRule : StationEventSystem<RandomSentienceRule
             station.Value,
             Loc.GetString("station-event-random-sentience-announcement",
                 ("kind1", kind1), ("kind2", kind2), ("kind3", kind3), ("amount", groupList.Count),
-                ("data", _random.Pick(_prototype.Index<LocalizedDatasetPrototype>("RandomSentienceEventData"))),
-                ("strength", _random.Pick(_prototype.Index<LocalizedDatasetPrototype>("RandomSentienceEventStrength")))
+                ("data", _random.Pick(_prototype.Index(DataSourceNames))),
+                ("strength", _random.Pick(_prototype.Index(IntelligenceLevelNames)))
             ),
             playDefaultSound: false,
             colorOverride: Color.Gold
diff --git a/Content.Server/StationEvents/Events/VentClogRule.cs b/Content.Server/StationEvents/Events/VentClogRule.cs
index ad8e4b5a42..d93c67ef92 100644
--- a/Content.Server/StationEvents/Events/VentClogRule.cs
+++ b/Content.Server/StationEvents/Events/VentClogRule.cs
@@ -1,14 +1,15 @@
+using System.Linq;
 using Content.Server.Atmos.Piping.Unary.Components;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.StationEvents.Components;
 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;
-using System.Linq;
-using Content.Shared.Chemistry.Reaction;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -27,7 +28,7 @@ public sealed class VentClogRule : StationEventSystem<VentClogRuleComponent>
         // TODO: "safe random" for chems. Right now this includes admin chemicals.
         var allReagents = PrototypeManager.EnumeratePrototypes<ReagentPrototype>()
             .Where(x => !x.Abstract)
-            .Select(x => x.ID).ToList();
+            .Select(x => new ProtoId<ReagentPrototype>(x.ID)).ToList();
 
         foreach (var (_, transform) in EntityQuery<GasVentPumpComponent, TransformComponent>())
         {
diff --git a/Content.Server/StatusEffectNew/StatusEffectsSystem.cs b/Content.Server/StatusEffectNew/StatusEffectsSystem.cs
deleted file mode 100644
index e5d7433396..0000000000
--- a/Content.Server/StatusEffectNew/StatusEffectsSystem.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Shared.StatusEffectNew;
-using Content.Shared.StatusEffectNew.Components;
-
-namespace Content.Server.StatusEffectNew;
-
-/// <inheritdoc/>
-public sealed partial class StatusEffectsSystem : SharedStatusEffectsSystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<StatusEffectContainerComponent, ComponentShutdown>(OnContainerShutdown);
-    }
-
-    private void OnContainerShutdown(Entity<StatusEffectContainerComponent> ent, ref ComponentShutdown args)
-    {
-        foreach (var effect in ent.Comp.ActiveStatusEffects)
-        {
-            QueueDel(effect);
-        }
-    }
-}
diff --git a/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs b/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
index c993c14694..dc72a08499 100644
--- a/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
+++ b/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
@@ -14,8 +14,7 @@ namespace Content.Server.StoreDiscount.Systems;
 /// </summary>
 public sealed class StoreDiscountSystem : EntitySystem
 {
-    [ValidatePrototypeId<StoreCategoryPrototype>]
-    private const string DiscountedStoreCategoryPrototypeKey = "DiscountedItems";
+    private static readonly ProtoId<StoreCategoryPrototype> DiscountedStoreCategoryPrototypeKey = "DiscountedItems";
 
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
diff --git a/Content.Server/SurveillanceCamera/Components/SurveillanceCameraComponent.cs b/Content.Server/SurveillanceCamera/Components/SurveillanceCameraComponent.cs
index 8473462f80..b0d41e52c7 100644
--- a/Content.Server/SurveillanceCamera/Components/SurveillanceCameraComponent.cs
+++ b/Content.Server/SurveillanceCamera/Components/SurveillanceCameraComponent.cs
@@ -1,5 +1,5 @@
 using Content.Shared.DeviceNetwork;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.SurveillanceCamera;
 
@@ -43,6 +43,6 @@ public sealed partial class SurveillanceCameraComponent : Component
     public bool NetworkSet { get; set; }
 
     // This has to be device network frequency prototypes.
-    [DataField("setupAvailableNetworks", customTypeSerializer:typeof(PrototypeIdListSerializer<DeviceFrequencyPrototype>))]
-    public List<string> AvailableNetworks { get; private set; } = new();
+    [DataField("setupAvailableNetworks")]
+    public List<ProtoId<DeviceFrequencyPrototype>> AvailableNetworks { get; private set; } = new();
 }
diff --git a/Content.Server/SurveillanceCamera/Components/SurveillanceCameraRouterComponent.cs b/Content.Server/SurveillanceCamera/Components/SurveillanceCameraRouterComponent.cs
index d15d5e7d39..0967d0b043 100644
--- a/Content.Server/SurveillanceCamera/Components/SurveillanceCameraRouterComponent.cs
+++ b/Content.Server/SurveillanceCamera/Components/SurveillanceCameraRouterComponent.cs
@@ -1,6 +1,6 @@
 using Content.Shared.DeviceNetwork;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Server.SurveillanceCamera;
 
@@ -26,6 +26,6 @@ public sealed partial class SurveillanceCameraRouterComponent : Component
     [DataField("subnetFrequency", customTypeSerializer:typeof(PrototypeIdSerializer<DeviceFrequencyPrototype>))]
     public string? SubnetFrequencyId { get; set;  }
 
-    [DataField("setupAvailableNetworks", customTypeSerializer:typeof(PrototypeIdListSerializer<DeviceFrequencyPrototype>))]
-    public List<string> AvailableNetworks { get; private set; } = new();
+    [DataField("setupAvailableNetworks")]
+    public List<ProtoId<DeviceFrequencyPrototype>> AvailableNetworks { get; private set; } = new();
 }
diff --git a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs
index ab3026fc97..4c87707cc6 100644
--- a/Content.Server/Telephone/TelephoneSystem.cs
+++ b/Content.Server/Telephone/TelephoneSystem.cs
@@ -490,6 +490,6 @@ public sealed class TelephoneSystem : SharedTelephoneSystem
 
     public bool IsTelephonePowered(Entity<TelephoneComponent> entity)
     {
-        return this.IsPowered(entity, EntityManager) || !entity.Comp.RequiresPower;
+        return this.IsPowered(entity, EntityManager);
     }
 }
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index d2f6baf6f9..6290e8231a 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -36,8 +36,7 @@ public sealed class TemperatureSystem : EntitySystem
 
     private float _accumulatedFrametime;
 
-    [ValidatePrototypeId<AlertCategoryPrototype>]
-    public const string TemperatureAlertCategory = "Temperature";
+    public static readonly ProtoId<AlertCategoryPrototype> TemperatureAlertCategory = "Temperature";
 
     public override void Initialize()
     {
diff --git a/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs b/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
index d251d66898..5204aa01be 100644
--- a/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
+++ b/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
@@ -14,9 +14,9 @@ public sealed class RunVerbAsCommand : ToolshedCommand
     private SharedVerbSystem? _verb;
 
     [CommandImplementation]
-    public IEnumerable<NetEntity> RunVerbAs(
+    public IEnumerable<EntityUid> RunVerbAs(
             IInvocationContext ctx,
-            [PipedArgument] IEnumerable<NetEntity> input,
+            [PipedArgument] IEnumerable<EntityUid> input,
             EntityUid runner,
             string verb
         )
@@ -24,7 +24,7 @@ public sealed class RunVerbAsCommand : ToolshedCommand
         _verb ??= GetSys<SharedVerbSystem>();
         verb = verb.ToLowerInvariant();
 
-        foreach (var i in input)
+        foreach (var eId in input)
         {
             if (EntityManager.Deleted(runner) && runner.IsValid())
                 ctx.ReportError(new DeadEntity(runner));
@@ -32,7 +32,6 @@ public sealed class RunVerbAsCommand : ToolshedCommand
             if (ctx.GetErrors().Any())
                 yield break;
 
-            var eId = EntityManager.GetEntity(i);
             var verbs = _verb.GetLocalVerbs(eId, runner, Verb.VerbTypes, true);
 
             // if the "verb name" is actually a verb-type, try run any verb of that type.
@@ -43,7 +42,7 @@ public sealed class RunVerbAsCommand : ToolshedCommand
                 if (verbTy != null)
                 {
                     _verb.ExecuteVerb(verbTy, runner, eId, forced: true);
-                    yield return i;
+                    yield return eId;
                 }
             }
 
@@ -52,7 +51,7 @@ public sealed class RunVerbAsCommand : ToolshedCommand
                 if (verbTy.Text.ToLowerInvariant() == verb)
                 {
                     _verb.ExecuteVerb(verbTy, runner, eId, forced: true);
-                    yield return i;
+                    yield return eId;
                 }
             }
         }
diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs
index f30d2d7b4c..f4a9ca75fd 100644
--- a/Content.Server/Traitor/Uplink/UplinkSystem.cs
+++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs
@@ -22,10 +22,9 @@ public sealed class UplinkSystem : EntitySystem
     [Dependency] private readonly SharedSubdermalImplantSystem _subdermalImplant = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
 
-    [ValidatePrototypeId<CurrencyPrototype>]
-    public const string TelecrystalCurrencyPrototype = "Telecrystal";
-    private const string FallbackUplinkImplant = "UplinkImplant";
-    private const string FallbackUplinkCatalog = "UplinkUplinkImplanter";
+    public static readonly ProtoId<CurrencyPrototype> TelecrystalCurrencyPrototype = "Telecrystal";
+    private static readonly EntProtoId FallbackUplinkImplant = "UplinkImplant";
+    private static readonly ProtoId<ListingPrototype> FallbackUplinkCatalog = "UplinkUplinkImplanter";
 
     /// <summary>
     /// Adds an uplink to the target
@@ -89,8 +88,6 @@ public sealed class UplinkSystem : EntitySystem
     /// </summary>
     private bool ImplantUplink(EntityUid user, FixedPoint2 balance, bool giveDiscounts)
     {
-        var implantProto = new string(FallbackUplinkImplant);
-
         if (!_proto.TryIndex<ListingPrototype>(FallbackUplinkCatalog, out var catalog))
             return false;
 
@@ -102,7 +99,7 @@ public sealed class UplinkSystem : EntitySystem
         else
             balance = balance - cost;
 
-        var implant = _subdermalImplant.AddImplant(user, implantProto);
+        var implant = _subdermalImplant.AddImplant(user, FallbackUplinkImplant);
 
         if (!HasComp<StoreComponent>(implant))
             return false;
diff --git a/Content.Server/Traits/Assorted/NarcolepsySystem.cs b/Content.Server/Traits/Assorted/NarcolepsySystem.cs
index b0746fa377..159e953369 100644
--- a/Content.Server/Traits/Assorted/NarcolepsySystem.cs
+++ b/Content.Server/Traits/Assorted/NarcolepsySystem.cs
@@ -1,5 +1,5 @@
-using Content.Server.StatusEffectNew;
 using Content.Shared.Bed.Sleep;
+using Content.Shared.StatusEffectNew;
 using Robust.Shared.Random;
 
 namespace Content.Server.Traits.Assorted;
diff --git a/Content.Server/Turrets/DeployableTurretSystem.cs b/Content.Server/Turrets/DeployableTurretSystem.cs
index 9bb382badf..2599285bdc 100644
--- a/Content.Server/Turrets/DeployableTurretSystem.cs
+++ b/Content.Server/Turrets/DeployableTurretSystem.cs
@@ -3,7 +3,6 @@ using Content.Server.DeviceNetwork.Systems;
 using Content.Server.NPC.HTN;
 using Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat.Ranged;
 using Content.Server.Power.Components;
-using Content.Server.Repairable;
 using Content.Server.TurretController;
 using Content.Shared.Access;
 using Content.Shared.Destructible;
@@ -11,6 +10,7 @@ using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Power;
+using Content.Shared.Repairable;
 using Content.Shared.Turrets;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
index fda8f06820..23a744ddd6 100644
--- a/Content.Server/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -4,6 +4,7 @@ using Content.Server.Cargo.Systems;
 using Content.Server.Emp;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
+using Content.Server.Vocalization.Systems;
 using Content.Shared.Cargo;
 using Content.Shared.Damage;
 using Content.Shared.Destructible;
@@ -42,6 +43,7 @@ namespace Content.Server.VendingMachines
             SubscribeLocalEvent<VendingMachineComponent, DamageChangedEvent>(OnDamageChanged);
             SubscribeLocalEvent<VendingMachineComponent, PriceCalculationEvent>(OnVendingPrice);
             SubscribeLocalEvent<VendingMachineComponent, EmpPulseEvent>(OnEmpPulse);
+            SubscribeLocalEvent<VendingMachineComponent, TryVocalizeEvent>(OnTryVocalize);
 
             SubscribeLocalEvent<VendingMachineComponent, ActivatableUIOpenAttemptEvent>(OnActivatableUIOpenAttempt);
 
@@ -309,5 +311,10 @@ namespace Content.Server.VendingMachines
                 component.NextEmpEject = _timing.CurTime;
             }
         }
+
+        private void OnTryVocalize(Entity<VendingMachineComponent> ent, ref TryVocalizeEvent args)
+        {
+            args.Cancelled |= ent.Comp.Broken;
+        }
     }
 }
diff --git a/Content.Server/Vocalization/Components/DatasetVocalizerComponent.cs b/Content.Server/Vocalization/Components/DatasetVocalizerComponent.cs
new file mode 100644
index 0000000000..c64fe017da
--- /dev/null
+++ b/Content.Server/Vocalization/Components/DatasetVocalizerComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Dataset;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Vocalization.Components;
+
+/// <summary>
+/// A simple message provider for <see cref="VocalizationSystem"/> that randomly selects
+/// messages from a <see cref="LocalizedDatasetPrototype"/>.
+/// </summary>
+[RegisterComponent]
+public sealed partial class DatasetVocalizerComponent : Component
+{
+    /// <summary>
+    /// ID of the <see cref="LocalizedDatasetPrototype"/> that will provide messages.
+    /// </summary>
+    [DataField]
+    public ProtoId<LocalizedDatasetPrototype> Dataset;
+}
diff --git a/Content.Server/Vocalization/Components/RadioVocalizerComponent.cs b/Content.Server/Vocalization/Components/RadioVocalizerComponent.cs
new file mode 100644
index 0000000000..1344beaa73
--- /dev/null
+++ b/Content.Server/Vocalization/Components/RadioVocalizerComponent.cs
@@ -0,0 +1,14 @@
+namespace Content.Server.Vocalization.Components;
+
+/// <summary>
+/// Makes an entity able to vocalize through an equipped radio
+/// </summary>
+[RegisterComponent]
+public sealed partial class RadioVocalizerComponent : Component
+{
+    /// <summary>
+    /// chance the vocalizing entity speaks on the radio.
+    /// </summary>
+    [DataField]
+    public float RadioAttemptChance = 0.6f;
+}
diff --git a/Content.Server/Vocalization/Components/VocalizerComponent.cs b/Content.Server/Vocalization/Components/VocalizerComponent.cs
new file mode 100644
index 0000000000..f5bb37a335
--- /dev/null
+++ b/Content.Server/Vocalization/Components/VocalizerComponent.cs
@@ -0,0 +1,37 @@
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Server.Vocalization.Components;
+
+/// <summary>
+/// Makes an entity vocalize at set intervals
+/// </summary>
+[RegisterComponent]
+[AutoGenerateComponentPause]
+public sealed partial class VocalizerComponent : Component
+{
+    /// <summary>
+    /// Minimum time to wait after speaking to vocalize again
+    /// </summary>
+    [DataField]
+    public TimeSpan MinVocalizeInterval = TimeSpan.FromMinutes(2);
+
+    /// <summary>
+    /// Maximum time to wait after speaking to vocalize again
+    /// </summary>
+    [DataField]
+    public TimeSpan MaxVocalizeInterval = TimeSpan.FromMinutes(6);
+
+    /// <summary>
+    /// Next time at which to vocalize
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
+    public TimeSpan NextVocalizeInterval = TimeSpan.Zero;
+
+    /// <summary>
+    /// If true, messages spoken by this vocalizer will not be logged in the chat window
+    /// and will only be shown as speech bubbles.
+    /// </summary>
+    [DataField]
+    public bool HideChat;
+}
diff --git a/Content.Server/Vocalization/Components/VocalizerRequiresPowerComponent.cs b/Content.Server/Vocalization/Components/VocalizerRequiresPowerComponent.cs
new file mode 100644
index 0000000000..69de671787
--- /dev/null
+++ b/Content.Server/Vocalization/Components/VocalizerRequiresPowerComponent.cs
@@ -0,0 +1,9 @@
+namespace Content.Server.Vocalization.Components;
+
+/// <summary>
+/// Used in combination with <see cref="VocalizerComponent"/>.
+/// Blocks any attempts to vocalize if the entity has an <see cref="ApcPowerReceiverComponent"/>
+/// and is currently unpowered.
+/// </summary>
+[RegisterComponent]
+public sealed partial class VocalizerRequiresPowerComponent : Component;
diff --git a/Content.Server/Vocalization/Systems/DatasetVocalizationSystem.cs b/Content.Server/Vocalization/Systems/DatasetVocalizationSystem.cs
new file mode 100644
index 0000000000..fcca5605f4
--- /dev/null
+++ b/Content.Server/Vocalization/Systems/DatasetVocalizationSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Vocalization.Components;
+using Content.Shared.Random.Helpers;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.Vocalization.Systems;
+
+/// <inheritdoc cref="DatasetVocalizerComponent"/>
+public sealed class DatasetVocalizationSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DatasetVocalizerComponent, TryVocalizeEvent>(OnTryVocalize);
+    }
+
+    private void OnTryVocalize(Entity<DatasetVocalizerComponent> ent, ref TryVocalizeEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        var dataset = _protoMan.Index(ent.Comp.Dataset);
+
+        args.Message = _random.Pick(dataset);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Server/Vocalization/Systems/RadioVocalizationSystem.cs b/Content.Server/Vocalization/Systems/RadioVocalizationSystem.cs
new file mode 100644
index 0000000000..bdb14168bb
--- /dev/null
+++ b/Content.Server/Vocalization/Systems/RadioVocalizationSystem.cs
@@ -0,0 +1,98 @@
+using Content.Server.Chat.Systems;
+using Content.Server.Radio.Components;
+using Content.Server.Vocalization.Components;
+using Content.Shared.Chat;
+using Content.Shared.Inventory;
+using Content.Shared.Radio;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.Vocalization.Systems;
+
+/// <summary>
+/// RadioVocalizationSystem handles vocalizing things via equipped radios when a VocalizeEvent is fired
+/// </summary>
+public sealed partial class RadioVocalizationSystem : EntitySystem
+{
+    [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RadioVocalizerComponent, VocalizeEvent>(OnVocalize);
+    }
+
+    /// <summary>
+    /// Called whenever an entity with a VocalizerComponent tries to speak
+    /// </summary>
+    private void OnVocalize(Entity<RadioVocalizerComponent> entity, ref VocalizeEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        // set to handled if we succeed in speaking on the radio
+        args.Handled = TrySpeakRadio(entity.Owner, args.Message);
+    }
+
+    /// <summary>
+    /// Selects a random radio channel from all ActiveRadio entities in a given entity's inventory
+    /// If no channels are found, this returns false and sets channel to an empty string
+    /// </summary>
+    private bool TryPickRandomRadioChannel(EntityUid entity, out string channel)
+    {
+        HashSet<string> potentialChannels = [];
+
+        // we don't have to check if this entity has an inventory. GetHandOrInventoryEntities will not yield anything
+        // if an entity has no inventory or inventory slots
+        foreach (var item in _inventory.GetHandOrInventoryEntities(entity))
+        {
+            if (!TryComp<ActiveRadioComponent>(item, out var radio))
+                continue;
+
+            potentialChannels.UnionWith(radio.Channels);
+        }
+
+        if (potentialChannels.Count == 0)
+        {
+            channel = string.Empty;
+            return false;
+        }
+
+        channel = _random.Pick(potentialChannels);
+
+        return true;
+    }
+
+    /// <summary>
+    /// Attempts to speak on the radio. Returns false if there is no radio or talking on radio fails somehow
+    /// </summary>
+    /// <param name="entity">Entity to try and make speak on the radio</param>
+    /// <param name="message">Message to speak</param>
+    private bool TrySpeakRadio(Entity<RadioVocalizerComponent?> entity, string message)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return false;
+
+        if (!_random.Prob(entity.Comp.RadioAttemptChance))
+            return false;
+
+        if (!TryPickRandomRadioChannel(entity, out var channel))
+            return false;
+
+        var channelPrefix = _proto.Index<RadioChannelPrototype>(channel).KeyCode;
+
+        // send a whisper using the radio channel prefix and whatever relevant radio channel character
+        // along with the message. This is analogous to how radio messages are sent by players
+        _chat.TrySendInGameICMessage(
+            entity,
+            $"{SharedChatSystem.RadioChannelPrefix}{channelPrefix} {message}",
+            InGameICChatType.Whisper,
+            ChatTransmitRange.Normal);
+
+        return true;
+    }
+}
diff --git a/Content.Server/Vocalization/Systems/VocalizationSystem.cs b/Content.Server/Vocalization/Systems/VocalizationSystem.cs
new file mode 100644
index 0000000000..49dfaf4281
--- /dev/null
+++ b/Content.Server/Vocalization/Systems/VocalizationSystem.cs
@@ -0,0 +1,137 @@
+using Content.Server.Chat.Systems;
+using Content.Server.Power.Components;
+using Content.Server.Vocalization.Components;
+using Content.Shared.ActionBlocker;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Vocalization.Systems;
+
+/// <summary>
+/// VocalizationSystem raises VocalizeEvents to make entities speak at certain intervals
+/// This is used in combination with systems like ParrotMemorySystem to randomly say messages from memory,
+/// or can be used by other systems to speak pre-set messages
+/// </summary>
+public sealed partial class VocalizationSystem : EntitySystem
+{
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<VocalizerComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<VocalizerRequiresPowerComponent, TryVocalizeEvent>(OnRequiresPowerTryVocalize);
+    }
+
+    private void OnMapInit(Entity<VocalizerComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextVocalizeInterval = _random.Next(ent.Comp.MinVocalizeInterval, ent.Comp.MaxVocalizeInterval);
+    }
+
+    private void OnRequiresPowerTryVocalize(Entity<VocalizerRequiresPowerComponent> ent, ref TryVocalizeEvent args)
+    {
+        if (!TryComp<ApcPowerReceiverComponent>(ent, out var receiver))
+            return;
+
+        args.Cancelled |= !receiver.Powered;
+    }
+
+    /// <summary>
+    /// Try speaking by raising a TryVocalizeEvent
+    /// This event is passed to systems adding a message to it and setting it to handled
+    /// </summary>
+    private void TrySpeak(Entity<VocalizerComponent> entity)
+    {
+        var tryVocalizeEvent = new TryVocalizeEvent();
+        RaiseLocalEvent(entity.Owner, ref tryVocalizeEvent);
+
+        // If the event was cancelled, don't speak
+        if (tryVocalizeEvent.Cancelled)
+            return;
+
+        // if the event was never handled, return
+        // this happens if there are no components that trigger systems to add a message to this event
+        if (!tryVocalizeEvent.Handled)
+            return;
+
+        // if the event's message is null for whatever reason, return.
+        // this would mean a system didn't set the message properly but did set the event to handled
+        if (tryVocalizeEvent.Message is not { } message)
+            return;
+
+        Speak(entity, message);
+    }
+
+    /// <summary>
+    /// Actually say something.
+    /// </summary>
+    private void Speak(Entity<VocalizerComponent> entity, string message)
+    {
+        // raise a VocalizeEvent
+        // this can be handled by other systems to speak using a method other than local chat
+        var vocalizeEvent = new VocalizeEvent(message);
+        RaiseLocalEvent(entity.Owner, ref vocalizeEvent);
+
+        // if the event is handled, don't try speaking
+        if (vocalizeEvent.Handled)
+            return;
+
+        // default to local chat if no other system handles the event
+        // first check if the entity can speak
+        if (!_actionBlocker.CanSpeak(entity))
+            return;
+
+        // send the message
+        _chat.TrySendInGameICMessage(entity, message, InGameICChatType.Speak, entity.Comp.HideChat ? ChatTransmitRange.HideChat : ChatTransmitRange.Normal);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        // get current game time for delay
+        var currentGameTime = _gameTiming.CurTime;
+
+        // query to get all entities with a VocalizeComponent
+        var query = EntityQueryEnumerator<VocalizerComponent>();
+        while (query.MoveNext(out var uid, out var vocalizer))
+        {
+            // go to next entity if it is too early for this one to speak
+            if (currentGameTime < vocalizer.NextVocalizeInterval)
+                continue;
+
+            // set a new time for the speak interval, regardless of whether speaking works
+            var randomSpeakInterval = _random.Next(vocalizer.MinVocalizeInterval, vocalizer.MaxVocalizeInterval);
+            vocalizer.NextVocalizeInterval += randomSpeakInterval;
+
+            // if an admin updates the speak interval to be immediate, this loop will spam messages until the
+            // nextspeakinterval catches up with the current game time. Prevent this from happening
+            if (vocalizer.NextVocalizeInterval < _gameTiming.CurTime)
+                vocalizer.NextVocalizeInterval = _gameTiming.CurTime + randomSpeakInterval;
+
+            // try to speak
+            TrySpeak((uid, vocalizer));
+        }
+    }
+}
+
+/// <summary>
+/// Fired when the entity wants to try vocalizing, but doesn't have a message yet
+/// </summary>
+/// <param name="Message">Message to send, this is null when the event is just fired and should be set by a system</param>
+/// <param name="Handled">Whether the message was handled by a system</param>
+[ByRefEvent]
+public record struct TryVocalizeEvent(string? Message = null, bool Handled = false, bool Cancelled = false);
+
+/// <summary>
+/// Fired when the entity wants to vocalize and has a message. Allows for interception by other systems if the
+/// vocalization needs to be done some other way
+/// </summary>
+/// <param name="Message">Message to send</param>
+/// <param name="Handled">Whether the message was handled by a system</param>
+[ByRefEvent]
+public record struct VocalizeEvent(string Message, bool Handled = false);
diff --git a/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs b/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs
index 1755c6df08..81bbd48a0d 100644
--- a/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs
+++ b/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs
@@ -40,7 +40,7 @@ public sealed class StorageVoiceControlSystem : EntitySystem
             return;
 
         // If the player has something in their hands, try to insert it into the storage
-        if (_hands.TryGetActiveItem(ent.Owner, out var activeItem))
+        if (_hands.TryGetActiveItem(args.Source, out var activeItem))
         {
             // Disallow insertion and provide a reason why if the person decides to insert the item into itself
             if (ent.Owner.Equals(activeItem.Value))
diff --git a/Content.Server/Worldgen/Components/BiomeSelectionComponent.cs b/Content.Server/Worldgen/Components/BiomeSelectionComponent.cs
index f6b4c82ebb..08571cd588 100644
--- a/Content.Server/Worldgen/Components/BiomeSelectionComponent.cs
+++ b/Content.Server/Worldgen/Components/BiomeSelectionComponent.cs
@@ -1,6 +1,6 @@
-using Content.Server.Worldgen.Systems.Biomes;
-using Content.Server.Worldgen.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Content.Server.Worldgen.Prototypes;
+using Content.Server.Worldgen.Systems.Biomes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Worldgen.Components;
 
@@ -15,7 +15,7 @@ public sealed partial class BiomeSelectionComponent : Component
     ///     The list of biomes available to this selector.
     /// </summary>
     /// <remarks>This is always sorted by priority after ComponentStartup.</remarks>
-    [DataField("biomes", required: true,
-        customTypeSerializer: typeof(PrototypeIdListSerializer<BiomePrototype>))] public List<string> Biomes = new();
+    [DataField(required: true)]
+    public List<ProtoId<BiomePrototype>> Biomes = new();
 }
 
diff --git a/Content.Server/Worldgen/Components/Debris/BlobFloorPlanBuilderComponent.cs b/Content.Server/Worldgen/Components/Debris/BlobFloorPlanBuilderComponent.cs
index 6d1fa5d957..a1317ae2ed 100644
--- a/Content.Server/Worldgen/Components/Debris/BlobFloorPlanBuilderComponent.cs
+++ b/Content.Server/Worldgen/Components/Debris/BlobFloorPlanBuilderComponent.cs
@@ -1,6 +1,6 @@
 using Content.Server.Worldgen.Systems.Debris;
 using Content.Shared.Maps;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Worldgen.Components.Debris;
 
@@ -24,9 +24,8 @@ public sealed partial class BlobFloorPlanBuilderComponent : Component
     /// <summary>
     ///     The tiles to be used for the floor plan.
     /// </summary>
-    [DataField("floorTileset", required: true,
-        customTypeSerializer: typeof(PrototypeIdListSerializer<ContentTileDefinition>))]
-    public List<string> FloorTileset { get; private set;  } = default!;
+    [DataField(required: true)]
+    public List<ProtoId<ContentTileDefinition>> FloorTileset { get; private set;  } = default!;
 
     /// <summary>
     ///     The number of floor tiles to place when drawing the asteroid layout.
diff --git a/Content.Server/Worldgen/Systems/Debris/SimpleFloorPlanPopulatorSystem.cs b/Content.Server/Worldgen/Systems/Debris/SimpleFloorPlanPopulatorSystem.cs
index e936d550bb..dcb7b7fc8f 100644
--- a/Content.Server/Worldgen/Systems/Debris/SimpleFloorPlanPopulatorSystem.cs
+++ b/Content.Server/Worldgen/Systems/Debris/SimpleFloorPlanPopulatorSystem.cs
@@ -12,7 +12,6 @@ namespace Content.Server.Worldgen.Systems.Debris;
 public sealed class SimpleFloorPlanPopulatorSystem : BaseWorldSystem
 {
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly ITileDefinitionManager _tileDefinition = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
 
diff --git a/Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs b/Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs
new file mode 100644
index 0000000000..ea86186782
--- /dev/null
+++ b/Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs
@@ -0,0 +1,68 @@
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Content.Shared.Xenoarchaeology.Artifact.Components;
+using Robust.Shared.Console;
+
+namespace Content.Server.Xenoarchaeology.Artifact;
+
+/// <summary> Command for unlocking a specific node of a xeno artifact. </summary>
+[AdminCommand(AdminFlags.Debug)]
+public sealed class UnlockNodeCommand : LocalizedEntityCommands
+{
+    [Dependency] private readonly XenoArtifactSystem _artiSystem = default!;
+
+    public override string Command => "unlocknode";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length != 2)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+            return;
+        }
+
+        if (!NetEntity.TryParse(args[1], out var netNode) || !EntityManager.TryGetEntity(netNode, out var entityUid))
+        {
+            shell.WriteError(Loc.GetString("shell-could-not-find-entity-with-uid", ("uid", args[1])));
+            return;
+        }
+
+        _artiSystem.SetNodeUnlocked(entityUid.Value);
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        switch (args.Length)
+        {
+            case 1:
+            {
+                var query = EntityManager.EntityQueryEnumerator<XenoArtifactComponent>();
+                var completionOptions = new List<CompletionOption>();
+                while (query.MoveNext(out var uid, out _))
+                {
+                    completionOptions.Add(new CompletionOption(uid.ToString()));
+                }
+
+                return CompletionResult.FromHintOptions(completionOptions, Loc.GetString("cmd-unlocknode-artifact-hint"));
+            }
+            case 2 when
+                NetEntity.TryParse(args[0], out var netEnt) &&
+                EntityManager.TryGetEntity(netEnt, out var artifactUid) &&
+                EntityManager.TryGetComponent<XenoArtifactComponent>(artifactUid, out var comp):
+            {
+                var result = new List<CompletionOption>();
+                foreach (var node in _artiSystem.GetAllNodes((artifactUid.Value, comp)))
+                {
+                    var metaData = EntityManager.MetaQuery.Comp(artifactUid.Value);
+                    var entityUidStr = EntityManager.GetNetEntity(node).ToString();
+                    var completionOption = new CompletionOption(entityUidStr, metaData.EntityName);
+                    result.Add(completionOption);
+                }
+
+                return CompletionResult.FromHintOptions(result, Loc.GetString("cmd-unlocknode-node-hint"));
+            }
+            default:
+                return CompletionResult.Empty;
+        }
+    }
+}
diff --git a/Content.Server/Xenoarchaeology/Artifact/XenoArtifactCommands.cs b/Content.Server/Xenoarchaeology/Artifact/XenoArtifactCommands.cs
index 31d079e3ad..7fd7acca4b 100644
--- a/Content.Server/Xenoarchaeology/Artifact/XenoArtifactCommands.cs
+++ b/Content.Server/Xenoarchaeology/Artifact/XenoArtifactCommands.cs
@@ -14,8 +14,7 @@ namespace Content.Server.Xenoarchaeology.Artifact;
 [ToolshedCommand, AdminCommand(AdminFlags.Debug)]
 public sealed class XenoArtifactCommand : ToolshedCommand
 {
-    [ValidatePrototypeId<EntityPrototype>]
-    public const string ArtifactPrototype = "BaseXenoArtifact";
+    public static readonly EntProtoId ArtifactPrototype = "BaseXenoArtifact";
 
     /// <summary> List existing artifacts. </summary>
     [CommandImplementation("list")]
diff --git a/Content.Server/Xenoarchaeology/Artifact/XenoArtifactUnlockNodeCommand.cs b/Content.Server/Xenoarchaeology/Artifact/XenoArtifactUnlockNodeCommand.cs
deleted file mode 100644
index 1782619780..0000000000
--- a/Content.Server/Xenoarchaeology/Artifact/XenoArtifactUnlockNodeCommand.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using Content.Server.Administration;
-using Content.Shared.Administration;
-using Content.Shared.Xenoarchaeology.Artifact.Components;
-using Robust.Shared.Console;
-
-namespace Content.Server.Xenoarchaeology.Artifact;
-
-/// <summary> Command for unlocking specific node of xeno artifact. </summary>
-[AdminCommand(AdminFlags.Debug)]
-public sealed class XenoArtifactUnlockNodeCommand : LocalizedCommands
-{
-    [Dependency] private readonly EntityManager _entities = default!;
-
-    /// <inheritdoc />
-    public override string Command => "unlocknode";
-
-    /// <inheritdoc />
-    public override string Description => Loc.GetString("cmd-unlocknode-desc");
-
-    /// <inheritdoc />
-    public override string Help => Loc.GetString("cmd-unlocknode-help");
-
-    /// <inheritdoc />
-    public override void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        if (args.Length != 2)
-        {
-            shell.WriteError(Loc.GetString("cmd-parse-failure-unlocknode-arg-num"));
-            return;
-        }
-
-        if (!NetEntity.TryParse(args[1], out var netNode))
-        {
-            shell.WriteError(Loc.GetString("cmd-parse-failure-unlocknode-invalid-entity"));
-            return;
-        }
-
-        if (!_entities.TryGetEntity(netNode, out var entityUid))
-        {
-            shell.WriteError(Loc.GetString("cmd-parse-failure-unlocknode-invalid-entity"));
-            return;
-        }
-        _entities.System<XenoArtifactSystem>()
-                 .SetNodeUnlocked(entityUid.Value);
-    }
-
-    /// <inheritdoc />
-    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
-    {
-        if (args.Length == 1)
-        {
-            var query = _entities.EntityQueryEnumerator<XenoArtifactComponent>();
-            var completionOptions = new List<CompletionOption>();
-            while (query.MoveNext(out var uid, out _))
-            {
-                completionOptions.Add(new CompletionOption(uid.ToString()));
-            }
-
-            return CompletionResult.FromHintOptions(completionOptions, "<artifact uid>");
-        }
-
-        if (args.Length == 2 &&
-            NetEntity.TryParse(args[0], out var netEnt) &&
-            _entities.TryGetEntity(netEnt, out var artifactUid) &&
-            _entities.TryGetComponent<XenoArtifactComponent>(artifactUid, out var comp))
-        {
-            var artifactSystem = _entities.System<XenoArtifactSystem>();
-
-            var result = new List<CompletionOption>();
-            foreach (var node in artifactSystem.GetAllNodes((artifactUid.Value, comp)))
-            {
-                var metaData = _entities.MetaQuery.Comp(artifactUid.Value);
-                var entityUidStr = _entities.GetNetEntity(node)
-                                            .ToString();
-                var completionOption = new CompletionOption(entityUidStr, metaData.EntityName);
-                result.Add(completionOption);
-            }
-
-            return CompletionResult.FromHintOptions(result, "<node uid>");
-        }
-
-        return CompletionResult.Empty;
-    }
-}
diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs
index 55d226ca5e..11185da61f 100644
--- a/Content.Server/Zombies/ZombieSystem.cs
+++ b/Content.Server/Zombies/ZombieSystem.cs
@@ -5,7 +5,6 @@ using Content.Server.Body.Systems;
 using Content.Server.Chat;
 using Content.Server.Chat.Systems;
 using Content.Server.Emoting.Systems;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Speech.EntitySystems;
 using Content.Server.Roles;
 using Content.Shared.Anomaly.Components;
@@ -61,7 +60,6 @@ namespace Content.Server.Zombies
         {
             base.Initialize();
 
-            SubscribeLocalEvent<ZombieComponent, ComponentStartup>(OnStartup);
             SubscribeLocalEvent<ZombieComponent, EmoteEvent>(OnEmote, before:
                 new[] { typeof(VocalSystem), typeof(BodyEmotesSystem) });
 
@@ -179,19 +177,15 @@ namespace Content.Server.Zombies
             args.Unrevivable = true;
         }
 
-        private void OnStartup(EntityUid uid, ZombieComponent component, ComponentStartup args)
-        {
-            if (component.EmoteSoundsId == null)
-                return;
-            _protoManager.TryIndex(component.EmoteSoundsId, out component.EmoteSounds);
-        }
-
         private void OnEmote(EntityUid uid, ZombieComponent component, ref EmoteEvent args)
         {
             // always play zombie emote sounds and ignore others
             if (args.Handled)
                 return;
-            args.Handled = _chat.TryPlayEmoteSound(uid, component.EmoteSounds, args.Emote);
+
+            _protoManager.TryIndex(component.EmoteSoundsId, out var sounds);
+
+            args.Handled = _chat.TryPlayEmoteSound(uid, sounds, args.Emote);
         }
 
         private void OnMobState(EntityUid uid, ZombieComponent component, MobStateChangedEvent args)
diff --git a/Content.Shared/Actions/ActionGrantSystem.cs b/Content.Shared/Actions/ActionGrantSystem.cs
index f73ecf8a46..e5b737f28f 100644
--- a/Content.Shared/Actions/ActionGrantSystem.cs
+++ b/Content.Shared/Actions/ActionGrantSystem.cs
@@ -1,3 +1,5 @@
+using  Content.Shared.Inventory;
+
 namespace Content.Shared.Actions;
 
 /// <summary>
@@ -17,9 +19,13 @@ public sealed class ActionGrantSystem : EntitySystem
 
     private void OnItemGet(Entity<ItemActionGrantComponent> ent, ref GetItemActionsEvent args)
     {
+
         if (!TryComp(ent.Owner, out ActionGrantComponent? grant))
             return;
 
+        if (ent.Comp.ActiveIfWorn && (args.SlotFlags == null || args.SlotFlags == SlotFlags.POCKET))
+            return;
+
         foreach (var action in grant.ActionEntities)
         {
             args.AddAction(action);
diff --git a/Content.Shared/Actions/ActionUpgradeSystem.cs b/Content.Shared/Actions/ActionUpgradeSystem.cs
index 8cddf2daeb..e2c37be6ff 100644
--- a/Content.Shared/Actions/ActionUpgradeSystem.cs
+++ b/Content.Shared/Actions/ActionUpgradeSystem.cs
@@ -11,7 +11,6 @@ public sealed class ActionUpgradeSystem : EntitySystem
 {
     [Dependency] private readonly SharedActionsSystem _actions = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
-    [Dependency] private readonly EntityManager _entityManager = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Actions/ItemActionGrantComponent.cs b/Content.Shared/Actions/ItemActionGrantComponent.cs
index d1769b51a2..db722d0c46 100644
--- a/Content.Shared/Actions/ItemActionGrantComponent.cs
+++ b/Content.Shared/Actions/ItemActionGrantComponent.cs
@@ -11,4 +11,10 @@ public sealed partial class ItemActionGrantComponent : Component
 {
     [DataField(required: true), AutoNetworkedField, AlwaysPushInheritance]
     public List<EntProtoId> Actions = new();
+
+    /// <summary>
+    /// Actions will only be available if the item is in the clothing slot.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ActiveIfWorn;
 }
diff --git a/Content.Shared/Anomaly/Components/AnomalyComponent.cs b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
index f58f9f1d07..fb281ca9a3 100644
--- a/Content.Shared/Anomaly/Components/AnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
@@ -135,6 +135,14 @@ public sealed partial class AnomalyComponent : Component
     /// </summary>
     [DataField]
     public SoundSpecifier? SupercriticalSoundAtAnimationStart;
+
+    /// <summary>
+    /// The length of the animation before it goes supercritical in seconds.
+    /// </summary>
+    ///
+    [DataField, AutoNetworkedField]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public TimeSpan SupercriticalDuration = TimeSpan.FromSeconds(10f);
     #endregion
 
     /// <summary>
diff --git a/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs b/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs
index 00ea882ad2..d72bc174be 100644
--- a/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs
@@ -19,13 +19,6 @@ public sealed partial class AnomalySupercriticalComponent : Component
     [AutoPausedField]
     public TimeSpan EndTime;
 
-    /// <summary>
-    /// The length of the animation before it goes supercritical.
-    /// </summary>
-    [AutoNetworkedField]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan SupercriticalDuration = TimeSpan.FromSeconds(10);
-
     /// <summary>
     /// The maximum size the anomaly scales to while going supercritical
     /// </summary>
diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs
index 3d00d43f41..ee3903a1d9 100644
--- a/Content.Shared/Anomaly/SharedAnomalySystem.cs
+++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs
@@ -135,10 +135,10 @@ public abstract class SharedAnomalySystem : EntitySystem
         if (_net.IsServer)
             Log.Info($"Anomaly is going supercritical. Entity: {ToPrettyString(ent.Owner)}");
 
-        Audio.PlayPvs(ent.Comp.SupercriticalSoundAtAnimationStart, Transform(ent).Coordinates);
+        Audio.PlayPvs(ent.Comp.SupercriticalSoundAtAnimationStart, ent);
 
         var super = AddComp<AnomalySupercriticalComponent>(ent);
-        super.EndTime = Timing.CurTime + super.SupercriticalDuration;
+        super.EndTime = Timing.CurTime + ent.Comp.SupercriticalDuration;
         Appearance.SetData(ent, AnomalyVisuals.Supercritical, true);
         Dirty(ent, super);
     }
diff --git a/Content.Shared/Bed/Components/StasisBedBuckledComponent.cs b/Content.Shared/Bed/Components/StasisBedBuckledComponent.cs
new file mode 100644
index 0000000000..3a1c991b1e
--- /dev/null
+++ b/Content.Shared/Bed/Components/StasisBedBuckledComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Bed.Components;
+
+/// <summary>
+/// Tracking component added to entities buckled to stasis beds.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SharedBedSystem))]
+public sealed partial class StasisBedBuckledComponent : Component;
diff --git a/Content.Shared/Bed/Components/StasisBedComponent.cs b/Content.Shared/Bed/Components/StasisBedComponent.cs
new file mode 100644
index 0000000000..97936261d6
--- /dev/null
+++ b/Content.Shared/Bed/Components/StasisBedComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Buckle.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Bed.Components;
+
+/// <summary>
+/// A <see cref="StrapComponent"/> that modifies a strapped entity's metabolic rate by the given multiplier
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedBedSystem))]
+public sealed partial class StasisBedComponent : Component
+{
+    /// <summary>
+    /// What the metabolic update rate will be multiplied by (higher = slower metabolism)
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Multiplier = 10f;
+}
diff --git a/Content.Shared/Bed/SharedBedSystem.cs b/Content.Shared/Bed/SharedBedSystem.cs
index cdf3ffcbd4..7e798111cf 100644
--- a/Content.Shared/Bed/SharedBedSystem.cs
+++ b/Content.Shared/Bed/SharedBedSystem.cs
@@ -1,7 +1,12 @@
 using Content.Shared.Actions;
 using Content.Shared.Bed.Components;
 using Content.Shared.Bed.Sleep;
+using Content.Shared.Body.Events;
+using Content.Shared.Body.Systems;
 using Content.Shared.Buckle.Components;
+using Content.Shared.Emag.Systems;
+using Content.Shared.Power;
+using Content.Shared.Power.EntitySystems;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -12,6 +17,9 @@ public abstract class SharedBedSystem : EntitySystem
     [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] private readonly ActionContainerSystem _actConts = default!;
     [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly EmagSystem _emag = default!;
+    [Dependency] private readonly SharedMetabolizerSystem _metabolizer = default!;
+    [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!;
     [Dependency] private readonly SleepingSystem _sleepingSystem = default!;
 
     public override void Initialize()
@@ -21,6 +29,12 @@ public abstract class SharedBedSystem : EntitySystem
         SubscribeLocalEvent<HealOnBuckleComponent, MapInitEvent>(OnHealMapInit);
         SubscribeLocalEvent<HealOnBuckleComponent, StrappedEvent>(OnStrapped);
         SubscribeLocalEvent<HealOnBuckleComponent, UnstrappedEvent>(OnUnstrapped);
+
+        SubscribeLocalEvent<StasisBedComponent, StrappedEvent>(OnStasisStrapped);
+        SubscribeLocalEvent<StasisBedComponent, UnstrappedEvent>(OnStasisUnstrapped);
+        SubscribeLocalEvent<StasisBedComponent, GotEmaggedEvent>(OnStasisEmagged);
+        SubscribeLocalEvent<StasisBedComponent, PowerChangedEvent>(OnPowerChanged);
+        SubscribeLocalEvent<StasisBedBuckledComponent, GetMetabolicMultiplierEvent>(OnStasisGetMetabolicMultiplier);
     }
 
     private void OnHealMapInit(Entity<HealOnBuckleComponent> ent, ref MapInitEvent args)
@@ -46,4 +60,61 @@ public abstract class SharedBedSystem : EntitySystem
         _sleepingSystem.TryWaking(args.Buckle.Owner);
         RemComp<HealOnBuckleHealingComponent>(bed);
     }
+
+    private void OnStasisStrapped(Entity<StasisBedComponent> ent, ref StrappedEvent args)
+    {
+        EnsureComp<StasisBedBuckledComponent>(args.Buckle);
+        _metabolizer.UpdateMetabolicMultiplier(args.Buckle);
+    }
+
+    private void OnStasisUnstrapped(Entity<StasisBedComponent> ent, ref UnstrappedEvent args)
+    {
+        RemComp<StasisBedBuckledComponent>(ent);
+        _metabolizer.UpdateMetabolicMultiplier(args.Buckle);
+    }
+
+    private void OnStasisEmagged(Entity<StasisBedComponent> ent, ref GotEmaggedEvent args)
+    {
+        if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+            return;
+
+        if (_emag.CheckFlag(ent, EmagType.Interaction))
+            return;
+
+        ent.Comp.Multiplier = 1f / ent.Comp.Multiplier;
+        UpdateMetabolisms(ent.Owner);
+        Dirty(ent);
+
+        args.Handled = true;
+    }
+
+    private void OnPowerChanged(Entity<StasisBedComponent> ent, ref PowerChangedEvent args)
+    {
+        UpdateMetabolisms(ent.Owner);
+    }
+
+    private void OnStasisGetMetabolicMultiplier(Entity<StasisBedBuckledComponent> ent, ref GetMetabolicMultiplierEvent args)
+    {
+        if (!TryComp<BuckleComponent>(ent, out var buckle) || buckle.BuckledTo is not { } buckledTo)
+            return;
+
+        if (!TryComp<StasisBedComponent>(buckledTo, out var stasis))
+            return;
+
+        if (!_powerReceiver.IsPowered(buckledTo))
+            return;
+
+        args.Multiplier *= stasis.Multiplier;
+    }
+
+    protected void UpdateMetabolisms(Entity<StrapComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return;
+
+        foreach (var buckledEntity in ent.Comp.BuckledEntities)
+        {
+            _metabolizer.UpdateMetabolicMultiplier(buckledEntity);
+        }
+    }
 }
diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs
index b00a5577f0..1f2d400fcf 100644
--- a/Content.Shared/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs
@@ -38,8 +38,8 @@ public sealed partial class SleepingSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedEmitSoundSystem _emitSound = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffectOld = default!;
-    [Dependency] private readonly SharedStatusEffectsSystem _statusEffectNew = default!;
+    [Dependency] private readonly StatusEffect.StatusEffectsSystem _statusEffectOld = default!;
+    [Dependency] private readonly StatusEffectNew.StatusEffectsSystem _statusEffectNew = default!;
 
     public static readonly EntProtoId SleepActionId = "ActionSleep";
     public static readonly EntProtoId WakeActionId = "ActionWake";
diff --git a/Content.Shared/Bed/StasisBedVisuals.cs b/Content.Shared/Bed/StasisBedVisuals.cs
deleted file mode 100644
index cf7bc06460..0000000000
--- a/Content.Shared/Bed/StasisBedVisuals.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Bed
-{
-    [Serializable, NetSerializable]
-    public enum StasisBedVisuals : byte
-    {
-        IsOn,
-    }
-}
diff --git a/Content.Shared/Body/Components/BloodstreamComponent.cs b/Content.Shared/Body/Components/BloodstreamComponent.cs
index 7997d92066..0139932262 100644
--- a/Content.Shared/Body/Components/BloodstreamComponent.cs
+++ b/Content.Shared/Body/Components/BloodstreamComponent.cs
@@ -37,6 +37,18 @@ public sealed partial class BloodstreamComponent : Component
     [DataField, AutoNetworkedField]
     public TimeSpan UpdateInterval = TimeSpan.FromSeconds(3);
 
+    /// <summary>
+    /// Multiplier applied to <see cref="UpdateInterval"/> for adjusting based on metabolic rate multiplier.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float UpdateIntervalMultiplier = 1f;
+
+    /// <summary>
+    /// Adjusted update interval based off of the multiplier value.
+    /// </summary>
+    [ViewVariables]
+    public TimeSpan AdjustedUpdateInterval => UpdateInterval * UpdateIntervalMultiplier;
+
     /// <summary>
     /// How much is this entity currently bleeding?
     /// Higher numbers mean more blood lost every tick.
diff --git a/Content.Shared/Body/Components/StomachComponent.cs b/Content.Shared/Body/Components/StomachComponent.cs
index b76dff0902..1b2f587824 100644
--- a/Content.Shared/Body/Components/StomachComponent.cs
+++ b/Content.Shared/Body/Components/StomachComponent.cs
@@ -23,6 +23,18 @@ namespace Content.Shared.Body.Components
         [DataField]
         public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
 
+        /// <summary>
+        /// Multiplier applied to <see cref="UpdateInterval"/> for adjusting based on metabolic rate multiplier.
+        /// </summary>
+        [DataField]
+        public float UpdateIntervalMultiplier = 1f;
+
+        /// <summary>
+        /// Adjusted update interval based off of the multiplier value.
+        /// </summary>
+        [ViewVariables]
+        public TimeSpan AdjustedUpdateInterval => UpdateInterval * UpdateIntervalMultiplier;
+
         /// <summary>
         ///     The solution inside of this stomach this transfers reagents to the body.
         /// </summary>
diff --git a/Content.Shared/Body/Events/ApplyMetabolicMultiplierEvent.cs b/Content.Shared/Body/Events/ApplyMetabolicMultiplierEvent.cs
deleted file mode 100644
index 1a7b589392..0000000000
--- a/Content.Shared/Body/Events/ApplyMetabolicMultiplierEvent.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace Content.Shared.Body.Events;
-
-// TODO REFACTOR THIS
-// This will cause rates to slowly drift over time due to floating point errors.
-// Instead, the system that raised this should trigger an update and subscribe to get-modifier events.
-[ByRefEvent]
-public readonly record struct ApplyMetabolicMultiplierEvent(
-    EntityUid Uid,
-    float Multiplier,
-    bool Apply)
-{
-    /// <summary>
-    /// The entity whose metabolism is being modified.
-    /// </summary>
-    public readonly EntityUid Uid = Uid;
-
-    /// <summary>
-    /// What the metabolism's update rate will be multiplied by.
-    /// </summary>
-    public readonly float Multiplier = Multiplier;
-
-    /// <summary>
-    /// If true, apply the multiplier. If false, revert it.
-    /// </summary>
-    public readonly bool Apply = Apply;
-}
diff --git a/Content.Shared/Body/Events/MetabolizerEvents.cs b/Content.Shared/Body/Events/MetabolizerEvents.cs
new file mode 100644
index 0000000000..f001c83f88
--- /dev/null
+++ b/Content.Shared/Body/Events/MetabolizerEvents.cs
@@ -0,0 +1,26 @@
+namespace Content.Shared.Body.Events;
+
+/// <summary>
+/// Raised on an entity to determine their metabolic multiplier.
+/// </summary>
+[ByRefEvent]
+public record struct GetMetabolicMultiplierEvent()
+{
+    /// <summary>
+    /// What the metabolism's update rate will be multiplied by.
+    /// </summary>
+    public float Multiplier = 1f;
+}
+
+/// <summary>
+/// Raised on an entity to apply their metabolic multiplier to relevant systems.
+/// Note that you should be storing this value as to not accrue precision errors when it's modified.
+/// </summary>
+[ByRefEvent]
+public readonly record struct ApplyMetabolicMultiplierEvent(float Multiplier)
+{
+    /// <summary>
+    /// What the metabolism's update rate will be multiplied by.
+    /// </summary>
+    public readonly float Multiplier = Multiplier;
+}
diff --git a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
index 3b1674cf3c..ac385040a9 100644
--- a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
+++ b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
@@ -14,6 +14,7 @@ using Content.Shared.Forensics.Components;
 using Content.Shared.HealthExaminable;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
+using Content.Shared.Random.Helpers;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Speech.EntitySystems;
 using Robust.Shared.Audio.Systems;
@@ -64,7 +65,7 @@ public abstract class SharedBloodstreamSystem : EntitySystem
             if (curTime < bloodstream.NextUpdate)
                 continue;
 
-            bloodstream.NextUpdate += bloodstream.UpdateInterval;
+            bloodstream.NextUpdate += bloodstream.AdjustedUpdateInterval;
             DirtyField(uid, bloodstream, nameof(BloodstreamComponent.NextUpdate)); // needs to be dirtied on the client so it can be rerolled during prediction
 
             if (!SolutionContainer.ResolveSolution(uid, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution))
@@ -101,12 +102,12 @@ public abstract class SharedBloodstreamSystem : EntitySystem
                 // Multiplying by 2 is arbitrary but works for this case, it just prevents the time from running out
                 _drunkSystem.TryApplyDrunkenness(
                     uid,
-                    (float)bloodstream.UpdateInterval.TotalSeconds * 2,
+                    (float)bloodstream.AdjustedUpdateInterval.TotalSeconds * 2,
                     applySlur: false);
-                _stutteringSystem.DoStutter(uid, bloodstream.UpdateInterval * 2, refresh: false);
+                _stutteringSystem.DoStutter(uid, bloodstream.AdjustedUpdateInterval * 2, refresh: false);
 
                 // storing the drunk and stutter time so we can remove it independently from other effects additions
-                bloodstream.StatusTime += bloodstream.UpdateInterval * 2;
+                bloodstream.StatusTime += bloodstream.AdjustedUpdateInterval * 2;
                 DirtyField(uid, bloodstream, nameof(BloodstreamComponent.StatusTime));
             }
             else if (!_mobStateSystem.IsDead(uid))
@@ -129,7 +130,7 @@ public abstract class SharedBloodstreamSystem : EntitySystem
 
     private void OnMapInit(Entity<BloodstreamComponent> ent, ref MapInitEvent args)
     {
-        ent.Comp.NextUpdate = _timing.CurTime + ent.Comp.UpdateInterval;
+        ent.Comp.NextUpdate = _timing.CurTime + ent.Comp.AdjustedUpdateInterval;
         DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.NextUpdate));
     }
 
@@ -222,7 +223,7 @@ public abstract class SharedBloodstreamSystem : EntitySystem
 
         // TODO: Replace with RandomPredicted once the engine PR is merged
         // Use both the receiver and the damage causing entity for the seed so that we have different results for multiple attacks in the same tick
-        var seed = HashCode.Combine((int)_timing.CurTick.Value, GetNetEntity(ent).Id, GetNetEntity(args.Origin)?.Id ?? 0);
+        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id, GetNetEntity(args.Origin)?.Id ?? 0 });
         var rand = new System.Random(seed);
         var prob = Math.Clamp(totalFloat / 25, 0, 1);
         if (totalFloat > 0 && rand.Prob(prob))
@@ -289,15 +290,8 @@ public abstract class SharedBloodstreamSystem : EntitySystem
 
     private void OnApplyMetabolicMultiplier(Entity<BloodstreamComponent> ent, ref ApplyMetabolicMultiplierEvent args)
     {
-        // TODO REFACTOR THIS
-        // This will slowly drift over time due to floating point errors.
-        // Instead, raise an event with the base rates and allow modifiers to get applied to it.
-        if (args.Apply)
-            ent.Comp.UpdateInterval *= args.Multiplier;
-        else
-            ent.Comp.UpdateInterval /= args.Multiplier;
-
-        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.UpdateInterval));
+        ent.Comp.UpdateIntervalMultiplier = args.Multiplier;
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.UpdateIntervalMultiplier));
     }
 
     private void OnRejuvenate(Entity<BloodstreamComponent> ent, ref RejuvenateEvent args)
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
index 0917197e29..78d270ddc9 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
@@ -8,12 +8,14 @@ using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Movement.Components;
 using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Body.Systems;
 
 public partial class SharedBodySystem
 {
+    private static readonly ProtoId<DamageTypePrototype> BloodlossDamageType = "Bloodloss";
     private void InitializeParts()
     {
         // TODO: This doesn't handle comp removal on child ents.
@@ -178,7 +180,7 @@ public partial class SharedBodySystem
         )
         {
             // TODO BODY SYSTEM KILL : remove this when wounding and required parts are implemented properly
-            var damage = new DamageSpecifier(Prototypes.Index<DamageTypePrototype>("Bloodloss"), 300);
+            var damage = new DamageSpecifier(Prototypes.Index(BloodlossDamageType), 300);
             Damageable.TryChangeDamage(bodyEnt, damage);
         }
     }
diff --git a/Content.Shared/Body/Systems/SharedMetabolizerSystem.cs b/Content.Shared/Body/Systems/SharedMetabolizerSystem.cs
new file mode 100644
index 0000000000..24ab438f6d
--- /dev/null
+++ b/Content.Shared/Body/Systems/SharedMetabolizerSystem.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Body.Events;
+
+namespace Content.Shared.Body.Systems;
+
+public abstract class SharedMetabolizerSystem : EntitySystem
+{
+    /// <summary>
+    /// Updates the metabolic rate multiplier for a given entity,
+    /// raising both <see cref="GetMetabolicMultiplierEvent"/> to determine what the multiplier is and <see cref="ApplyMetabolicMultiplierEvent"/> to update relevant components.
+    /// </summary>
+    /// <param name="uid"></param>
+    public void UpdateMetabolicMultiplier(EntityUid uid)
+    {
+        var getEv = new GetMetabolicMultiplierEvent();
+        RaiseLocalEvent(uid, ref getEv);
+
+        var applyEv = new ApplyMetabolicMultiplierEvent(getEv.Multiplier);
+        RaiseLocalEvent(uid, ref applyEv);
+    }
+}
diff --git a/Content.Shared/Body/Systems/StomachSystem.cs b/Content.Shared/Body/Systems/StomachSystem.cs
index d0ecb6b93b..3d8647b14d 100644
--- a/Content.Shared/Body/Systems/StomachSystem.cs
+++ b/Content.Shared/Body/Systems/StomachSystem.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Organ;
-using Content.Shared.Body.Events;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
@@ -28,7 +27,7 @@ namespace Content.Shared.Body.Systems
 
         private void OnMapInit(Entity<StomachComponent> ent, ref MapInitEvent args)
         {
-            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
+            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.AdjustedUpdateInterval;
         }
 
         private void OnUnpaused(Entity<StomachComponent> ent, ref EntityUnpausedEvent args)
@@ -54,7 +53,7 @@ namespace Content.Shared.Body.Systems
                 if (_gameTiming.CurTime < stomach.NextUpdate)
                     continue;
 
-                stomach.NextUpdate += stomach.UpdateInterval;
+                stomach.NextUpdate += stomach.AdjustedUpdateInterval;
 
                 // Get our solutions
                 if (!_solutionContainerSystem.ResolveSolution((uid, sol), DefaultSolutionName, ref stomach.Solution, out var stomachSolution))
@@ -68,7 +67,7 @@ namespace Content.Shared.Body.Systems
                 var queue = new RemQueue<StomachComponent.ReagentDelta>();
                 foreach (var delta in stomach.ReagentDeltas)
                 {
-                    delta.Increment(stomach.UpdateInterval);
+                    delta.Increment(stomach.AdjustedUpdateInterval);
                     if (delta.Lifetime > stomach.DigestionDelay)
                     {
                         if (stomachSolution.TryGetReagent(delta.ReagentQuantity.Reagent, out var reagent))
@@ -96,18 +95,9 @@ namespace Content.Shared.Body.Systems
             }
         }
 
-        private void OnApplyMetabolicMultiplier(
-            Entity<StomachComponent> ent,
-            ref ApplyMetabolicMultiplierEvent args)
+        private void OnApplyMetabolicMultiplier(Entity<StomachComponent> ent, ref ApplyMetabolicMultiplierEvent args)
         {
-            if (args.Apply)
-            {
-                ent.Comp.UpdateInterval *= args.Multiplier;
-                return;
-            }
-
-            // This way we don't have to worry about it breaking if the stasis bed component is destroyed
-            ent.Comp.UpdateInterval /= args.Multiplier;
+            ent.Comp.UpdateIntervalMultiplier = args.Multiplier;
         }
 
         public bool CanTransferSolution(
diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs
index e5f3d46997..967980302d 100644
--- a/Content.Shared/Chat/SharedChatSystem.cs
+++ b/Content.Shared/Chat/SharedChatSystem.cs
@@ -24,13 +24,10 @@ public abstract class SharedChatSystem : EntitySystem
     public const char WhisperPrefix = ',';
     public const char DefaultChannelKey = 'h';
 
-    [ValidatePrototypeId<RadioChannelPrototype>]
-    public const string CommonChannel = "Common";
+    public static readonly ProtoId<RadioChannelPrototype> CommonChannel = "Common";
 
-    public static string DefaultChannelPrefix = $"{RadioChannelPrefix}{DefaultChannelKey}";
-
-    [ValidatePrototypeId<SpeechVerbPrototype>]
-    public const string DefaultSpeechVerb = "Default";
+    public static readonly string DefaultChannelPrefix = $"{RadioChannelPrefix}{DefaultChannelKey}";
+    public static readonly ProtoId<SpeechVerbPrototype> DefaultSpeechVerb = "Default";
 
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
@@ -43,7 +40,7 @@ public abstract class SharedChatSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        DebugTools.Assert(_prototypeManager.HasIndex<RadioChannelPrototype>(CommonChannel));
+        DebugTools.Assert(_prototypeManager.HasIndex(CommonChannel));
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypeReload);
         CacheRadios();
     }
@@ -67,13 +64,13 @@ public abstract class SharedChatSystem : EntitySystem
     public SpeechVerbPrototype GetSpeechVerb(EntityUid source, string message, SpeechComponent? speech = null)
     {
         if (!Resolve(source, ref speech, false))
-            return _prototypeManager.Index<SpeechVerbPrototype>(DefaultSpeechVerb);
+            return _prototypeManager.Index(DefaultSpeechVerb);
 
         // check for a suffix-applicable speech verb
         SpeechVerbPrototype? current = null;
         foreach (var (str, id) in speech.SuffixSpeechVerbs)
         {
-            var proto = _prototypeManager.Index<SpeechVerbPrototype>(id);
+            var proto = _prototypeManager.Index(id);
             if (message.EndsWith(Loc.GetString(str)) && proto.Priority >= (current?.Priority ?? 0))
             {
                 current = proto;
@@ -81,7 +78,7 @@ public abstract class SharedChatSystem : EntitySystem
         }
 
         // if no applicable suffix verb return the normal one used by the entity
-        return current ?? _prototypeManager.Index<SpeechVerbPrototype>(speech.SpeechVerb);
+        return current ?? _prototypeManager.Index(speech.SpeechVerb);
     }
 
     /// <summary>
diff --git a/Content.Shared/Chat/SharedSuicideSystem.cs b/Content.Shared/Chat/SharedSuicideSystem.cs
index d341ea89a8..4b9eaf24b7 100644
--- a/Content.Shared/Chat/SharedSuicideSystem.cs
+++ b/Content.Shared/Chat/SharedSuicideSystem.cs
@@ -8,6 +8,8 @@ namespace Content.Shared.Chat;
 
 public sealed class SharedSuicideSystem : EntitySystem
 {
+    private static readonly ProtoId<DamageTypePrototype> FallbackDamageType = "Blunt";
+
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
@@ -57,8 +59,8 @@ public sealed class SharedSuicideSystem : EntitySystem
         // We don't want structural damage for the same reasons listed above
         if (!_prototypeManager.TryIndex(damageType, out var damagePrototype) || damagePrototype.ID == "Structural")
         {
-            Log.Error($"{nameof(SharedSuicideSystem)} could not find the damage type prototype associated with {damageType}. Falling back to Blunt");
-            damagePrototype = _prototypeManager.Index<DamageTypePrototype>("Blunt");
+            Log.Error($"{nameof(SharedSuicideSystem)} could not find the damage type prototype associated with {damageType}. Falling back to {FallbackDamageType}");
+            damagePrototype = _prototypeManager.Index(FallbackDamageType);
         }
 
         var damage = new DamageSpecifier(damagePrototype, lethalAmountOfDamage);
diff --git a/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs b/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs
index bc5c95c8ab..20f2741f0b 100644
--- a/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs
+++ b/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs
@@ -2,6 +2,7 @@ using Content.Shared.ActionBlocker;
 using Content.Shared.Clothing;
 using Content.Shared.Inventory;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Chat.TypingIndicator;
@@ -18,8 +19,7 @@ public abstract class SharedTypingIndicatorSystem : EntitySystem
     /// <summary>
     ///     Default ID of <see cref="TypingIndicatorPrototype"/>
     /// </summary>
-    [ValidatePrototypeId<TypingIndicatorPrototype>]
-    public const string InitialIndicatorId = "default";
+    public static readonly ProtoId<TypingIndicatorPrototype> InitialIndicatorId = "default";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Chemistry/Components/Solution.cs b/Content.Shared/Chemistry/Components/Solution.cs
index 9622ccae30..38be03226d 100644
--- a/Content.Shared/Chemistry/Components/Solution.cs
+++ b/Content.Shared/Chemistry/Components/Solution.cs
@@ -1,12 +1,12 @@
+using System.Collections;
+using System.Linq;
+using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
-using System.Collections;
-using System.Linq;
-using Content.Shared.Chemistry.Components.SolutionManager;
 
 namespace Content.Shared.Chemistry.Components
 {
@@ -583,6 +583,7 @@ namespace Content.Shared.Chemistry.Components
         /// <summary>
         /// Splits a solution without the specified reagent prototypes.
         /// </summary>
+        [Obsolete("Use SplitSolutionWithout with params ProtoId<ReagentPrototype>")]
         public Solution SplitSolutionWithout(FixedPoint2 toTake, params string[] excludedPrototypes)
         {
             // First remove the blacklisted prototypes
@@ -612,6 +613,38 @@ namespace Content.Shared.Chemistry.Components
             return sol;
         }
 
+        /// <summary>
+        /// Splits a solution without the specified reagent prototypes.
+        /// </summary>
+        public Solution SplitSolutionWithout(FixedPoint2 toTake, params ProtoId<ReagentPrototype>[] excludedPrototypes)
+        {
+            // First remove the blacklisted prototypes
+            List<ReagentQuantity> excluded = new();
+            foreach (var id in excludedPrototypes)
+            {
+                foreach (var tuple in Contents)
+                {
+                    if (tuple.Reagent.Prototype != id)
+                        continue;
+
+                    excluded.Add(tuple);
+                    RemoveReagent(tuple);
+                    break;
+                }
+            }
+
+            // Then split the solution
+            var sol = SplitSolution(toTake);
+
+            // Then re-add the excluded reagents to the original solution.
+            foreach (var reagent in excluded)
+            {
+                AddReagent(reagent);
+            }
+
+            return sol;
+        }
+
         /// <summary>
         /// Splits a solution with only the specified reagent prototypes.
         /// </summary>
diff --git a/Content.Server/Chemistry/Components/SolutionPurgeComponent.cs b/Content.Shared/Chemistry/Components/SolutionPurgeComponent.cs
similarity index 52%
rename from Content.Server/Chemistry/Components/SolutionPurgeComponent.cs
rename to Content.Shared/Chemistry/Components/SolutionPurgeComponent.cs
index 9b9294b6f9..acaebb7ef8 100644
--- a/Content.Server/Chemistry/Components/SolutionPurgeComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionPurgeComponent.cs
@@ -1,47 +1,48 @@
-using Content.Server.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
-namespace Content.Server.Chemistry.Components;
+namespace Content.Shared.Chemistry.Components;
 
 /// <summary>
 /// Passively decreases a solution's quantity of reagent(s).
 /// </summary>
 [RegisterComponent, AutoGenerateComponentPause]
+[NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(SolutionPurgeSystem))]
 public sealed partial class SolutionPurgeComponent : Component
 {
     /// <summary>
     /// The name of the solution to detract from.
     /// </summary>
-    [DataField("solution", required: true), ViewVariables(VVAccess.ReadWrite)]
+    [DataField(required: true)]
     public string Solution = string.Empty;
 
     /// <summary>
     /// The reagent(s) to be ignored when purging the solution
     /// </summary>
-    [DataField("preserve", customTypeSerializer: typeof(PrototypeIdListSerializer<ReagentPrototype>))]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public List<string> Preserve = new();
+    [DataField]
+    public List<ProtoId<ReagentPrototype>> Preserve = [];
 
     /// <summary>
     /// Amount of reagent(s) that are purged
     /// </summary>
-    [DataField("quantity", required: true), ViewVariables(VVAccess.ReadWrite)]
-    public FixedPoint2 Quantity = default!;
+    [DataField(required: true)]
+    public FixedPoint2 Quantity;
 
     /// <summary>
     /// How long it takes to purge once.
     /// </summary>
-    [DataField("duration"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public TimeSpan Duration = TimeSpan.FromSeconds(1);
 
     /// <summary>
     /// The time when the next purge will occur.
     /// </summary>
-    [DataField("nextPurgeTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
-    [AutoPausedField]
-    public TimeSpan NextPurgeTime = TimeSpan.FromSeconds(0);
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField, AutoNetworkedField]
+    public TimeSpan NextPurgeTime;
 }
diff --git a/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs b/Content.Shared/Chemistry/Components/SolutionRegenerationComponent.cs
similarity index 78%
rename from Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs
rename to Content.Shared/Chemistry/Components/SolutionRegenerationComponent.cs
index 9266c460f1..be41ace321 100644
--- a/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionRegenerationComponent.cs
@@ -1,13 +1,13 @@
-using Content.Server.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.Chemistry.Components;
+namespace Content.Shared.Chemistry.Components;
 
 /// <summary>
 /// Passively increases a solution's quantity of a reagent.
 /// </summary>
-[RegisterComponent, AutoGenerateComponentPause]
+[RegisterComponent, AutoGenerateComponentPause, AutoGenerateComponentState, NetworkedComponent]
 [Access(typeof(SolutionRegenerationSystem))]
 public sealed partial class SolutionRegenerationComponent : Component
 {
@@ -39,6 +39,6 @@ public sealed partial class SolutionRegenerationComponent : Component
     /// The time when the next regeneration will occur.
     /// </summary>
     [DataField("nextChargeTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoPausedField]
-    public TimeSpan NextRegenTime = TimeSpan.FromSeconds(0);
+    [AutoPausedField, AutoNetworkedField]
+    public TimeSpan NextRegenTime;
 }
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index fe4d102536..83de0970ec 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -1,24 +1,24 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.Reaction;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Examine;
-using Content.Shared.FixedPoint;
-using Content.Shared.Verbs;
-using JetBrains.Annotations;
-using Robust.Shared.Containers;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Text;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Containers;
+using Content.Shared.Examine;
+using Content.Shared.FixedPoint;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Verbs;
+using JetBrains.Annotations;
+using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 using Dependency = Robust.Shared.IoC.DependencyAttribute;
 
 namespace Content.Shared.Chemistry.EntitySystems;
@@ -61,14 +61,14 @@ public partial record struct SolutionAccessAttemptEvent(string SolutionName)
 [UsedImplicitly]
 public abstract partial class SharedSolutionContainerSystem : EntitySystem
 {
-    [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
-    [Dependency] protected readonly ChemicalReactionSystem ChemicalReactionSystem = default!;
-    [Dependency] protected readonly ExamineSystemShared ExamineSystem = default!;
-    [Dependency] protected readonly SharedAppearanceSystem AppearanceSystem = default!;
-    [Dependency] protected readonly SharedHandsSystem Hands = default!;
-    [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
-    [Dependency] protected readonly MetaDataSystem MetaDataSys = default!;
-    [Dependency] protected readonly INetManager NetManager = default!;
+    [Robust.Shared.IoC.Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
+    [Robust.Shared.IoC.Dependency] protected readonly ChemicalReactionSystem ChemicalReactionSystem = default!;
+    [Robust.Shared.IoC.Dependency] protected readonly ExamineSystemShared ExamineSystem = default!;
+    [Robust.Shared.IoC.Dependency] protected readonly SharedAppearanceSystem AppearanceSystem = default!;
+    [Robust.Shared.IoC.Dependency] protected readonly SharedHandsSystem Hands = default!;
+    [Robust.Shared.IoC.Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
+    [Robust.Shared.IoC.Dependency] protected readonly MetaDataSystem MetaDataSys = default!;
+    [Robust.Shared.IoC.Dependency] protected readonly INetManager NetManager = default!;
 
     public override void Initialize()
     {
@@ -376,6 +376,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     /// <summary>
     /// Splits a solution without the specified reagent(s).
     /// </summary>
+    [Obsolete("Use SplitSolutionWithout with params ProtoId<ReagentPrototype>")]
     public Solution SplitSolutionWithout(Entity<SolutionComponent> soln, FixedPoint2 quantity, params string[] reagents)
     {
         var (uid, comp) = soln;
@@ -386,6 +387,19 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         return splitSol;
     }
 
+    /// <summary>
+    /// Splits a solution without the specified reagent(s).
+    /// </summary>
+    public Solution SplitSolutionWithout(Entity<SolutionComponent> soln, FixedPoint2 quantity, params ProtoId<ReagentPrototype>[] reagents)
+    {
+        var (uid, comp) = soln;
+        var solution = comp.Solution;
+
+        var splitSol = solution.SplitSolutionWithout(quantity, reagents);
+        UpdateChemicals(soln);
+        return splitSol;
+    }
+
     public void RemoveAllSolution(Entity<SolutionComponent> soln)
     {
         var (uid, comp) = soln;
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionPurgeSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionPurgeSystem.cs
similarity index 56%
rename from Content.Server/Chemistry/EntitySystems/SolutionPurgeSystem.cs
rename to Content.Shared/Chemistry/EntitySystems/SolutionPurgeSystem.cs
index 5a25e76456..bf39aaecc4 100644
--- a/Content.Server/Chemistry/EntitySystems/SolutionPurgeSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SolutionPurgeSystem.cs
@@ -1,15 +1,28 @@
-using Content.Server.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
+using System.Linq;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Chemistry.EntitySystems;
+namespace Content.Shared.Chemistry.EntitySystems;
 
 public sealed class SolutionPurgeSystem : EntitySystem
 {
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SolutionPurgeComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(Entity<SolutionPurgeComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextPurgeTime = _timing.CurTime + ent.Comp.Duration;
+        Dirty(ent);
+    }
+
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -22,8 +35,15 @@ public sealed class SolutionPurgeSystem : EntitySystem
 
             // timer ignores if it's empty, it's just a fixed cycle
             purge.NextPurgeTime += purge.Duration;
+            // Needs to be networked and dirtied so that the client can reroll it during prediction
+            Dirty(uid, purge);
+
             if (_solutionContainer.TryGetSolution((uid, manager), purge.Solution, out var solution))
-                _solutionContainer.SplitSolutionWithout(solution.Value, purge.Quantity, purge.Preserve.ToArray());
+            {
+                _solutionContainer.SplitSolutionWithout(solution.Value,
+                    purge.Quantity,
+                    purge.Preserve.Select(proto => proto.Id).ToArray());
+            }
         }
     }
 }
diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionRegenerationSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionRegenerationSystem.cs
new file mode 100644
index 0000000000..369b837202
--- /dev/null
+++ b/Content.Shared/Chemistry/EntitySystems/SolutionRegenerationSystem.cs
@@ -0,0 +1,69 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Containers;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Chemistry.EntitySystems;
+
+public sealed class SolutionRegenerationSystem : EntitySystem
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SolutionRegenerationComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<SolutionRegenerationComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
+    }
+
+    private void OnMapInit(Entity<SolutionRegenerationComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextRegenTime = _timing.CurTime + ent.Comp.Duration;
+
+        Dirty(ent);
+    }
+
+    // Workaround for https://github.com/space-wizards/space-station-14/pull/35314
+    private void OnEntRemoved(Entity<SolutionRegenerationComponent> ent, ref EntRemovedFromContainerMessage args)
+    {
+        // Make sure the removed entity was our contained solution and clear our cached reference
+        if (args.Entity == ent.Comp.SolutionRef?.Owner)
+            ent.Comp.SolutionRef = null;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<SolutionRegenerationComponent, SolutionContainerManagerComponent>();
+        while (query.MoveNext(out var uid, out var regen, out var manager))
+        {
+            if (_timing.CurTime < regen.NextRegenTime)
+                continue;
+
+            // timer ignores if its full, it's just a fixed cycle
+            regen.NextRegenTime += regen.Duration;
+            // Needs to be networked and dirtied so that the client can reroll it during prediction
+            Dirty(uid, regen);
+            if (!_solutionContainer.ResolveSolution((uid, manager),
+                    regen.SolutionName,
+                    ref regen.SolutionRef,
+                    out var solution))
+                continue;
+
+            var amount = FixedPoint2.Min(solution.AvailableVolume, regen.Generated.Volume);
+            if (amount <= FixedPoint2.Zero)
+                continue;
+
+            // Don't bother cloning and splitting if adding the whole thing
+            var generated = amount == regen.Generated.Volume
+                ? regen.Generated
+                : regen.Generated.Clone().SplitSolution(amount);
+
+            _solutionContainer.TryAddSolution(regen.SolutionRef.Value, generated);
+        }
+    }
+}
diff --git a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
index f75cce762b..fb3863a8b8 100644
--- a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
+++ b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
@@ -1,3 +1,5 @@
+using System.Collections.Frozen;
+using System.Linq;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
@@ -5,10 +7,9 @@ using Content.Shared.Database;
 using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using System.Collections.Frozen;
-using System.Linq;
 
 
 namespace Content.Shared.Chemistry.Reaction
@@ -25,9 +26,10 @@ namespace Content.Shared.Chemistry.Reaction
         /// </summary>
         private const int MaxReactionIterations = 50; //20 standard, CP14 increase limit
 
+        [Dependency] private readonly INetManager _netMan = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
         /// <summary>
@@ -225,7 +227,11 @@ namespace Content.Shared.Chemistry.Reaction
                 effect.Effect(args);
             }
 
-            _audio.PlayPvs(reaction.Sound, soln);
+            // Someday, some brave soul will thread through an optional actor
+            // argument in from every call of OnReaction up, all just to pass
+            // it to PlayPredicted. I am not that brave soul.
+            if (_netMan.IsServer)
+                _audio.PlayPvs(reaction.Sound, soln);
         }
 
         /// <summary>
@@ -235,7 +241,6 @@ namespace Content.Shared.Chemistry.Reaction
         /// </summary>
         private bool ProcessReactions(Entity<SolutionComponent> soln, SortedSet<ReactionPrototype> reactions, ReactionMixerComponent? mixerComponent)
         {
-            HashSet<ReactionPrototype> toRemove = new();
             List<string>? products = null;
 
             // attempt to perform any applicable reaction
@@ -243,7 +248,6 @@ namespace Content.Shared.Chemistry.Reaction
             {
                 if (!CanReact(soln, reaction, mixerComponent, out var unitReactions))
                 {
-                    toRemove.Add(reaction);
                     continue;
                 }
 
diff --git a/Content.Shared/Clumsy/ClumsyComponent.cs b/Content.Shared/Clumsy/ClumsyComponent.cs
index 6b013a5c2f..9e6e851c8c 100644
--- a/Content.Shared/Clumsy/ClumsyComponent.cs
+++ b/Content.Shared/Clumsy/ClumsyComponent.cs
@@ -5,7 +5,7 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.Clumsy;
 
 /// <summary>
-/// A simple clumsy tag-component.
+/// Makes the entity clumsy, randomly failing some interactions and hurting themselves.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ClumsyComponent : Component
@@ -48,11 +48,17 @@ public sealed partial class ClumsyComponent : Component
     public TimeSpan GunShootFailStunTime = TimeSpan.FromSeconds(3);
 
     /// <summary>
-    ///     Stun time after failing to shoot a gun.
+    ///     Damage taken after failing to shoot a gun.
     /// </summary>
     [DataField, AutoNetworkedField]
     public DamageSpecifier? GunShootFailDamage;
 
+    /// <summary>
+    ///     Damage taken after failing to catch an item.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public DamageSpecifier? CatchingFailDamage;
+
     /// <summary>
     ///     Noise to play after failing to shoot a gun. Boom!
     /// </summary>
@@ -77,6 +83,12 @@ public sealed partial class ClumsyComponent : Component
     [DataField, AutoNetworkedField]
     public bool ClumsyGuns = true;
 
+    /// <summary>
+    ///      Whether or not to apply Clumsy to catching items.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ClumsyCatching = true;
+
     /// <summary>
     ///      Whether or not to apply Clumsy to vaulting.
     /// </summary>
@@ -87,17 +99,23 @@ public sealed partial class ClumsyComponent : Component
     ///      Lets you define a new "failed" message for each event.
     /// </summary>
     [DataField]
-    public LocId HypoFailedMessage = "hypospray-component-inject-self-clumsy-message";
+    public LocId HypoFailedMessage = "clumsy-hypospray-fail-message";
 
     [DataField]
-    public LocId GunFailedMessage = "gun-clumsy";
+    public LocId GunFailedMessage = "clumsy-gun-fail-message";
 
     [DataField]
-    public LocId VaulingFailedMessageSelf = "bonkable-success-message-user";
+    public LocId CatchingFailedMessageSelf = "clumsy-catch-fail-message-user";
 
     [DataField]
-    public LocId VaulingFailedMessageOthers = "bonkable-success-message-others";
+    public LocId CatchingFailedMessageOthers = "clumsy-catch-fail-message-others";
 
     [DataField]
-    public LocId VaulingFailedMessageForced = "forced-bonkable-success-message";
+    public LocId VaulingFailedMessageSelf = "clumsy-vaulting-fail-message-user";
+
+    [DataField]
+    public LocId VaulingFailedMessageOthers = "clumsy-vaulting-fail-message-others";
+
+    [DataField]
+    public LocId VaulingFailedMessageForced = "clumsy-vaulting-fail-forced-message";
 }
diff --git a/Content.Shared/Clumsy/ClumsySystem.cs b/Content.Shared/Clumsy/ClumsySystem.cs
index 348d99182a..9e0e82364f 100644
--- a/Content.Shared/Clumsy/ClumsySystem.cs
+++ b/Content.Shared/Clumsy/ClumsySystem.cs
@@ -6,10 +6,14 @@ using Content.Shared.Damage;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Medical;
 using Content.Shared.Popups;
+using Content.Shared.Random.Helpers;
 using Content.Shared.Stunnable;
+using Content.Shared.Throwing;
 using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
@@ -17,19 +21,20 @@ namespace Content.Shared.Clumsy;
 
 public sealed class ClumsySystem : EntitySystem
 {
-    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly INetManager _net = default!;
 
     public override void Initialize()
     {
         SubscribeLocalEvent<ClumsyComponent, SelfBeforeHyposprayInjectsEvent>(BeforeHyposprayEvent);
         SubscribeLocalEvent<ClumsyComponent, SelfBeforeDefibrillatorZapsEvent>(BeforeDefibrillatorZapsEvent);
         SubscribeLocalEvent<ClumsyComponent, SelfBeforeGunShotEvent>(BeforeGunShotEvent);
+        SubscribeLocalEvent<ClumsyComponent, CatchAttemptEvent>(OnCatchAttempt);
         SubscribeLocalEvent<ClumsyComponent, SelfBeforeClimbEvent>(OnBeforeClimbEvent);
     }
 
@@ -43,12 +48,15 @@ public sealed class ClumsySystem : EntitySystem
         if (!ent.Comp.ClumsyHypo)
             return;
 
-        if (!_random.Prob(ent.Comp.ClumsyDefaultCheck))
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id });
+        var rand = new System.Random(seed);
+        if (!rand.Prob(ent.Comp.ClumsyDefaultCheck))
             return;
 
         args.TargetGettingInjected = args.EntityUsingHypospray;
-        args.InjectMessageOverride = "hypospray-component-inject-self-clumsy-message";
-        _audio.PlayPvs(ent.Comp.ClumsySound, ent);
+        args.InjectMessageOverride = Loc.GetString(ent.Comp.HypoFailedMessage);
+        _audio.PlayPredicted(ent.Comp.ClumsySound, ent, args.EntityUsingHypospray);
     }
 
     private void BeforeDefibrillatorZapsEvent(Entity<ClumsyComponent> ent, ref SelfBeforeDefibrillatorZapsEvent args)
@@ -59,7 +67,10 @@ public sealed class ClumsySystem : EntitySystem
         if (!ent.Comp.ClumsyDefib)
             return;
 
-        if (!_random.Prob(ent.Comp.ClumsyDefaultCheck))
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id });
+        var rand = new System.Random(seed);
+        if (!rand.Prob(ent.Comp.ClumsyDefaultCheck))
             return;
 
         args.DefibTarget = args.EntityUsingDefib;
@@ -67,6 +78,37 @@ public sealed class ClumsySystem : EntitySystem
 
     }
 
+    private void OnCatchAttempt(Entity<ClumsyComponent> ent, ref CatchAttemptEvent args)
+    {
+        // Clumsy people sometimes fail to catch items!
+
+        // checks if ClumsyCatching is false, if so, skips.
+        if (!ent.Comp.ClumsyCatching)
+            return;
+
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(args.Item).Id });
+        var rand = new System.Random(seed);
+        if (!rand.Prob(ent.Comp.ClumsyDefaultCheck))
+            return;
+
+        args.Cancelled = true; // fail to catch
+
+        if (ent.Comp.CatchingFailDamage != null)
+            _damageable.TryChangeDamage(ent, ent.Comp.CatchingFailDamage, origin: args.Item);
+
+        // Collisions don't work properly with PopupPredicted or PlayPredicted.
+        // So we make this server only.
+        if (_net.IsClient)
+            return;
+
+        var selfMessage = Loc.GetString(ent.Comp.CatchingFailedMessageSelf, ("item", ent.Owner), ("catcher", Identity.Entity(ent.Owner, EntityManager)));
+        var othersMessage = Loc.GetString(ent.Comp.CatchingFailedMessageOthers, ("item", ent.Owner), ("catcher", Identity.Entity(ent.Owner, EntityManager)));
+        _popup.PopupEntity(selfMessage, ent.Owner, ent.Owner);
+        _popup.PopupEntity(othersMessage, ent.Owner, Filter.PvsExcept(ent.Owner), true);
+        _audio.PlayPvs(ent.Comp.ClumsySound, ent);
+    }
+
     private void BeforeGunShotEvent(Entity<ClumsyComponent> ent, ref SelfBeforeGunShotEvent args)
     {
         // Clumsy people sometimes can't shoot :(
@@ -78,7 +120,10 @@ public sealed class ClumsySystem : EntitySystem
         if (args.Gun.Comp.ClumsyProof)
             return;
 
-        if (!_random.Prob(ent.Comp.ClumsyDefaultCheck))
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(args.Gun).Id });
+        var rand = new System.Random(seed);
+        if (!rand.Prob(ent.Comp.ClumsyDefaultCheck))
             return;
 
         if (ent.Comp.GunShootFailDamage != null)
@@ -90,7 +135,7 @@ public sealed class ClumsySystem : EntitySystem
         _audio.PlayPvs(ent.Comp.GunShootFailSound, ent);
         _audio.PlayPvs(ent.Comp.ClumsySound, ent);
 
-        _popup.PopupEntity(Loc.GetString("gun-clumsy"), ent, ent);
+        _popup.PopupEntity(Loc.GetString(ent.Comp.GunFailedMessage), ent, ent);
         args.Cancel();
     }
 
@@ -100,9 +145,9 @@ public sealed class ClumsySystem : EntitySystem
         if (!ent.Comp.ClumsyVaulting)
             return;
 
-        // This event is called in shared, thats why it has all the extra prediction stuff.
-        var rand = new System.Random((int)_timing.CurTick.Value);
-
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id });
+        var rand = new System.Random(seed);
         if (!_cfg.GetCVar(CCVars.GameTableBonk) && !rand.Prob(ent.Comp.ClumsyDefaultCheck))
             return;
 
diff --git a/Content.Shared/Damage/Components/StaminaComponent.cs b/Content.Shared/Damage/Components/StaminaComponent.cs
index ec086625ea..3a85f3f8dc 100644
--- a/Content.Shared/Damage/Components/StaminaComponent.cs
+++ b/Content.Shared/Damage/Components/StaminaComponent.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Alert;
 using Content.Shared.FixedPoint;
 using Robust.Shared.GameStates;
@@ -75,4 +76,82 @@ public sealed partial class StaminaComponent : Component
     /// </summary>
     [DataField]
     public Dictionary<FixedPoint2, float> StunModifierThresholds = new() { {0, 1f }, { 60, 0.7f }, { 80, 0.5f } };
+
+    #region Animation Data
+
+    /// <summary>
+    /// Threshold at which low stamina animations begin playing. This should be set to a value that means something.
+    /// At 50, it is aligned so when you hit 60 stun the entity will be breathing once per second (well above hyperventilation).
+    /// </summary>
+    [DataField]
+    public float AnimationThreshold = 50;
+
+    /// <summary>
+    /// Minimum y vector displacement for breathing at AnimationThreshold
+    /// </summary>
+    [DataField]
+    public float BreathingAmplitudeMin = 0.04f;
+
+    /// <summary>
+    /// Maximum y vector amount we add to the BreathingAmplitudeMin
+    /// </summary>
+    [DataField]
+    public float BreathingAmplitudeMod = 0.04f;
+
+    /// <summary>
+    /// Minimum vector displacement for jittering at AnimationThreshold
+    /// </summary>
+    [DataField]
+    public float JitterAmplitudeMin;
+
+    /// <summary>
+    /// Maximum vector amount we add to the JitterAmplitudeMin
+    /// </summary>
+    [DataField]
+    public float JitterAmplitudeMod = 0.04f;
+
+    /// <summary>
+    /// Min multipliers for JitterAmplitude in the X and Y directions, animation randomly chooses between these min and max multipliers
+    /// </summary>
+    [DataField]
+    public Vector2 JitterMin = Vector2.Create(0.5f, 0.125f);
+
+    /// <summary>
+    /// Max multipliers for JitterAmplitude in the X and Y directions, animation randomly chooses between these min and max multipliers
+    /// </summary>
+    [DataField]
+    public Vector2 JitterMax = Vector2.Create(1f, 0.25f);
+
+    /// <summary>
+    /// Minimum total animations per second
+    /// </summary>
+    [DataField]
+    public float FrequencyMin = 0.25f;
+
+    /// <summary>
+    /// Maximum amount we add to the Frequency min just before crit
+    /// </summary>
+    [DataField]
+    public float FrequencyMod = 1.75f;
+
+    /// <summary>
+    /// Jitter keyframes per animation
+    /// </summary>
+    [DataField]
+    public int Jitters = 4;
+
+    /// <summary>
+    /// Vector of the last Jitter so we can make sure we don't jitter in the same quadrant twice in a row.
+    /// </summary>
+    [DataField]
+    public Vector2 LastJitter;
+
+    /// <summary>
+    ///     The offset that an entity had before jittering started,
+    ///     so that we can reset it properly.
+    /// </summary>
+    [DataField]
+    public Vector2 StartOffset = Vector2.Zero;
+
+    #endregion
 }
diff --git a/Content.Shared/Damage/Prototypes/DamageContainerPrototype.cs b/Content.Shared/Damage/Prototypes/DamageContainerPrototype.cs
index 95de0fb29d..00322f0884 100644
--- a/Content.Shared/Damage/Prototypes/DamageContainerPrototype.cs
+++ b/Content.Shared/Damage/Prototypes/DamageContainerPrototype.cs
@@ -1,6 +1,5 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Damage.Prototypes
 {
@@ -22,14 +21,14 @@ namespace Content.Shared.Damage.Prototypes
         /// <summary>
         ///     List of damage groups that are supported by this container.
         /// </summary>
-        [DataField("supportedGroups", customTypeSerializer: typeof(PrototypeIdListSerializer<DamageGroupPrototype>))]
-        public List<string> SupportedGroups = new();
+        [DataField]
+        public List<ProtoId<DamageGroupPrototype>> SupportedGroups = new();
 
         /// <summary>
         ///     Partial List of damage types supported by this container. Note that members of the damage groups listed
         ///     in <see cref="SupportedGroups"/> are also supported, but they are not included in this list.
         /// </summary>
-        [DataField("supportedTypes", customTypeSerializer: typeof(PrototypeIdListSerializer<DamageTypePrototype>))]
-        public List<string> SupportedTypes = new();
+        [DataField]
+        public List<ProtoId<DamageTypePrototype>> SupportedTypes = new();
     }
 }
diff --git a/Content.Shared/Damage/Prototypes/DamageGroupPrototype.cs b/Content.Shared/Damage/Prototypes/DamageGroupPrototype.cs
index 7615724467..a33064f934 100644
--- a/Content.Shared/Damage/Prototypes/DamageGroupPrototype.cs
+++ b/Content.Shared/Damage/Prototypes/DamageGroupPrototype.cs
@@ -1,6 +1,5 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Damage.Prototypes
 {
@@ -22,7 +21,7 @@ namespace Content.Shared.Damage.Prototypes
         [ViewVariables(VVAccess.ReadOnly)]
         public string LocalizedName => Loc.GetString(Name);
 
-        [DataField("damageTypes", required: true, customTypeSerializer: typeof(PrototypeIdListSerializer<DamageTypePrototype>))]
-        public List<string> DamageTypes { get; private set; } = default!;
+        [DataField(required: true)]
+        public List<ProtoId<DamageTypePrototype>> DamageTypes { get; private set; } = default!;
     }
 }
diff --git a/Content.Shared/Damage/Prototypes/ExaminableDamagePrototype.cs b/Content.Shared/Damage/Prototypes/ExaminableDamagePrototype.cs
deleted file mode 100644
index 4d28412334..0000000000
--- a/Content.Shared/Damage/Prototypes/ExaminableDamagePrototype.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Damage.Prototypes;
-
-/// <summary>
-///     Prototype for examinable damage messages.
-/// </summary>
-[Prototype]
-public sealed partial class ExaminableDamagePrototype : IPrototype
-{
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    /// <summary>
-    ///     List of damage messages IDs sorted by severity.
-    ///     First one describes fully intact entity.
-    ///     Last one describes almost destroyed.
-    /// </summary>
-    [DataField("messages")]
-    public string[] Messages = {};
-}
diff --git a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
index 68d5834d46..aa211f0850 100644
--- a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
+++ b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
@@ -20,26 +20,27 @@ using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
+using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Damage.Systems;
 
 public abstract partial class SharedStaminaSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly MetaDataSystem _metadata = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
-    [Dependency] private readonly SharedStunSystem _stunSystem = default!;
+    [Dependency] protected readonly SharedStunSystem StunSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
 
     /// <summary>
     /// How much of a buffer is there between the stun duration and when stuns can be re-applied.
     /// </summary>
-    private static readonly TimeSpan StamCritBufferTime = TimeSpan.FromSeconds(3f);
+    protected static readonly TimeSpan StamCritBufferTime = TimeSpan.FromSeconds(3f);
 
     public float UniversalStaminaDamageModifier { get; private set; } = 1f;
 
@@ -66,31 +67,31 @@ public abstract partial class SharedStaminaSystem : EntitySystem
         Subs.CVar(_config, CCVars.PlaytestStaminaDamageModifier, value => UniversalStaminaDamageModifier = value, true);
     }
 
-    private void OnStamHandleState(EntityUid uid, StaminaComponent component, ref AfterAutoHandleStateEvent args)
+    protected virtual void OnStamHandleState(Entity<StaminaComponent> entity, ref AfterAutoHandleStateEvent args)
     {
-        if (component.Critical)
-            EnterStamCrit(uid, component);
+        if (entity.Comp.Critical)
+            EnterStamCrit(entity);
         else
         {
-            if (component.StaminaDamage > 0f)
-                EnsureComp<ActiveStaminaComponent>(uid);
+            if (entity.Comp.StaminaDamage > 0f)
+                EnsureComp<ActiveStaminaComponent>(entity);
 
-            ExitStamCrit(uid, component);
+            ExitStamCrit(entity);
         }
     }
 
-    private void OnShutdown(EntityUid uid, StaminaComponent component, ComponentShutdown args)
+    protected virtual void OnShutdown(Entity<StaminaComponent> entity, ref ComponentShutdown args)
     {
-        if (MetaData(uid).EntityLifeStage < EntityLifeStage.Terminating)
+        if (MetaData(entity).EntityLifeStage < EntityLifeStage.Terminating)
         {
-            RemCompDeferred<ActiveStaminaComponent>(uid);
+            RemCompDeferred<ActiveStaminaComponent>(entity);
         }
-        _alerts.ClearAlert(uid, component.StaminaAlert);
+        _alerts.ClearAlert(entity, entity.Comp.StaminaAlert);
     }
 
-    private void OnStartup(EntityUid uid, StaminaComponent component, ComponentStartup args)
+    private void OnStartup(Entity<StaminaComponent> entity, ref ComponentStartup args)
     {
-        SetStaminaAlert(uid, component);
+        UpdateStaminaVisuals(entity);
     }
 
     [PublicAPI]
@@ -99,23 +100,23 @@ public abstract partial class SharedStaminaSystem : EntitySystem
         if (!Resolve(uid, ref component))
             return 0f;
 
-        var curTime = _timing.CurTime;
+        var curTime = Timing.CurTime;
         var pauseTime = _metadata.GetPauseTime(uid);
         return MathF.Max(0f, component.StaminaDamage - MathF.Max(0f, (float) (curTime - (component.NextUpdate + pauseTime)).TotalSeconds * component.Decay));
     }
 
-    private void OnRejuvenate(EntityUid uid, StaminaComponent component, RejuvenateEvent args)
+    private void OnRejuvenate(Entity<StaminaComponent> entity, ref RejuvenateEvent args)
     {
-        if (component.StaminaDamage >= component.CritThreshold)
+        if (entity.Comp.StaminaDamage >= entity.Comp.CritThreshold)
         {
-            ExitStamCrit(uid, component);
+            ExitStamCrit(entity, entity.Comp);
         }
 
-        component.StaminaDamage = 0;
-        //AdjustSlowdown(uid);  //CP14 - no stamina slowdown
-        RemComp<ActiveStaminaComponent>(uid);
-        SetStaminaAlert(uid, component);
-        Dirty(uid, component);
+        entity.Comp.StaminaDamage = 0;
+        //AdjustSlowdown(entity.Owner);
+        RemComp<ActiveStaminaComponent>(entity);
+        UpdateStaminaVisuals(entity);
+        Dirty(entity);
     }
 
     private void OnDisarmed(EntityUid uid, StaminaComponent component, ref DisarmedEvent args)
@@ -212,6 +213,15 @@ public abstract partial class SharedStaminaSystem : EntitySystem
         TakeStaminaDamage(target, component.Damage, source: uid, sound: component.Sound);
     }
 
+    private void UpdateStaminaVisuals(Entity<StaminaComponent> entity)
+    {
+        SetStaminaAlert(entity, entity.Comp);
+        SetStaminaAnimation(entity);
+    }
+
+    // Here so server can properly tell all clients in PVS range to start the animation
+    protected virtual void SetStaminaAnimation(Entity<StaminaComponent> entity){}
+
     public void SetStaminaAlert(EntityUid uid, StaminaComponent? component = null) //CP14 public. Need proper RestoreStaminaFunction in upstream.
     {
         if (!Resolve(uid, ref component, false) || component.Deleted)
@@ -268,7 +278,7 @@ public abstract partial class SharedStaminaSystem : EntitySystem
         // Reset the decay cooldown upon taking damage.
         if (oldDamage < component.StaminaDamage)
         {
-            var nextUpdate = _timing.CurTime + TimeSpan.FromSeconds(component.Cooldown);
+            var nextUpdate = Timing.CurTime + TimeSpan.FromSeconds(component.Cooldown);
 
             if (component.NextUpdate < nextUpdate)
                 component.NextUpdate = nextUpdate;
@@ -276,7 +286,7 @@ public abstract partial class SharedStaminaSystem : EntitySystem
 
         //AdjustSlowdown(uid); //CP14 - no stamina slowdown
 
-        SetStaminaAlert(uid, component);
+        UpdateStaminaVisuals((uid, component));
 
         // Checking if the stamina damage has decreased to zero after exiting the stamcrit
         if (component.AfterCritical && oldDamage > component.StaminaDamage && component.StaminaDamage <= 0f)
@@ -330,7 +340,7 @@ public abstract partial class SharedStaminaSystem : EntitySystem
 
         var stamQuery = GetEntityQuery<StaminaComponent>();
         var query = EntityQueryEnumerator<ActiveStaminaComponent>();
-        var curTime = _timing.CurTime;
+        var curTime = Timing.CurTime;
 
         while (query.MoveNext(out var uid, out _))
         {
@@ -371,16 +381,14 @@ public abstract partial class SharedStaminaSystem : EntitySystem
             return;
         }
 
-        // To make the difference between a stun and a stamcrit clear
-        // TODO: Mask?
-
         component.Critical = true;
         component.StaminaDamage = component.CritThreshold;
 
-        _stunSystem.TryParalyze(uid, component.StunTime, true);
+        if (StunSystem.TryParalyze(uid, component.StunTime, true))
+            StunSystem.TrySeeingStars(uid);
 
         // Give them buffer before being able to be re-stunned
-        component.NextUpdate = _timing.CurTime + component.StunTime + StamCritBufferTime;
+        component.NextUpdate = Timing.CurTime + component.StunTime + StamCritBufferTime;
         EnsureComp<ActiveStaminaComponent>(uid);
         Dirty(uid, component);
         _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(uid):user} entered stamina crit");
@@ -396,9 +404,9 @@ public abstract partial class SharedStaminaSystem : EntitySystem
 
         component.Critical = false;
         component.AfterCritical = true;  // Set to true to indicate that stamina will be restored after exiting stamcrit
-        component.NextUpdate = _timing.CurTime;
+        component.NextUpdate = Timing.CurTime;
 
-        SetStaminaAlert(uid, component);
+        UpdateStaminaVisuals((uid, component));
         Dirty(uid, component);
         _adminLogger.Add(LogType.Stamina, LogImpact.Low, $"{ToPrettyString(uid):user} recovered from stamina crit");
     }
@@ -427,6 +435,12 @@ public abstract partial class SharedStaminaSystem : EntitySystem
                 closest = thres.Key;
         }
 
-        _stunSystem.UpdateStunModifiers(ent, ent.Comp.StunModifierThresholds[closest]);
+        StunSystem.UpdateStunModifiers(ent, ent.Comp.StunModifierThresholds[closest]);
+    }
+
+    [Serializable, NetSerializable]
+    public sealed class StaminaAnimationEvent(NetEntity entity) : EntityEventArgs
+    {
+        public NetEntity Entity = entity;
     }
 }
diff --git a/Content.Shared/Delivery/SharedDeliverySystem.cs b/Content.Shared/Delivery/SharedDeliverySystem.cs
index 52f83500e1..d7fc40dcc6 100644
--- a/Content.Shared/Delivery/SharedDeliverySystem.cs
+++ b/Content.Shared/Delivery/SharedDeliverySystem.cs
@@ -185,7 +185,7 @@ public abstract class SharedDeliverySystem : EntitySystem
 
         if (!force)
             _popup.PopupPredicted(Loc.GetString("delivery-unlocked-self", ("delivery", deliveryName)),
-                Loc.GetString("delivery-unlocked-others", ("delivery", deliveryName), ("recipient", Identity.Name(user, EntityManager)), ("possadj", user)), user, user);
+                Loc.GetString("delivery-unlocked-others", ("delivery", deliveryName), ("recipient", Identity.Entity(user, EntityManager)), ("possadj", user)), user, user);
 
         return true;
     }
@@ -213,7 +213,7 @@ public abstract class SharedDeliverySystem : EntitySystem
 
         if (!force)
             _popup.PopupPredicted(Loc.GetString("delivery-opened-self", ("delivery", deliveryName)),
-                Loc.GetString("delivery-opened-others", ("delivery", deliveryName), ("recipient", Identity.Name(user, EntityManager)), ("possadj", user)), user, user);
+                Loc.GetString("delivery-opened-others", ("delivery", deliveryName), ("recipient", Identity.Entity(user, EntityManager)), ("possadj", user)), user, user);
 
         if (!_container.TryGetContainer(ent, ent.Comp.Container, out var container))
             return;
diff --git a/Content.Shared/Devour/Components/DevourerComponent.cs b/Content.Shared/Devour/Components/DevourerComponent.cs
index fbeec28ca5..857e99062c 100644
--- a/Content.Shared/Devour/Components/DevourerComponent.cs
+++ b/Content.Shared/Devour/Components/DevourerComponent.cs
@@ -4,53 +4,79 @@ using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Devour.Components;
 
-[RegisterComponent, NetworkedComponent]
-[Access(typeof(SharedDevourSystem))]
+/// <summary>
+/// Allows an entity to eat whitelisted entities via an action.
+/// Eaten mobs will be stored inside a container and released when the devourer is gibbed.
+/// Eating something that fits their food preference will reward the devourer by being injected with a specific reagent.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(DevourSystem))]
 public sealed partial class DevourerComponent : Component
 {
-    [DataField("devourAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string? DevourAction = "ActionDevour";
+    /// <summary>
+    /// Action prototype for devouring.
+    /// </summary>
+    [DataField]
+    public EntProtoId DevourAction = "ActionDevour";
 
-    [DataField("devourActionEntity")]
+    /// <summary>
+    /// The spawned action entity for devouring.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public EntityUid? DevourActionEntity;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("soundDevour")]
+    /// <summary>
+    /// The amount of time it takes to devour a mob.
+    /// <remarks>
+    [DataField, AutoNetworkedField]
+    public float DevourTime = 3f;
+
+    /// <summary>
+    /// The amount of time it takes to devour a structure.
+    /// <remarks>
+    /// NOTE: original intended design was to increase this proportionally with damage thresholds, but those proved quite difficult to get consistently. right now it devours the structure at a fixed timer.
+    /// </remarks>
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float StructureDevourTime = 10f;
+
+    /// <summary>
+    /// The sound to play when finishing devouring something.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? SoundDevour = new SoundPathSpecifier("/Audio/Effects/demon_consume.ogg")
     {
         Params = AudioParams.Default.WithVolume(-3f),
     };
 
-    [DataField("devourTime")]
-    public float DevourTime = 3f;
-
     /// <summary>
-    /// The amount of time it takes to devour something
-    /// <remarks>
-    /// NOTE: original intended design was to increase this proportionally with damage thresholds, but those proved quite difficult to get consistently. right now it devours the structure at a fixed timer.
-    /// </remarks>
+    /// The sound to play when starting to devour a structure.
     /// </summary>
-    [DataField("structureDevourTime")]
-    public float StructureDevourTime = 10f;
-
-    [ViewVariables(VVAccess.ReadWrite), DataField("soundStructureDevour")]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? SoundStructureDevour = new SoundPathSpecifier("/Audio/Machines/airlock_creaking.ogg")
     {
         Params = AudioParams.Default.WithVolume(-3f),
     };
 
+    /// <summary>
+    /// The container to store the eaten entities in.
+    /// </summary>
+    [ViewVariables]
+    public static string StomachContainerId = "stomach";
+
     /// <summary>
     /// Where the entities go when it devours them, empties when it is butchered.
     /// </summary>
+    [ViewVariables]
     public Container Stomach = default!;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("shouldStoreDevoured")]
-    public bool ShouldStoreDevoured = true;
-
-    [ViewVariables(VVAccess.ReadWrite), DataField("whitelist")]
+    /// <summary>
+    /// Determines what things the devourer can consume.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public EntityWhitelist? Whitelist = new()
     {
         Components = new[]
@@ -60,21 +86,30 @@ public sealed partial class DevourerComponent : Component
     };
 
     /// <summary>
-    /// The chemical ID injected upon devouring
+    /// Determines what things end up in the dragon's stomach if they eat it.
+    /// If it isn't in the whitelist, it's deleted.
     /// </summary>
-    [DataField("chemical", customTypeSerializer: typeof(PrototypeIdSerializer<ReagentPrototype>))]
-    public string Chemical = "Ichor";
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? StomachStorageWhitelist;
 
     /// <summary>
-    /// The amount of ichor injected per devour
+    /// Determine's the dragon's food preference. If the eaten thing matches,
+    /// it is rewarded with the reward chemical. If null, all food is fine.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("healRate")]
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? FoodPreferenceWhitelist;
+
+    /// <summary>
+    /// The chemical ID injected upon devouring.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<ReagentPrototype> Chemical = "Ichor";
+
+    /// <summary>
+    /// The amount of solution injected per devour.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public float HealRate = 15f;
 
-    /// <summary>
-    /// The favorite food not only feeds you, but also heals
-    /// </summary>
-    [DataField("foodPreference")]
-    public FoodPreference FoodPreference = FoodPreference.All;
 }
 
diff --git a/Content.Shared/Devour/DevourSystem.cs b/Content.Shared/Devour/DevourSystem.cs
new file mode 100644
index 0000000000..71b1bd6396
--- /dev/null
+++ b/Content.Shared/Devour/DevourSystem.cs
@@ -0,0 +1,145 @@
+using Content.Shared.Actions;
+using Content.Shared.Body.Events;
+using Content.Shared.Body.Systems;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Devour.Components;
+using Content.Shared.DoAfter;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Popups;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Devour;
+
+public sealed class DevourSystem : EntitySystem
+{
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private readonly SharedBloodstreamSystem _bloodstreamSystem = default!;
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DevourerComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<DevourerComponent, MapInitEvent>(OnInit);
+        SubscribeLocalEvent<DevourerComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<DevourerComponent, DevourActionEvent>(OnDevourAction);
+        SubscribeLocalEvent<DevourerComponent, DevourDoAfterEvent>(OnDoAfter);
+        SubscribeLocalEvent<DevourerComponent, BeingGibbedEvent>(OnGibContents);
+    }
+
+    private void OnStartup(Entity<DevourerComponent> ent, ref ComponentStartup args)
+    {
+        //Devourer doesn't actually chew, since he sends targets right into his stomach.
+        //I did it mom, I added ERP content into upstream. Legally!
+        ent.Comp.Stomach = _containerSystem.EnsureContainer<Container>(ent.Owner, DevourerComponent.StomachContainerId);
+    }
+
+    private void OnInit(Entity<DevourerComponent> ent, ref MapInitEvent args)
+    {
+        _actionsSystem.AddAction(ent.Owner, ref ent.Comp.DevourActionEntity, ent.Comp.DevourAction);
+    }
+
+    private void OnShutdown(Entity<DevourerComponent> ent, ref ComponentShutdown args)
+    {
+        _actionsSystem.RemoveAction(ent.Owner, ent.Comp.DevourActionEntity);
+    }
+
+    /// <summary>
+    /// The devour action
+    /// </summary>
+    private void OnDevourAction(Entity<DevourerComponent> ent, ref DevourActionEvent args)
+    {
+        if (args.Handled || _whitelistSystem.IsWhitelistFailOrNull(ent.Comp.Whitelist, args.Target))
+            return;
+
+        args.Handled = true;
+        var target = args.Target;
+
+        // Structure and mob devours handled differently.
+        if (TryComp(target, out MobStateComponent? targetState))
+        {
+            switch (targetState.CurrentState)
+            {
+                case MobState.Critical:
+                case MobState.Dead:
+
+                    _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, ent.Owner, ent.Comp.DevourTime, new DevourDoAfterEvent(), ent.Owner, target: target, used: ent.Owner)
+                    {
+                        BreakOnMove = true,
+                    });
+                    break;
+                case MobState.Invalid:
+                case MobState.Alive:
+                default:
+                    _popupSystem.PopupClient(Loc.GetString("devour-action-popup-message-fail-target-alive"), ent.Owner, ent.Owner);
+                    break;
+            }
+
+            return;
+        }
+
+        _popupSystem.PopupClient(Loc.GetString("devour-action-popup-message-structure"), ent.Owner, ent.Owner);
+
+        if (ent.Comp.SoundStructureDevour != null)
+            _audioSystem.PlayPredicted(ent.Comp.SoundStructureDevour, ent.Owner, ent.Owner, ent.Comp.SoundStructureDevour.Params);
+
+        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, ent.Owner, ent.Comp.StructureDevourTime, new DevourDoAfterEvent(), ent.Owner, target: target, used: ent.Owner)
+        {
+            BreakOnMove = true,
+        });
+    }
+
+    private void OnDoAfter(Entity<DevourerComponent> ent, ref DevourDoAfterEvent args)
+    {
+        if (args.Handled || args.Cancelled)
+            return;
+
+        var ichorInjection = new Solution(ent.Comp.Chemical, ent.Comp.HealRate);
+
+        // Grant ichor if the devoured thing meets the dragon's food preference
+        if (args.Args.Target != null && _whitelistSystem.IsWhitelistPassOrNull(ent.Comp.FoodPreferenceWhitelist, (EntityUid)args.Args.Target))
+        {
+            _bloodstreamSystem.TryAddToChemicals(ent.Owner, ichorInjection);
+        }
+
+        // If the devoured thing meets the stomach whitelist criteria, add it to the stomach
+        if (args.Args.Target != null && _whitelistSystem.IsWhitelistPass(ent.Comp.StomachStorageWhitelist, (EntityUid)args.Args.Target))
+        {
+            _containerSystem.Insert(args.Args.Target.Value, ent.Comp.Stomach);
+        }
+        //TODO: Figure out a better way of removing structures via devour that still entails standing still and waiting for a DoAfter. Somehow.
+        //If it's not alive, it must be a structure.
+        // Delete if the thing isn't in the stomach storage whitelist (or the stomach whitelist is null/empty)
+        else if (args.Args.Target != null)
+        {
+            PredictedQueueDel(args.Args.Target.Value);
+        }
+
+        _audioSystem.PlayPredicted(ent.Comp.SoundDevour, ent.Owner, ent.Owner);
+    }
+
+    private void OnGibContents(Entity<DevourerComponent> ent, ref BeingGibbedEvent args)
+    {
+        if (ent.Comp.StomachStorageWhitelist == null)
+            return;
+
+        // For some reason we have two different systems that should handle gibbing,
+        // and for some another reason GibbingSystem, which should empty all containers, doesn't get involved in this process
+        _containerSystem.EmptyContainer(ent.Comp.Stomach);
+    }
+}
+
+public sealed partial class DevourActionEvent : EntityTargetActionEvent;
+
+[Serializable, NetSerializable]
+public sealed partial class DevourDoAfterEvent : SimpleDoAfterEvent;
+
diff --git a/Content.Shared/Devour/SharedDevourSystem.cs b/Content.Shared/Devour/SharedDevourSystem.cs
deleted file mode 100644
index 14047fba7d..0000000000
--- a/Content.Shared/Devour/SharedDevourSystem.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Devour.Components;
-using Content.Shared.DoAfter;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Popups;
-using Content.Shared.Whitelist;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Containers;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Devour;
-
-public abstract class SharedDevourSystem : EntitySystem
-{
-    [Dependency] protected readonly SharedAudioSystem _audioSystem = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-    [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
-    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<DevourerComponent, MapInitEvent>(OnInit);
-        SubscribeLocalEvent<DevourerComponent, DevourActionEvent>(OnDevourAction);
-    }
-
-    protected void OnInit(EntityUid uid, DevourerComponent component, MapInitEvent args)
-    {
-        //Devourer doesn't actually chew, since he sends targets right into his stomach.
-        //I did it mom, I added ERP content into upstream. Legally!
-        component.Stomach = ContainerSystem.EnsureContainer<Container>(uid, "stomach");
-
-        _actionsSystem.AddAction(uid, ref component.DevourActionEntity, component.DevourAction);
-    }
-
-    /// <summary>
-    /// The devour action
-    /// </summary>
-    protected void OnDevourAction(EntityUid uid, DevourerComponent component, DevourActionEvent args)
-    {
-        if (args.Handled || _whitelistSystem.IsWhitelistFailOrNull(component.Whitelist, args.Target))
-            return;
-
-        args.Handled = true;
-        var target = args.Target;
-
-        // Structure and mob devours handled differently.
-        if (TryComp(target, out MobStateComponent? targetState))
-        {
-            switch (targetState.CurrentState)
-            {
-                case MobState.Critical:
-                case MobState.Dead:
-
-                    _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, component.DevourTime, new DevourDoAfterEvent(), uid, target: target, used: uid)
-                    {
-                        BreakOnMove = true,
-                    });
-                    break;
-                default:
-                    _popupSystem.PopupClient(Loc.GetString("devour-action-popup-message-fail-target-alive"), uid,uid);
-                    break;
-            }
-
-            return;
-        }
-
-        _popupSystem.PopupClient(Loc.GetString("devour-action-popup-message-structure"), uid, uid);
-
-        if (component.SoundStructureDevour != null)
-            _audioSystem.PlayPredicted(component.SoundStructureDevour, uid, uid, component.SoundStructureDevour.Params);
-
-        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, component.StructureDevourTime, new DevourDoAfterEvent(), uid, target: target, used: uid)
-        {
-            BreakOnMove = true,
-        });
-    }
-}
-
-public sealed partial class DevourActionEvent : EntityTargetActionEvent { }
-
-[Serializable, NetSerializable]
-public sealed partial class DevourDoAfterEvent : SimpleDoAfterEvent { }
-
-[Serializable, NetSerializable]
-public enum FoodPreference : byte
-{
-    Humanoid = 0,
-    All = 1
-}
diff --git a/Content.Shared/Doors/Components/DoorComponent.cs b/Content.Shared/Doors/Components/DoorComponent.cs
index bc56551f05..6e4bf47f62 100644
--- a/Content.Shared/Doors/Components/DoorComponent.cs
+++ b/Content.Shared/Doors/Components/DoorComponent.cs
@@ -317,7 +317,6 @@ public enum DoorVisuals : byte
     BoltLights,
     EmergencyLights,
     ClosedLights,
-    BaseRSI,
 }
 
 public enum DoorVisualLayers : byte
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index a0dba80bd9..7914a38334 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -23,6 +23,7 @@ using Robust.Shared.Timing;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
 using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Doors.Systems;
 
@@ -46,9 +47,7 @@ public abstract partial class SharedDoorSystem : EntitySystem
     [Dependency] private readonly SharedMapSystem _mapSystem = default!;
     [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!;
 
-
-    [ValidatePrototypeId<TagPrototype>]
-    public const string DoorBumpTag = "DoorBumpOpener";
+    public static readonly ProtoId<TagPrototype> DoorBumpTag = "DoorBumpOpener";
 
     /// <summary>
     ///     A set of doors that are currently opening, closing, or just queued to open/close after some delay.
diff --git a/Content.Shared/Drunk/DrunkSystem.cs b/Content.Shared/Drunk/DrunkSystem.cs
index 4f9429b6a6..236ce2dcd3 100644
--- a/Content.Shared/Drunk/DrunkSystem.cs
+++ b/Content.Shared/Drunk/DrunkSystem.cs
@@ -1,13 +1,13 @@
 using Content.Shared.Speech.EntitySystems;
 using Content.Shared.StatusEffect;
 using Content.Shared.Traits.Assorted;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Drunk;
 
 public abstract class SharedDrunkSystem : EntitySystem
 {
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    public const string DrunkKey = "Drunk";
+    public static readonly ProtoId<StatusEffectPrototype> DrunkKey = "Drunk";
 
     [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
     [Dependency] private readonly SharedSlurredSystem _slurredSystem = default!;
diff --git a/Content.Shared/Emag/Systems/EmagSystem.cs b/Content.Shared/Emag/Systems/EmagSystem.cs
index 7aa4303471..912c4bdaea 100644
--- a/Content.Shared/Emag/Systems/EmagSystem.cs
+++ b/Content.Shared/Emag/Systems/EmagSystem.cs
@@ -51,9 +51,9 @@ public sealed class EmagSystem : EntitySystem
     }
 
     /// <summary>
-    /// Does the emag effect on a specified entity
+    /// Does the emag effect on a specified entity with a specified EmagType. The optional field customEmagType can be used to override the emag type defined in the component.
     /// </summary>
-    public bool TryEmagEffect(Entity<EmagComponent?> ent, EntityUid user, EntityUid target)
+    public bool TryEmagEffect(Entity<EmagComponent?> ent, EntityUid user, EntityUid target, EmagType? customEmagType = null)
     {
         if (!Resolve(ent, ref ent.Comp, false))
             return false;
@@ -68,7 +68,9 @@ public sealed class EmagSystem : EntitySystem
             return false;
         }
 
-        var emaggedEvent = new GotEmaggedEvent(user, ent.Comp.EmagType);
+        var typeToUse = customEmagType ?? ent.Comp.EmagType;
+
+        var emaggedEvent = new GotEmaggedEvent(user, typeToUse);
         RaiseLocalEvent(target, ref emaggedEvent);
 
         if (!emaggedEvent.Handled)
@@ -78,7 +80,7 @@ public sealed class EmagSystem : EntitySystem
 
         _audio.PlayPredicted(ent.Comp.EmagSound, ent, ent);
 
-        _adminLogger.Add(LogType.Emag, LogImpact.High, $"{ToPrettyString(user):player} emagged {ToPrettyString(target):target} with flag(s): {ent.Comp.EmagType}");
+        _adminLogger.Add(LogType.Emag, LogImpact.High, $"{ToPrettyString(user):player} emagged {ToPrettyString(target):target} with flag(s): {typeToUse}");
 
         if (emaggedEvent.Handled)
             _sharedCharges.TryUseCharge(chargesEnt);
@@ -87,7 +89,7 @@ public sealed class EmagSystem : EntitySystem
         {
             EnsureComp<EmaggedComponent>(target, out var emaggedComp);
 
-            emaggedComp.EmagType |= ent.Comp.EmagType;
+            emaggedComp.EmagType |= typeToUse;
             Dirty(target, emaggedComp);
         }
 
@@ -129,9 +131,10 @@ public sealed class EmagSystem : EntitySystem
 
 [Flags]
 [Serializable, NetSerializable]
-public enum EmagType : byte
+public enum EmagType
 {
     None = 0,
+    All = ~None,
     Interaction = 1 << 1,
     Access = 1 << 2
 }
diff --git a/Content.Shared/Emoting/EmoteAttemptEvent.cs b/Content.Shared/Emoting/EmoteAttemptEvent.cs
deleted file mode 100644
index 359264664b..0000000000
--- a/Content.Shared/Emoting/EmoteAttemptEvent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Content.Shared.Emoting
-{
-    public sealed class EmoteAttemptEvent : CancellableEntityEventArgs
-    {
-        public EmoteAttemptEvent(EntityUid uid)
-        {
-            Uid = uid;
-        }
-
-        public EntityUid Uid { get; }
-    }
-}
diff --git a/Content.Shared/Emoting/EmoteEvents.cs b/Content.Shared/Emoting/EmoteEvents.cs
new file mode 100644
index 0000000000..ea3073f336
--- /dev/null
+++ b/Content.Shared/Emoting/EmoteEvents.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Chat.Prototypes;
+using Content.Shared.Inventory;
+
+namespace Content.Shared.Emoting;
+
+public sealed class EmoteAttemptEvent(EntityUid uid) : CancellableEntityEventArgs
+{
+    public EntityUid Uid { get; } = uid;
+}
+
+/// <summary>
+/// An event raised just before an emote is performed, providing systems with an opportunity to cancel the emote's performance.
+/// </summary>
+[ByRefEvent]
+public sealed class BeforeEmoteEvent(EntityUid source, EmotePrototype emote)
+    : CancellableEntityEventArgs, IInventoryRelayEvent
+{
+    public readonly EntityUid Source = source;
+    public readonly EmotePrototype Emote = emote;
+
+    /// <summary>
+    ///     The equipment that is blocking emoting. Should only be non-null if the event was canceled.
+    /// </summary>
+    public EntityUid? Blocker = null;
+
+    public SlotFlags TargetSlots => SlotFlags.WITHOUT_POCKET;
+}
diff --git a/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs b/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs
index 31294bc21f..cb30ef70c7 100644
--- a/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs
+++ b/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs
@@ -19,7 +19,7 @@ public sealed partial class Internals : EntityEffectCondition
         if (!args.EntityManager.TryGetComponent(args.TargetEntity, out InternalsComponent? internalsComp))
             return !UsingInternals; // They have no internals to wear.
 
-        var internalsState = internalsComp.GasTankEntity == null;
+        var internalsState = internalsComp.GasTankEntity != null; // If gas tank is not null, they are wearing internals
         return UsingInternals == internalsState;
     }
 
diff --git a/Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs b/Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs
new file mode 100644
index 0000000000..45ca740363
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Xenoarchaeology.Artifact.Components;
+using Content.Shared.Xenoarchaeology.Artifact;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+///     Restores durability in active artefact nodes.
+/// </summary>
+public sealed partial class ArtifactDurabilityRestore : EntityEffect
+{
+    /// <summary>
+    ///     Amount of durability that will be restored per effect interaction.
+    /// </summary>
+    [DataField]
+    public int RestoredDurability = 1;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var entMan = args.EntityManager;
+        var xenoArtifactSys = entMan.System<SharedXenoArtifactSystem>();
+
+        if (!entMan.TryGetComponent<XenoArtifactComponent>(args.TargetEntity, out var xenoArtifact))
+            return;
+
+        foreach (var node in xenoArtifactSys.GetActiveNodes((args.TargetEntity, xenoArtifact)))
+        {
+            xenoArtifactSys.AdjustNodeDurability(node.Owner, RestoredDurability);
+        }
+    }
+
+    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return Loc.GetString("reagent-effect-guidebook-artifact-durability-restore", ("restored", RestoredDurability));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs
index 5ebb8aad1b..a232d34925 100644
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs
@@ -34,7 +34,7 @@ public sealed partial class ModifyStatusEffect : EntityEffect
     /// <inheritdoc />
     public override void Effect(EntityEffectBaseArgs args)
     {
-        var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedStatusEffectsSystem>();
+        var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
 
         var time = Time;
         if (args is EntityEffectReagentArgs reagentArgs)
diff --git a/Content.Shared/EntityList/EntityListPrototype.cs b/Content.Shared/EntityList/EntityListPrototype.cs
index 0248e2100c..76646d00f7 100644
--- a/Content.Shared/EntityList/EntityListPrototype.cs
+++ b/Content.Shared/EntityList/EntityListPrototype.cs
@@ -1,6 +1,5 @@
 using System.Collections.Immutable;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.EntityList
 {
@@ -11,14 +10,14 @@ namespace Content.Shared.EntityList
         [IdDataField]
         public string ID { get; private set; } = default!;
 
-        [DataField("entities", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-        public ImmutableList<string> EntityIds { get; private set; } = ImmutableList<string>.Empty;
+        [DataField]
+        public ImmutableList<EntProtoId> Entities { get; private set; } = ImmutableList<EntProtoId>.Empty;
 
-        public IEnumerable<EntityPrototype> Entities(IPrototypeManager? prototypeManager = null)
+        public IEnumerable<EntityPrototype> GetEntities(IPrototypeManager? prototypeManager = null)
         {
             prototypeManager ??= IoCManager.Resolve<IPrototypeManager>();
 
-            foreach (var entityId in EntityIds)
+            foreach (var entityId in Entities)
             {
                 yield return prototypeManager.Index<EntityPrototype>(entityId);
             }
diff --git a/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs b/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs
index 1b62c45af4..68ccf4a6b8 100644
--- a/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs
+++ b/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs
@@ -15,7 +15,6 @@ public sealed class EyeClosingSystem : EntitySystem
     [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
 
     public override void Initialize()
     {
@@ -120,7 +119,7 @@ public sealed class EyeClosingSystem : EntitySystem
         var ev = new GetBlurEvent(blindable.Comp.EyeDamage);
         RaiseLocalEvent(blindable.Owner, ev);
 
-        if (_entityManager.TryGetComponent<EyeClosingComponent>(blindable, out var eyelids) && !eyelids.NaturallyCreated)
+        if (EntityManager.TryGetComponent<EyeClosingComponent>(blindable, out var eyelids) && !eyelids.NaturallyCreated)
             return;
 
         if (ev.Blur < BlurryVisionComponent.MaxMagnitude || ev.Blur >= blindable.Comp.MaxDamage)
@@ -135,6 +134,4 @@ public sealed class EyeClosingSystem : EntitySystem
     }
 }
 
-public sealed partial class ToggleEyesActionEvent : InstantActionEvent
-{
-}
+public sealed partial class ToggleEyesActionEvent : InstantActionEvent;
diff --git a/Content.Shared/Eye/Blinding/Systems/TemporaryBlindnessSystem.cs b/Content.Shared/Eye/Blinding/Systems/TemporaryBlindnessSystem.cs
index aa3ff9fdc3..34680b12ef 100644
--- a/Content.Shared/Eye/Blinding/Systems/TemporaryBlindnessSystem.cs
+++ b/Content.Shared/Eye/Blinding/Systems/TemporaryBlindnessSystem.cs
@@ -1,12 +1,12 @@
 using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.StatusEffect;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Eye.Blinding.Systems;
 
 public sealed class TemporaryBlindnessSystem : EntitySystem
 {
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    public const string BlindingStatusEffect = "TemporaryBlindness";
+    public static readonly ProtoId<StatusEffectPrototype> BlindingStatusEffect = "TemporaryBlindness";
 
     [Dependency] private readonly BlindableSystem _blindableSystem = default!;
 
diff --git a/Content.Shared/Fluids/AbsorbentComponent.cs b/Content.Shared/Fluids/AbsorbentComponent.cs
index 2d1a922381..c499a2d2ee 100644
--- a/Content.Shared/Fluids/AbsorbentComponent.cs
+++ b/Content.Shared/Fluids/AbsorbentComponent.cs
@@ -2,16 +2,22 @@ using Content.Shared.Audio;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Fluids;
 
 /// <summary>
 /// For entities that can clean up puddles
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class AbsorbentComponent : Component
 {
-    public Dictionary<Color, float> Progress = new();
+    /// <summary>
+    /// Used by the client to display a bar showing the reagents contained when held.
+    /// Has to still be networked in case the item is given to someone who didn't see a mop in PVS.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Dictionary<Color, float> Progress = [];
 
     /// <summary>
     /// Name for solution container, that should be used for absorbed solution storage and as source of absorber solution.
@@ -26,23 +32,23 @@ public sealed partial class AbsorbentComponent : Component
     [DataField]
     public FixedPoint2 PickupAmount = FixedPoint2.New(100);
 
+    /// <summary>
+    /// The effect spawned when the puddle fully evaporates.
+    /// </summary>
     [DataField]
-    public SoundSpecifier PickupSound = new SoundPathSpecifier("/Audio/Effects/Fluids/watersplash.ogg")
-    {
-        Params = AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation),
-    };
+    public EntProtoId MoppedEffect = "PuddleSparkle";
 
-    [DataField] public SoundSpecifier TransferSound =
-        new SoundPathSpecifier("/Audio/Effects/Fluids/slosh.ogg")
-        {
-            Params = AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation).WithVolume(-3f),
-        };
+    [DataField]
+    public SoundSpecifier PickupSound = new SoundPathSpecifier("/Audio/Effects/Fluids/watersplash.ogg",
+        AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation));
+
+    [DataField]
+    public SoundSpecifier TransferSound = new SoundPathSpecifier("/Audio/Effects/Fluids/slosh.ogg",
+        AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation).WithVolume(-3f));
 
     public static readonly SoundSpecifier DefaultTransferSound =
-        new SoundPathSpecifier("/Audio/Effects/Fluids/slosh.ogg")
-        {
-            Params = AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation).WithVolume(-3f),
-        };
+        new SoundPathSpecifier("/Audio/Effects/Fluids/slosh.ogg",
+            AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation).WithVolume(-3f));
 
     /// <summary>
     /// Marker that absorbent component owner should try to use 'absorber solution' to replace solution to be absorbed.
diff --git a/Content.Shared/Fluids/Components/DrainComponent.cs b/Content.Shared/Fluids/Components/DrainComponent.cs
index 305ed00b14..a7d7bbb3ad 100644
--- a/Content.Shared/Fluids/Components/DrainComponent.cs
+++ b/Content.Shared/Fluids/Components/DrainComponent.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Tag;
 using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Fluids.Components;
 
@@ -17,8 +18,7 @@ public sealed partial class DrainComponent : Component
 {
     public const string SolutionName = "drainBuffer";
 
-    [ValidatePrototypeId<TagPrototype>]
-    public const string PlungerTag = "Plunger";
+    public static readonly ProtoId<TagPrototype> PlungerTag = "Plunger";
 
     [ViewVariables]
     public Entity<SolutionComponent>? Solution = null;
diff --git a/Content.Shared/Fluids/Components/EvaporationComponent.cs b/Content.Shared/Fluids/Components/EvaporationComponent.cs
index 05569db85a..72ad5cafdd 100644
--- a/Content.Shared/Fluids/Components/EvaporationComponent.cs
+++ b/Content.Shared/Fluids/Components/EvaporationComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.FixedPoint;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Fluids.Components;
@@ -7,22 +8,28 @@ namespace Content.Shared.Fluids.Components;
 /// <summary>
 /// Added to puddles that contain water so it may evaporate over time.
 /// </summary>
-[NetworkedComponent]
+[NetworkedComponent, AutoGenerateComponentPause]
 [RegisterComponent, Access(typeof(SharedPuddleSystem))]
 public sealed partial class EvaporationComponent : Component
 {
     /// <summary>
     /// The next time we remove the EvaporationSystem reagent amount from this entity.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("nextTick", customTypeSerializer: typeof(TimeOffsetSerializer))]
-    public TimeSpan NextTick = TimeSpan.Zero;
+    [AutoPausedField, DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan NextTick;
 
     /// <summary>
     /// Evaporation factor. Multiplied by the evaporating speed of the reagent.
     /// </summary>
-    [DataField("evaporationAmount")]
+    [DataField]
     public FixedPoint2 EvaporationAmount = FixedPoint2.New(1);
 
+    /// <summary>
+    /// The effect spawned when the puddle fully evaporates.
+    /// </summary>
+    [DataField]
+    public EntProtoId EvaporationEffect = "PuddleSparkle";
+
     /// <summary>
     /// forcibly vaporizes ALL the chemicals
     /// </summary>
diff --git a/Content.Shared/Fluids/SharedAbsorbentSystem.cs b/Content.Shared/Fluids/SharedAbsorbentSystem.cs
index f121238d51..77f40aeee6 100644
--- a/Content.Shared/Fluids/SharedAbsorbentSystem.cs
+++ b/Content.Shared/Fluids/SharedAbsorbentSystem.cs
@@ -1,6 +1,16 @@
-using System.Linq;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
+using System.Numerics;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.FixedPoint;
+using Content.Shared.Fluids.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Item;
+using Content.Shared.Popups;
+using Content.Shared.Timing;
+using Content.Shared.Weapons.Melee;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Fluids;
 
@@ -9,41 +19,338 @@ namespace Content.Shared.Fluids;
 /// </summary>
 public abstract class SharedAbsorbentSystem : EntitySystem
 {
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedPopupSystem _popups = default!;
+    [Dependency] protected readonly SharedPuddleSystem Puddle = default!;
+    [Dependency] private readonly SharedMeleeWeaponSystem _melee = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] protected readonly SharedSolutionContainerSystem SolutionContainer = default!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
+    [Dependency] private readonly SharedItemSystem _item = default!;
+
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<AbsorbentComponent, ComponentGetState>(OnAbsorbentGetState);
-        SubscribeLocalEvent<AbsorbentComponent, ComponentHandleState>(OnAbsorbentHandleState);
+
+        SubscribeLocalEvent<AbsorbentComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<AbsorbentComponent, UserActivateInWorldEvent>(OnActivateInWorld);
+        SubscribeLocalEvent<AbsorbentComponent, SolutionContainerChangedEvent>(OnAbsorbentSolutionChange);
     }
 
-    private void OnAbsorbentHandleState(EntityUid uid, AbsorbentComponent component, ref ComponentHandleState args)
+    private void OnActivateInWorld(Entity<AbsorbentComponent> ent, ref UserActivateInWorldEvent args)
     {
-        if (args.Current is not AbsorbentComponentState state)
+        if (args.Handled)
             return;
 
-        if (component.Progress.OrderBy(x => x.Key.ToArgb()).SequenceEqual(state.Progress))
+        Mop(ent, args.User, args.Target);
+        args.Handled = true;
+    }
+
+    private void OnAfterInteract(Entity<AbsorbentComponent> ent, ref AfterInteractEvent args)
+    {
+        if (!args.CanReach || args.Handled || args.Target is not { } target)
             return;
 
-        component.Progress.Clear();
-        foreach (var item in state.Progress)
-        {
-            component.Progress.Add(item.Key, item.Value);
-        }
+        Mop(ent, args.User, target);
+        args.Handled = true;
     }
 
-    private void OnAbsorbentGetState(EntityUid uid, AbsorbentComponent component, ref ComponentGetState args)
+    private void OnAbsorbentSolutionChange(Entity<AbsorbentComponent> ent, ref SolutionContainerChangedEvent args)
     {
-        args.State = new AbsorbentComponentState(component.Progress);
+        if (!SolutionContainer.TryGetSolution(ent.Owner, ent.Comp.SolutionName, out _, out var solution))
+            return;
+
+        ent.Comp.Progress.Clear();
+
+        var absorbentReagents = Puddle.GetAbsorbentReagents(solution);
+        var mopReagent = solution.GetTotalPrototypeQuantity(absorbentReagents);
+        if (mopReagent > FixedPoint2.Zero)
+            ent.Comp.Progress[solution.GetColorWithOnly(_proto, absorbentReagents)] = mopReagent.Float();
+
+        var otherColor = solution.GetColorWithout(_proto, absorbentReagents);
+        var other = solution.Volume - mopReagent;
+        if (other > FixedPoint2.Zero)
+            ent.Comp.Progress[otherColor] = other.Float();
+
+        if (solution.AvailableVolume > FixedPoint2.Zero)
+            ent.Comp.Progress[Color.DarkGray] = solution.AvailableVolume.Float();
+
+        Dirty(ent);
+        _item.VisualsChanged(ent);
     }
 
-    [Serializable, NetSerializable]
-    protected sealed class AbsorbentComponentState : ComponentState
+    [Obsolete("Use Entity<T> variant")]
+    public void Mop(EntityUid user, EntityUid target, EntityUid used, AbsorbentComponent component)
     {
-        public Dictionary<Color, float> Progress;
+        Mop((used, component), user, target);
+    }
 
-        public AbsorbentComponentState(Dictionary<Color, float> progress)
+    public void Mop(Entity<AbsorbentComponent> absorbEnt, EntityUid user, EntityUid target)
+    {
+        if (!SolutionContainer.TryGetSolution(absorbEnt.Owner, absorbEnt.Comp.SolutionName, out var absorberSoln))
+            return;
+
+        // Use the non-optional form of IsDelayed to safe the TryComp in Mop
+        if (TryComp<UseDelayComponent>(absorbEnt, out var useDelay)
+            && _useDelay.IsDelayed((absorbEnt.Owner, useDelay)))
+            return;
+
+        // Try to slurp up the puddle.
+        // We're then done if our mop doesn't use absorber solutions, since those don't need refilling.
+        if (TryPuddleInteract((absorbEnt.Owner, absorbEnt.Comp, useDelay), absorberSoln.Value, user, target)
+            || !absorbEnt.Comp.UseAbsorberSolution)
+            return;
+
+        // If it's refillable try to transfer
+        TryRefillableInteract((absorbEnt.Owner, absorbEnt.Comp, useDelay), absorberSoln.Value, user, target);
+    }
+
+    /// <summary>
+    ///     Logic for an absorbing entity interacting with a refillable.
+    /// </summary>
+    private bool TryRefillableInteract(Entity<AbsorbentComponent, UseDelayComponent?> absorbEnt,
+        Entity<SolutionComponent> absorbentSoln,
+        EntityUid user,
+        EntityUid target)
+    {
+        if (!TryComp<RefillableSolutionComponent>(target, out var refillable))
+            return false;
+
+        if (!SolutionContainer.TryGetRefillableSolution((target, refillable, null),
+                out var refillableSoln,
+                out var refillableSolution))
+            return false;
+
+        if (refillableSolution.Volume <= 0)
         {
-            Progress = progress;
+            // Target empty - only transfer absorbent contents into refillable
+            if (!TryTransferFromAbsorbentToRefillable(absorbEnt, absorbentSoln, refillableSoln.Value, user, target))
+                return false;
         }
+        else
+        {
+            // Target non-empty - do a two-way transfer
+            if (!TryTwoWayAbsorbentRefillableTransfer(absorbEnt, absorbentSoln, refillableSoln.Value, user, target))
+                return false;
+        }
+
+        var (used, absorber, useDelay) = absorbEnt;
+        _audio.PlayPredicted(absorber.TransferSound, target, user);
+
+        if (useDelay != null)
+            _useDelay.TryResetDelay((used, useDelay));
+
+        return true;
+    }
+
+    /// <summary>
+    ///     Logic for an transferring solution from absorber to an empty refillable.
+    /// </summary>
+    private bool TryTransferFromAbsorbentToRefillable(Entity<AbsorbentComponent> absorbEnt,
+        Entity<SolutionComponent> absorbentSoln,
+        Entity<SolutionComponent> refillableSoln,
+        EntityUid user,
+        EntityUid target)
+    {
+        var absorbentSolution = absorbentSoln.Comp.Solution;
+        if (absorbentSolution.Volume <= 0)
+        {
+            _popups.PopupClient(Loc.GetString("mopping-system-target-container-empty", ("target", target)), user, user);
+            return false;
+        }
+
+        var refillableSolution = refillableSoln.Comp.Solution;
+        var transferAmount = absorbEnt.Comp.PickupAmount < refillableSolution.AvailableVolume
+            ? absorbEnt.Comp.PickupAmount
+            : refillableSolution.AvailableVolume;
+
+        if (transferAmount <= 0)
+        {
+            _popups.PopupClient(Loc.GetString("mopping-system-full", ("used", absorbEnt)), absorbEnt, user);
+            return false;
+        }
+
+        // Prioritize transferring non-evaporatives if absorbent has any
+        var contaminants = SolutionContainer.SplitSolutionWithout(absorbentSoln,
+            transferAmount,
+            Puddle.GetAbsorbentReagents(absorbentSoln.Comp.Solution));
+
+        SolutionContainer.TryAddSolution(refillableSoln,
+            contaminants.Volume > 0
+                ? contaminants
+                : SolutionContainer.SplitSolution(absorbentSoln, transferAmount));
+
+        return true;
+    }
+
+    /// <summary>
+    ///     Logic for an transferring contaminants to a non-empty refillable & reabsorbing water if any available.
+    /// </summary>
+    private bool TryTwoWayAbsorbentRefillableTransfer(Entity<AbsorbentComponent> absorbEnt,
+        Entity<SolutionComponent> absorbentSoln,
+        Entity<SolutionComponent> refillableSoln,
+        EntityUid user,
+        EntityUid target)
+    {
+        var contaminantsFromAbsorbent = SolutionContainer.SplitSolutionWithout(absorbentSoln,
+            absorbEnt.Comp.PickupAmount,
+            Puddle.GetAbsorbentReagents(absorbentSoln.Comp.Solution));
+
+        var absorbentSolution = absorbentSoln.Comp.Solution;
+        if (contaminantsFromAbsorbent.Volume == FixedPoint2.Zero
+            && absorbentSolution.AvailableVolume == FixedPoint2.Zero)
+        {
+            // Nothing to transfer to refillable and no room to absorb anything extra
+            _popups.PopupClient(Loc.GetString("mopping-system-puddle-space", ("used", absorbEnt)), user, user);
+
+            // We can return cleanly because nothing was split from absorbent solution
+            return false;
+        }
+
+        var waterPulled = absorbEnt.Comp.PickupAmount < absorbentSolution.AvailableVolume
+            ? absorbEnt.Comp.PickupAmount
+            : absorbentSolution.AvailableVolume;
+
+        var refillableSolution = refillableSoln.Comp.Solution;
+        var waterFromRefillable =
+            refillableSolution.SplitSolutionWithOnly(waterPulled,
+                Puddle.GetAbsorbentReagents(refillableSoln.Comp.Solution));
+        SolutionContainer.UpdateChemicals(refillableSoln);
+
+        if (waterFromRefillable.Volume == FixedPoint2.Zero && contaminantsFromAbsorbent.Volume == FixedPoint2.Zero)
+        {
+            // Nothing to transfer in either direction
+            _popups.PopupClient(Loc.GetString("mopping-system-target-container-empty-water", ("target", target)),
+                user,
+                user);
+
+            // We can return cleanly because nothing was split from refillable solution
+            return false;
+        }
+
+        var anyTransferOccurred = false;
+
+        if (waterFromRefillable.Volume > FixedPoint2.Zero)
+        {
+            // transfer water to absorbent
+            SolutionContainer.TryAddSolution(absorbentSoln, waterFromRefillable);
+            anyTransferOccurred = true;
+        }
+
+        if (contaminantsFromAbsorbent.Volume <= 0)
+            return anyTransferOccurred;
+
+        if (refillableSolution.AvailableVolume <= 0)
+        {
+            _popups.PopupClient(Loc.GetString("mopping-system-full", ("used", target)), user, user);
+        }
+        else
+        {
+            // transfer as much contaminants to refillable as will fit
+            var contaminantsForRefillable = contaminantsFromAbsorbent.SplitSolution(refillableSolution.AvailableVolume);
+            SolutionContainer.TryAddSolution(refillableSoln, contaminantsForRefillable);
+            anyTransferOccurred = true;
+        }
+
+        // absorb everything that did not fit in the refillable back by the absorbent
+        SolutionContainer.TryAddSolution(absorbentSoln, contaminantsFromAbsorbent);
+
+        return anyTransferOccurred;
+    }
+
+    /// <summary>
+    ///     Logic for an absorbing entity interacting with a puddle.
+    /// </summary>
+    private bool TryPuddleInteract(Entity<AbsorbentComponent, UseDelayComponent?> absorbEnt,
+        Entity<SolutionComponent> absorberSoln,
+        EntityUid user,
+        EntityUid target)
+    {
+        if (!TryComp<PuddleComponent>(target, out var puddle))
+            return false;
+
+        if (!SolutionContainer.ResolveSolution(target, puddle.SolutionName, ref puddle.Solution, out var puddleSolution)
+            || puddleSolution.Volume <= 0)
+            return false;
+
+        var (_, absorber, useDelay) = absorbEnt;
+
+        Solution puddleSplit;
+        var isRemoved = false;
+        if (absorber.UseAbsorberSolution)
+        {
+            // No reason to mop something that 1) can evaporate, 2) is an absorber, and 3) is being mopped with
+            // something that uses absorbers.
+            var puddleAbsorberVolume =
+                puddleSolution.GetTotalPrototypeQuantity(Puddle.GetAbsorbentReagents(puddleSolution));
+            if (puddleAbsorberVolume == puddleSolution.Volume)
+            {
+                _popups.PopupClient(Loc.GetString("mopping-system-puddle-already-mopped", ("target", target)),
+                    target,
+                    user);
+                return true;
+            }
+
+            // Check if we have any evaporative reagents on our absorber to transfer
+            var absorberSolution = absorberSoln.Comp.Solution;
+            var available = absorberSolution.GetTotalPrototypeQuantity(Puddle.GetAbsorbentReagents(absorberSolution));
+
+            // No material
+            if (available == FixedPoint2.Zero)
+            {
+                _popups.PopupClient(Loc.GetString("mopping-system-no-water", ("used", absorbEnt)), absorbEnt, user);
+                return true;
+            }
+
+            var transferMax = absorber.PickupAmount;
+            var transferAmount = available > transferMax ? transferMax : available;
+
+            puddleSplit =
+                puddleSolution.SplitSolutionWithout(transferAmount, Puddle.GetAbsorbentReagents(puddleSolution));
+            var absorberSplit =
+                absorberSolution.SplitSolutionWithOnly(puddleSplit.Volume,
+                    Puddle.GetAbsorbentReagents(absorberSolution));
+
+            // Do tile reactions first
+            var targetXform = Transform(target);
+            var gridUid = targetXform.GridUid;
+            if (TryComp<MapGridComponent>(gridUid, out var mapGrid))
+            {
+                var tileRef = _mapSystem.GetTileRef(gridUid.Value, mapGrid, targetXform.Coordinates);
+                Puddle.DoTileReactions(tileRef, absorberSplit);
+            }
+            SolutionContainer.AddSolution(puddle.Solution.Value, absorberSplit);
+        }
+        else
+        {
+            // Note: arguably shouldn't this get all solutions?
+            puddleSplit = puddleSolution.SplitSolutionWithout(absorber.PickupAmount, Puddle.GetAbsorbentReagents(puddleSolution));
+            // Despawn if we're done
+            if (puddleSolution.Volume == FixedPoint2.Zero)
+            {
+                // Spawn a *sparkle*
+                PredictedSpawnAttachedTo(absorber.MoppedEffect, Transform(target).Coordinates);
+                PredictedQueueDel(target);
+                isRemoved = true;
+            }
+        }
+
+        SolutionContainer.AddSolution(absorberSoln, puddleSplit);
+
+        _audio.PlayPredicted(absorber.PickupSound, isRemoved ? absorbEnt : target, user);
+
+        if (useDelay != null)
+            _useDelay.TryResetDelay((absorbEnt, useDelay));
+
+        var userXform = Transform(user);
+        var targetPos = _transform.GetWorldPosition(target);
+        var localPos = Vector2.Transform(targetPos, _transform.GetInvWorldMatrix(userXform));
+        localPos = userXform.LocalRotation.RotateVec(localPos);
+
+        _melee.DoLunge(user, absorbEnt, Angle.Zero, localPos, null);
+
+        return true;
     }
 }
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.cs b/Content.Shared/Fluids/SharedPuddleSystem.cs
index 34ba8ba803..a2f0764ce0 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
@@ -8,6 +9,7 @@ using Content.Shared.FixedPoint;
 using Content.Shared.Fluids.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.StepTrigger.Components;
+using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
@@ -16,9 +18,16 @@ namespace Content.Shared.Fluids;
 public abstract partial class SharedPuddleSystem : EntitySystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
 
+    private static readonly ProtoId<ReagentPrototype> Blood = "Blood";
+    private static readonly ProtoId<ReagentPrototype> Slime = "Slime";
+    private static readonly ProtoId<ReagentPrototype> CopperBlood = "CopperBlood";
+
+    private static readonly string[] StandoutReagents = [Blood, Slime, CopperBlood];
+
     /// <summary>
     /// The lowest threshold to be considered for puddle sprite states as well as slipperiness of a puddle.
     /// </summary>
@@ -33,12 +42,23 @@ public abstract partial class SharedPuddleSystem : EntitySystem
         SubscribeLocalEvent<DumpableSolutionComponent, CanDropTargetEvent>(OnDumpCanDropTarget);
         SubscribeLocalEvent<DrainableSolutionComponent, CanDropTargetEvent>(OnDrainCanDropTarget);
         SubscribeLocalEvent<RefillableSolutionComponent, CanDropDraggedEvent>(OnRefillableCanDropDragged);
+
+        SubscribeLocalEvent<PuddleComponent, SolutionContainerChangedEvent>(OnSolutionUpdate);
         SubscribeLocalEvent<PuddleComponent, GetFootstepSoundEvent>(OnGetFootstepSound);
         SubscribeLocalEvent<PuddleComponent, ExaminedEvent>(HandlePuddleExamined);
+        SubscribeLocalEvent<PuddleComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
 
         InitializeSpillable();
     }
 
+    protected virtual void OnSolutionUpdate(Entity<PuddleComponent> entity, ref SolutionContainerChangedEvent args)
+    {
+        if (args.SolutionId != entity.Comp.SolutionName)
+            return;
+
+        UpdateAppearance((entity, entity.Comp));
+    }
+
     private void OnRefillableCanDrag(Entity<RefillableSolutionComponent> entity, ref CanDragEvent args)
     {
         args.Handled = true;
@@ -110,6 +130,68 @@ public abstract partial class SharedPuddleSystem : EntitySystem
         }
     }
 
+    // Workaround for https://github.com/space-wizards/space-station-14/pull/35314
+    private void OnEntRemoved(Entity<PuddleComponent> ent, ref EntRemovedFromContainerMessage args)
+    {
+        // Make sure the removed entity was our contained solution and clear our cached reference
+        if (args.Entity == ent.Comp.Solution?.Owner)
+            ent.Comp.Solution = null;
+    }
+
+    private void UpdateAppearance(Entity<PuddleComponent?, AppearanceComponent?> ent)
+    {
+        var (uid, puddle, appearance) = ent;
+        if (!Resolve(ent, ref puddle, ref appearance))
+            return;
+
+        var volume = FixedPoint2.Zero;
+        var color = Color.White;
+
+        if (_solutionContainerSystem.ResolveSolution(uid,
+                puddle.SolutionName,
+                ref puddle.Solution,
+                out var solution))
+        {
+            volume = solution.Volume / puddle.OverflowVolume;
+
+            // Make blood stand out more
+            // Kinda EH
+            // Could potentially do alpha per-solution but future problem.
+
+            color = solution.GetColorWithout(_prototypeManager, StandoutReagents);
+            color = color.WithAlpha(0.7f);
+
+            foreach (var standout in StandoutReagents)
+            {
+                var quantity = solution.GetTotalPrototypeQuantity(standout);
+                if (quantity <= FixedPoint2.Zero)
+                    continue;
+
+                var interpolateValue = quantity.Float() / solution.Volume.Float();
+                color = Color.InterpolateBetween(color,
+                    _prototypeManager.Index<ReagentPrototype>(standout).SubstanceColor,
+                    interpolateValue);
+            }
+        }
+
+        _appearance.SetData(ent, PuddleVisuals.CurrentVolume, volume.Float(), appearance);
+        _appearance.SetData(ent, PuddleVisuals.SolutionColor, color, appearance);
+    }
+
+    public void DoTileReactions(TileRef tileRef, Solution solution)
+    {
+        for (var i = solution.Contents.Count - 1; i >= 0; i--)
+        {
+            var (reagent, quantity) = solution.Contents[i];
+            var proto = _prototypeManager.Index<ReagentPrototype>(reagent.Prototype);
+            var removed = proto.ReactionTile(tileRef, quantity, EntityManager, reagent.Data);
+            if (removed <= FixedPoint2.Zero)
+                continue;
+
+            solution.RemoveReagent(reagent, removed);
+        }
+    }
+
     #region Spill
     // These methods are in Shared to make it easier to interact with PuddleSystem in Shared code.
     // Note that they always fail when run on the client, not creating a puddle and returning false.
diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs
index 71e2afbbdf..5d596815f4 100644
--- a/Content.Shared/GameTicking/SharedGameTicker.cs
+++ b/Content.Shared/GameTicking/SharedGameTicker.cs
@@ -18,8 +18,7 @@ namespace Content.Shared.GameTicking
         // See ideally these would be pulled from the job definition or something.
         // But this is easier, and at least it isn't hardcoded.
         //TODO: Move these, they really belong in StationJobsSystem or a cvar.
-        [ValidatePrototypeId<JobPrototype>]
-        public const string FallbackOverflowJob = "CP14Adventurer";
+        public static readonly ProtoId<JobPrototype> FallbackOverflowJob = "CP14Adventurer";
 
         public const string FallbackOverflowJobName = "cp14-job-name-adventurer";
 
diff --git a/Content.Shared/Gibbing/Systems/GibbingSystem.cs b/Content.Shared/Gibbing/Systems/GibbingSystem.cs
index 8c83de0cf2..9eaadbb970 100644
--- a/Content.Shared/Gibbing/Systems/GibbingSystem.cs
+++ b/Content.Shared/Gibbing/Systems/GibbingSystem.cs
@@ -187,7 +187,7 @@ public sealed class GibbingSystem : EntitySystem
         }
 
         if (gibType == GibType.Gib)
-            QueueDel(gibbable);
+            PredictedQueueDel(gibbable.Owner);
         return true;
     }
 
@@ -292,7 +292,7 @@ public sealed class GibbingSystem : EntitySystem
         var gibbedEvent = new EntityGibbedEvent(gibbable, localGibs);
         RaiseLocalEvent(gibbable, ref gibbedEvent);
         if (deleteTarget)
-            QueueDel(gibbable);
+            PredictedQueueDel(gibbable.Owner);
         return localGibs;
     }
 
diff --git a/Content.Shared/Gravity/SharedGravitySystem.cs b/Content.Shared/Gravity/SharedGravitySystem.cs
index 3ff9792e86..e20771d603 100644
--- a/Content.Shared/Gravity/SharedGravitySystem.cs
+++ b/Content.Shared/Gravity/SharedGravitySystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Movement.Components;
 using Robust.Shared.GameStates;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 
@@ -14,8 +15,7 @@ namespace Content.Shared.Gravity
         [Dependency] protected readonly IGameTiming Timing = default!;
         [Dependency] private readonly AlertsSystem _alerts = default!;
 
-        [ValidatePrototypeId<AlertPrototype>]
-        public const string WeightlessAlert = "Weightless";
+        public static readonly ProtoId<AlertPrototype> WeightlessAlert = "Weightless";
 
         private EntityQuery<GravityComponent> _gravityQuery;
 
diff --git a/Content.Shared/Hands/Components/ExtraHandsEquipmentComponent.cs b/Content.Shared/Hands/Components/ExtraHandsEquipmentComponent.cs
new file mode 100644
index 0000000000..fb3685c386
--- /dev/null
+++ b/Content.Shared/Hands/Components/ExtraHandsEquipmentComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+using Content.Shared.Hands.EntitySystems;
+
+namespace Content.Shared.Hands.Components;
+
+/// <summary>
+/// An entity with this component will give you extra hands when you equip it in your inventory.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(ExtraHandsEquipmentSystem))]
+public sealed partial class ExtraHandsEquipmentComponent : Component
+{
+    /// <summary>
+    /// Dictionary relating a unique hand ID corresponding to a container slot on the attached entity to a struct containing information about the Hand itself.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, Hand> Hands = new();
+}
diff --git a/Content.Shared/Hands/EntitySystems/ExtraHandsEquipmentSystem.cs b/Content.Shared/Hands/EntitySystems/ExtraHandsEquipmentSystem.cs
new file mode 100644
index 0000000000..4b96f89d81
--- /dev/null
+++ b/Content.Shared/Hands/EntitySystems/ExtraHandsEquipmentSystem.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Hands.Components;
+using Content.Shared.Inventory.Events;
+
+namespace Content.Shared.Hands.EntitySystems;
+
+public sealed class ExtraHandsEquipmentSystem : EntitySystem
+{
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ExtraHandsEquipmentComponent, GotEquippedEvent>(OnEquipped);
+        SubscribeLocalEvent<ExtraHandsEquipmentComponent, GotUnequippedEvent>(OnUnequipped);
+    }
+
+    private void OnEquipped(Entity<ExtraHandsEquipmentComponent> ent, ref GotEquippedEvent args)
+    {
+        if (!TryComp<HandsComponent>(args.Equipee, out var handsComp))
+            return;
+
+        foreach (var (handName, hand) in ent.Comp.Hands)
+        {
+            // add the NetEntity id to the container name to prevent multiple items with this component from conflicting
+            var handId = $"{GetNetEntity(ent.Owner).Id}-{handName}";
+            _hands.AddHand((args.Equipee, handsComp), handId, hand.Location);
+        }
+    }
+
+    private void OnUnequipped(Entity<ExtraHandsEquipmentComponent> ent, ref GotUnequippedEvent args)
+    {
+        if (!TryComp<HandsComponent>(args.Equipee, out var handsComp))
+            return;
+
+        foreach (var handName in ent.Comp.Hands.Keys)
+        {
+            // add the NetEntity id to the container name to prevent multiple items with this component from conflicting
+            var handId = $"{GetNetEntity(ent.Owner).Id}-{handName}";
+            _hands.RemoveHand((args.Equipee, handsComp), handId);
+        }
+    }
+}
diff --git a/Content.Shared/Humanoid/HairStyles.cs b/Content.Shared/Humanoid/HairStyles.cs
index cb4befd85a..543a0de817 100644
--- a/Content.Shared/Humanoid/HairStyles.cs
+++ b/Content.Shared/Humanoid/HairStyles.cs
@@ -1,14 +1,13 @@
 using Content.Shared.Humanoid.Markings;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Humanoid
 {
     public static class HairStyles
     {
-        [ValidatePrototypeId<MarkingPrototype>]
-        public const string DefaultHairStyle = "HairBald";
+        public static readonly ProtoId<MarkingPrototype> DefaultHairStyle = "HairBald";
 
-        [ValidatePrototypeId<MarkingPrototype>]
-        public const string DefaultFacialHairStyle = "FacialHairShaved";
+        public static readonly ProtoId<MarkingPrototype> DefaultFacialHairStyle = "FacialHairShaved";
 
         public static readonly IReadOnlyList<Color> RealisticHairColors = new List<Color>
         {
diff --git a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
index 5d017b2e68..24eef68f64 100644
--- a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
+++ b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
@@ -132,10 +132,10 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance,
 
         var newHairStyle = hairStyles.Count > 0
             ? random.Pick(hairStyles)
-            : HairStyles.DefaultHairStyle;
+            : HairStyles.DefaultHairStyle.Id;
 
         var newFacialHairStyle = facialHairStyles.Count == 0 || sex == Sex.Female
-            ? HairStyles.DefaultFacialHairStyle
+            ? HairStyles.DefaultFacialHairStyle.Id
             : random.Pick(facialHairStyles);
 
         var newHairColor = random.Pick(HairStyles.RealisticHairColors);
@@ -154,8 +154,7 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance,
         switch (skinType)
         {
             case HumanoidSkinColor.HumanToned:
-                var tone = Math.Round(Humanoid.SkinColor.HumanSkinToneFromColor(newSkinColor));
-                newSkinColor = Humanoid.SkinColor.HumanSkinTone((int)tone);
+                newSkinColor = Humanoid.SkinColor.HumanSkinTone(random.Next(0, 101));
                 break;
             case HumanoidSkinColor.Hues:
                 break;
diff --git a/Content.Shared/Humanoid/NamingSystem.cs b/Content.Shared/Humanoid/NamingSystem.cs
index a2085c6692..98afb34015 100644
--- a/Content.Shared/Humanoid/NamingSystem.cs
+++ b/Content.Shared/Humanoid/NamingSystem.cs
@@ -12,6 +12,8 @@ namespace Content.Shared.Humanoid
     /// </summary>
     public sealed class NamingSystem : EntitySystem
     {
+        private static readonly ProtoId<SpeciesPrototype> FallbackSpecies = "Human";
+
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
@@ -21,8 +23,8 @@ namespace Content.Shared.Humanoid
             // Some downstream is probably gonna have this eventually but then they can deal with fallbacks.
             if (!_prototypeManager.TryIndex(species, out SpeciesPrototype? speciesProto))
             {
-                speciesProto = _prototypeManager.Index<SpeciesPrototype>("Human");
-                Log.Warning($"Unable to find species {species} for name, falling back to Human");
+                speciesProto = _prototypeManager.Index(FallbackSpecies);
+                Log.Warning($"Unable to find species {species} for name, falling back to {FallbackSpecies}");
             }
 
             switch (speciesProto.Naming)
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index 2669089650..3d3af84a30 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -41,8 +41,7 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
     [Dependency] private readonly GrammarSystem _grammarSystem = default!;
     [Dependency] private readonly SharedIdentitySystem _identity = default!;
 
-    [ValidatePrototypeId<SpeciesPrototype>]
-    public const string DefaultSpecies = "Human";
+    public static readonly ProtoId<SpeciesPrototype> DefaultSpecies = "Human";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
index 5bbd285a99..95c3f8664f 100644
--- a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
+++ b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared.Actions;
 using Content.Shared.Implants.Components;
 using Content.Shared.Interaction;
@@ -6,9 +7,7 @@ using Content.Shared.Mobs;
 using Content.Shared.Tag;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
-using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
-using System.Linq;
 
 namespace Content.Shared.Implants;
 
@@ -91,7 +90,7 @@ public abstract class SharedSubdermalImplantSystem : EntitySystem
     /// Add a list of implants to a person.
     /// Logs any implant ids that don't have <see cref="SubdermalImplantComponent"/>.
     /// </summary>
-    public void AddImplants(EntityUid uid, IEnumerable<String> implants)
+    public void AddImplants(EntityUid uid, IEnumerable<EntProtoId> implants)
     {
         foreach (var id in implants)
         {
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index 053da4954d..60c7d30318 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -15,6 +15,7 @@ using Content.Shared.Strip.Components;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -35,8 +36,7 @@ public abstract partial class InventorySystem
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
     [Dependency] private readonly SharedStrippableSystem _strippable = default!;
 
-    [ValidatePrototypeId<ItemSizePrototype>]
-    private const string PocketableItemSize = "Small";
+    private static readonly ProtoId<ItemSizePrototype> PocketableItemSize = "Small";
 
     private void InitializeEquip()
     {
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index 03a7597905..4cc9f75ac3 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -11,6 +11,7 @@ using Content.Shared.Contraband;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Events;
 using Content.Shared.Electrocution;
+using Content.Shared.Emoting;
 using Content.Shared.Explosion;
 using Content.Shared.Eye.Blinding.Systems;
 using Content.Shared.Flash;
@@ -63,6 +64,7 @@ public partial class InventorySystem
         SubscribeLocalEvent<InventoryComponent, IsEquippingTargetAttemptEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, IsUnequippingTargetAttemptEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, ChameleonControllerOutfitSelectedEvent>(RelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, BeforeEmoteEvent>(RelayInventoryEvent);
 
         // by-ref events
         SubscribeLocalEvent<InventoryComponent, RefreshFrictionModifiersEvent>(RefRelayInventoryEvent);
diff --git a/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs b/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
index d76a4a3415..8842223afc 100644
--- a/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
+++ b/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
@@ -30,8 +30,7 @@ public abstract class SharedVirtualItemSystem : EntitySystem
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string VirtualItem = "VirtualItem";
+    private static readonly EntProtoId VirtualItem = "VirtualItem";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Lock/ItemToggleRequiresLockComponent.cs b/Content.Shared/Lock/ItemToggleRequiresLockComponent.cs
new file mode 100644
index 0000000000..94b8729476
--- /dev/null
+++ b/Content.Shared/Lock/ItemToggleRequiresLockComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Lock;
+
+/// <summary>
+/// This is used for toggleable items that require the entity to have a lock in a certain state.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(LockSystem))]
+public sealed partial class ItemToggleRequiresLockComponent : Component
+{
+    /// <summary>
+    /// TRUE: the lock must be locked to toggle the item.
+    /// FALSE: the lock must be unlocked to toggle the item.
+    /// </summary>
+    [DataField]
+    public bool RequireLocked;
+}
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index 74c1e5d1d1..30dd2b2b32 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -15,6 +15,7 @@ using Content.Shared.Storage.Components;
 using Content.Shared.UserInterface;
 using Content.Shared.Verbs;
 using Content.Shared.Wires;
+using Content.Shared.Item.ItemToggle.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Utility;
@@ -58,6 +59,8 @@ public sealed class LockSystem : EntitySystem
 
         SubscribeLocalEvent<ActivatableUIRequiresLockComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
         SubscribeLocalEvent<ActivatableUIRequiresLockComponent, LockToggledEvent>(LockToggled);
+
+        SubscribeLocalEvent<ItemToggleRequiresLockComponent, ItemToggleActivateAttemptEvent>(OnActivateAttempt);
     }
 
     private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup args)
@@ -433,4 +436,19 @@ public sealed class LockSystem : EntitySystem
 
         _activatableUI.CloseAll(uid);
     }
+    private void OnActivateAttempt(EntityUid uid, ItemToggleRequiresLockComponent component, ref ItemToggleActivateAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (TryComp<LockComponent>(uid, out var lockComp) && lockComp.Locked != component.RequireLocked)
+        {
+            args.Cancelled = true;
+            if (lockComp.Locked)
+                _sharedPopupSystem.PopupClient(Loc.GetString("lock-comp-generic-fail",
+                ("target", Identity.Entity(uid, EntityManager))),
+                uid,
+                args.User);
+        }
+    }
 }
diff --git a/Content.Shared/Magic/Components/SpellbookComponent.cs b/Content.Shared/Magic/Components/SpellbookComponent.cs
index f1b307c245..69c2bac2a4 100644
--- a/Content.Shared/Magic/Components/SpellbookComponent.cs
+++ b/Content.Shared/Magic/Components/SpellbookComponent.cs
@@ -16,12 +16,14 @@ public sealed partial class SpellbookComponent : Component
     [ViewVariables]
     public readonly List<EntityUid> Spells = new();
 
+    // The three fields below are just used for initialization.
     /// <summary>
-    /// The three fields below is just used for initialization.
+    /// Dictionary of spell prototypes to charge counts.
+    /// If the charge count is null, it means the spell has infinite charges.
     /// </summary>
     [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
-    public Dictionary<EntProtoId, int> SpellActions = new();
+    public Dictionary<EntProtoId, int?> SpellActions = new();
 
     [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Shared/Magic/SpellbookSystem.cs b/Content.Shared/Magic/SpellbookSystem.cs
index 6ef0a10b0c..ca01819bce 100644
--- a/Content.Shared/Magic/SpellbookSystem.cs
+++ b/Content.Shared/Magic/SpellbookSystem.cs
@@ -33,7 +33,9 @@ public sealed class SpellbookSystem : EntitySystem
             if (spell == null)
                 continue;
 
-            _sharedCharges.SetCharges(spell.Value, charges);
+            // Null means infinite charges.
+            if (charges is { } count)
+                _sharedCharges.SetCharges(spell.Value, count);
             ent.Comp.Spells.Add(spell.Value);
         }
     }
@@ -73,8 +75,9 @@ public sealed class SpellbookSystem : EntitySystem
             foreach (var (id, charges) in ent.Comp.SpellActions)
             {
                 EntityUid? actionId = null;
-                if (_actions.AddAction(args.Args.User, ref actionId, id))
-                    _sharedCharges.SetCharges(actionId.Value, charges);
+                if (_actions.AddAction(args.Args.User, ref actionId, id)
+                    && charges is { } count) // Null means infinite charges
+                    _sharedCharges.SetCharges(actionId.Value, count);
             }
         }
 
diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs
index 8dbd8cc85d..8d6ec44c93 100644
--- a/Content.Shared/Maps/ContentTileDefinition.cs
+++ b/Content.Shared/Maps/ContentTileDefinition.cs
@@ -15,8 +15,7 @@ namespace Content.Shared.Maps
     [Prototype("tile")]
     public sealed partial class ContentTileDefinition : IPrototype, IInheritingPrototype, ITileDefinition
     {
-        [ValidatePrototypeId<ToolQualityPrototype>]
-        public const string PryingToolQuality = "Prying";
+        public static readonly ProtoId<ToolQualityPrototype> PryingToolQuality = "Prying";
 
         public const string SpaceID = "Space";
 
diff --git a/Content.Shared/Movement/Components/JumpAbilityComponent.cs b/Content.Shared/Movement/Components/JumpAbilityComponent.cs
new file mode 100644
index 0000000000..6da9161578
--- /dev/null
+++ b/Content.Shared/Movement/Components/JumpAbilityComponent.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Actions;
+using Content.Shared.Movement.Systems;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Movement.Components;
+
+/// <summary>
+/// A component for configuring the settings for the jump action.
+/// To give the jump action to an entity use <see cref="ActionGrantComponent"/> and <see cref="ItemActionGrantComponent"/>.
+/// The basic action prototype is "ActionGravityJump".
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedJumpAbilitySystem))]
+public sealed partial class JumpAbilityComponent : Component
+{
+    /// <summary>
+    /// How far you will jump (in tiles).
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float JumpDistance = 5f;
+
+    /// <summary>
+    /// Basic “throwing” speed for TryThrow method.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float JumpThrowSpeed = 10f;
+
+    /// <summary>
+    /// This gets played whenever the jump action is used.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? JumpSound;
+}
+
+public sealed partial class GravityJumpEvent : InstantActionEvent;
+
diff --git a/Content.Shared/Movement/Systems/SharedJumpAbilitySystem.cs b/Content.Shared/Movement/Systems/SharedJumpAbilitySystem.cs
new file mode 100644
index 0000000000..ac720cae68
--- /dev/null
+++ b/Content.Shared/Movement/Systems/SharedJumpAbilitySystem.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Gravity;
+using Content.Shared.Movement.Components;
+using Content.Shared.Throwing;
+using Robust.Shared.Audio.Systems;
+
+namespace Content.Shared.Movement.Systems;
+
+public sealed partial class SharedJumpAbilitySystem : EntitySystem
+{
+    [Dependency] private readonly ThrowingSystem _throwing = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedGravitySystem _gravity = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<JumpAbilityComponent, GravityJumpEvent>(OnGravityJump);
+    }
+
+    private void OnGravityJump(Entity<JumpAbilityComponent> entity, ref GravityJumpEvent args)
+    {
+        if (_gravity.IsWeightless(args.Performer))
+            return;
+
+        var xform = Transform(args.Performer);
+        var throwing = xform.LocalRotation.ToWorldVec() * entity.Comp.JumpDistance;
+        var direction = xform.Coordinates.Offset(throwing); // to make the character jump in the direction he's looking
+
+        _throwing.TryThrow(args.Performer, direction, entity.Comp.JumpThrowSpeed);
+
+        _audio.PlayPredicted(entity.Comp.JumpSound, args.Performer, args.Performer);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
index 5db20574cc..19070d7cba 100644
--- a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
@@ -25,14 +25,9 @@ public sealed class HungerSystem : EntitySystem
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
     [Dependency] private readonly SharedJetpackSystem _jetpack = default!;
 
-    [ValidatePrototypeId<SatiationIconPrototype>]
-    private const string HungerIconOverfedId = "HungerIconOverfed";
-
-    [ValidatePrototypeId<SatiationIconPrototype>]
-    private const string HungerIconPeckishId = "HungerIconPeckish";
-
-    [ValidatePrototypeId<SatiationIconPrototype>]
-    private const string HungerIconStarvingId = "HungerIconStarving";
+    private static readonly ProtoId<SatiationIconPrototype> HungerIconOverfedId = "HungerIconOverfed";
+    private static readonly ProtoId<SatiationIconPrototype> HungerIconPeckishId = "HungerIconPeckish";
+    private static readonly ProtoId<SatiationIconPrototype> HungerIconStarvingId = "HungerIconStarving";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
index 052e73cd1b..808337639a 100644
--- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
@@ -23,14 +23,9 @@ public sealed class ThirstSystem : EntitySystem
     [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
     [Dependency] private readonly SharedJetpackSystem _jetpack = default!;
 
-    [ValidatePrototypeId<SatiationIconPrototype>]
-    private const string ThirstIconOverhydratedId = "ThirstIconOverhydrated";
-
-    [ValidatePrototypeId<SatiationIconPrototype>]
-    private const string ThirstIconThirstyId = "ThirstIconThirsty";
-
-    [ValidatePrototypeId<SatiationIconPrototype>]
-    private const string ThirstIconParchedId = "ThirstIconParched";
+    private static readonly ProtoId<SatiationIconPrototype> ThirstIconOverhydratedId = "ThirstIconOverhydrated";
+    private static readonly ProtoId<SatiationIconPrototype> ThirstIconThirstyId = "ThirstIconThirsty";
+    private static readonly ProtoId<SatiationIconPrototype> ThirstIconParchedId = "ThirstIconParched";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Parallax/Biomes/Layers/BiomeDecalLayer.cs b/Content.Shared/Parallax/Biomes/Layers/BiomeDecalLayer.cs
index 5e31e513a9..f95848e42b 100644
--- a/Content.Shared/Parallax/Biomes/Layers/BiomeDecalLayer.cs
+++ b/Content.Shared/Parallax/Biomes/Layers/BiomeDecalLayer.cs
@@ -1,8 +1,8 @@
 using Content.Shared.Decals;
 using Content.Shared.Maps;
 using Robust.Shared.Noise;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Parallax.Biomes.Layers;
 
@@ -10,8 +10,8 @@ namespace Content.Shared.Parallax.Biomes.Layers;
 public sealed partial class BiomeDecalLayer : IBiomeWorldLayer
 {
     /// <inheritdoc/>
-    [DataField("allowedTiles", customTypeSerializer:typeof(PrototypeIdListSerializer<ContentTileDefinition>))]
-    public List<string> AllowedTiles { get; private set; } = new();
+    [DataField]
+    public List<ProtoId<ContentTileDefinition>> AllowedTiles { get; private set; } = new();
 
     /// <summary>
     /// Divide each tile up by this amount.
@@ -29,6 +29,6 @@ public sealed partial class BiomeDecalLayer : IBiomeWorldLayer
     /// <inheritdoc/>
     [DataField("invert")] public bool Invert { get; private set; } = false;
 
-    [DataField("decals", required: true, customTypeSerializer:typeof(PrototypeIdListSerializer<DecalPrototype>))]
-    public List<string> Decals = new();
+    [DataField(required: true)]
+    public List<ProtoId<DecalPrototype>> Decals = new();
 }
diff --git a/Content.Shared/Parallax/Biomes/Layers/BiomeEntityLayer.cs b/Content.Shared/Parallax/Biomes/Layers/BiomeEntityLayer.cs
index 21ffdd96e5..c09980aaad 100644
--- a/Content.Shared/Parallax/Biomes/Layers/BiomeEntityLayer.cs
+++ b/Content.Shared/Parallax/Biomes/Layers/BiomeEntityLayer.cs
@@ -2,7 +2,6 @@ using Content.Shared.Maps;
 using Robust.Shared.Noise;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Parallax.Biomes.Layers;
 
@@ -10,8 +9,8 @@ namespace Content.Shared.Parallax.Biomes.Layers;
 public sealed partial class BiomeEntityLayer : IBiomeWorldLayer
 {
     /// <inheritdoc/>
-    [DataField("allowedTiles", customTypeSerializer:typeof(PrototypeIdListSerializer<ContentTileDefinition>))]
-    public List<string> AllowedTiles { get; private set; } = new();
+    [DataField]
+    public List<ProtoId<ContentTileDefinition>> AllowedTiles { get; private set; } = new();
 
     [DataField("noise")] public FastNoiseLite Noise { get; private set; } = new(0);
 
@@ -22,6 +21,6 @@ public sealed partial class BiomeEntityLayer : IBiomeWorldLayer
     /// <inheritdoc/>
     [DataField("invert")] public bool Invert { get; private set; } = false;
 
-    [DataField("entities", required: true, customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string> Entities = new();
+    [DataField(required: true)]
+    public List<EntProtoId> Entities = new();
 }
diff --git a/Content.Shared/Parallax/Biomes/Layers/IBiomeWorldLayer.cs b/Content.Shared/Parallax/Biomes/Layers/IBiomeWorldLayer.cs
index e04db913b7..92779b6f8e 100644
--- a/Content.Shared/Parallax/Biomes/Layers/IBiomeWorldLayer.cs
+++ b/Content.Shared/Parallax/Biomes/Layers/IBiomeWorldLayer.cs
@@ -1,3 +1,6 @@
+using Content.Shared.Maps;
+using Robust.Shared.Prototypes;
+
 namespace Content.Shared.Parallax.Biomes.Layers;
 
 /// <summary>
@@ -8,5 +11,5 @@ public partial interface IBiomeWorldLayer : IBiomeLayer
     /// <summary>
     /// What tiles we're allowed to spawn on, real or biome.
     /// </summary>
-    List<string> AllowedTiles { get; }
+    List<ProtoId<ContentTileDefinition>> AllowedTiles { get; }
 }
diff --git a/Content.Shared/Players/PlayTimeTracking/PlayTimeTrackingShared.cs b/Content.Shared/Players/PlayTimeTracking/PlayTimeTrackingShared.cs
index ccaf9c17dd..d02a22171a 100644
--- a/Content.Shared/Players/PlayTimeTracking/PlayTimeTrackingShared.cs
+++ b/Content.Shared/Players/PlayTimeTracking/PlayTimeTrackingShared.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Dataset;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Players.PlayTimeTracking;
 
@@ -7,12 +8,10 @@ public static class PlayTimeTrackingShared
     /// <summary>
     /// The prototype ID of the play time tracker that represents overall playtime, i.e. not tied to any one role.
     /// </summary>
-    [ValidatePrototypeId<PlayTimeTrackerPrototype>]
-    public const string TrackerOverall = "Overall";
+    public static readonly ProtoId<PlayTimeTrackerPrototype> TrackerOverall = "Overall";
 
     /// <summary>
     /// The prototype ID of the play time tracker that represents admin time, when a player is in game as admin.
     /// </summary>
-    [ValidatePrototypeId<PlayTimeTrackerPrototype>]
-    public const string TrackerAdmin = "Admin";
+    public static readonly ProtoId<PlayTimeTrackerPrototype> TrackerAdmin = "Admin";
 }
diff --git a/Content.Shared/Power/SharedPower.cs b/Content.Shared/Power/SharedPower.cs
index da88198825..d45fb96cac 100644
--- a/Content.Shared/Power/SharedPower.cs
+++ b/Content.Shared/Power/SharedPower.cs
@@ -1,3 +1,4 @@
+using Content.Shared.NodeContainer.NodeGroups;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Power
@@ -31,4 +32,12 @@ namespace Content.Shared.Power
         MediumVoltage,
         Apc,
     }
+
+    [Serializable, NetSerializable]
+    public enum Voltage
+    {
+        High = NodeGroupID.HVPower,
+        Medium = NodeGroupID.MVPower,
+        Apc = NodeGroupID.Apc,
+    }
 }
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 76e5018be4..359a312e9f 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -198,8 +198,10 @@ namespace Content.Shared.Preferences
         /// </summary>
         /// <param name="species">The species to use in this default profile. The default species is <see cref="SharedHumanoidAppearanceSystem.DefaultSpecies"/>.</param>
         /// <returns>Humanoid character profile with default settings.</returns>
-        public static HumanoidCharacterProfile DefaultWithSpecies(string species = SharedHumanoidAppearanceSystem.DefaultSpecies)
+        public static HumanoidCharacterProfile DefaultWithSpecies(string? species = null)
         {
+            species ??= SharedHumanoidAppearanceSystem.DefaultSpecies;
+
             return new()
             {
                 Species = species,
@@ -221,8 +223,10 @@ namespace Content.Shared.Preferences
             return RandomWithSpecies(species);
         }
 
-        public static HumanoidCharacterProfile RandomWithSpecies(string species = SharedHumanoidAppearanceSystem.DefaultSpecies)
+        public static HumanoidCharacterProfile RandomWithSpecies(string? species = null)
         {
+            species ??= SharedHumanoidAppearanceSystem.DefaultSpecies;
+
             var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
             var random = IoCManager.Resolve<IRobustRandom>();
 
diff --git a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
index 42d92a9065..87e839b56f 100644
--- a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
+++ b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
@@ -184,5 +184,25 @@ namespace Content.Shared.Random.Helpers
             // Shouldn't happen
             throw new InvalidOperationException($"Invalid weighted pick for {prototype.ID}!");
         }
+
+        /// <summary>
+        /// A very simple, deterministic djb2 hash function for generating a combined seed for the random number generator.
+        /// We can't use HashCode.Combine because that is initialized with a random value, creating different results on the server and client.
+        /// </summary>
+        /// <example>
+        /// Combine the current game tick with a NetEntity Id in order to not get the same random result if this is called multiple times in the same tick.
+        /// <code>
+        /// var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id });
+        /// </code>
+        /// </example>
+        public static int HashCodeCombine(List<int> values)
+        {
+            int hash = 5381;
+            foreach (var value in values)
+            {
+                hash = (hash << 5) + hash + value;
+            }
+            return hash;
+        }
     }
 }
diff --git a/Content.Shared/Random/RandomFillSolution.cs b/Content.Shared/Random/RandomFillSolution.cs
index e3b9b7c862..00453102f3 100644
--- a/Content.Shared/Random/RandomFillSolution.cs
+++ b/Content.Shared/Random/RandomFillSolution.cs
@@ -1,8 +1,7 @@
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Random;
 
@@ -28,6 +27,6 @@ public sealed partial class RandomFillSolution
     /// <summary>
     ///     Listed reagents that the weight and quantity apply to.
     /// </summary>
-    [DataField("reagents", required: true, customTypeSerializer: typeof(PrototypeIdListSerializer<ReagentPrototype>))]
-    public List<string> Reagents = new();
+    [DataField(required: true)]
+    public List<ProtoId<ReagentPrototype>> Reagents = new();
 }
diff --git a/Content.Shared/Repairable/RepairableComponent.cs b/Content.Shared/Repairable/RepairableComponent.cs
new file mode 100644
index 0000000000..bc1ccfb7bf
--- /dev/null
+++ b/Content.Shared/Repairable/RepairableComponent.cs
@@ -0,0 +1,53 @@
+using Content.Shared.Damage;
+using Content.Shared.Tools;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Repairable;
+
+/// <summary>
+/// Use this component to mark a device as repairable.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class RepairableComponent : Component
+{
+    /// <summary>
+    ///     All the damage to change information is stored in this <see cref="DamageSpecifier"/>.
+    /// </summary>
+    /// <remarks>
+    ///     If this data-field is specified, it will change damage by this amount instead of setting all damage to 0.
+    ///     in order to heal/repair the damage values have to be negative.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public DamageSpecifier? Damage;
+
+    /// <summary>
+    /// Cost of fuel used to repair this device.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int FuelCost = 5;
+
+    /// <summary>
+    /// Tool quality necessary to repair this device.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<ToolQualityPrototype> QualityNeeded = "Welding";
+
+    /// <summary>
+    /// The base tool use delay (seconds). This will be modified by the tool's quality
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int DoAfterDelay = 1;
+
+    /// <summary>
+    /// A multiplier that will be applied to the above if an entity is repairing themselves.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float SelfRepairPenalty = 3f;
+
+    /// <summary>
+    /// Whether an entity is allowed to repair itself.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool AllowSelfRepair = true;
+}
diff --git a/Content.Shared/Repairable/RepairableSystem.cs b/Content.Shared/Repairable/RepairableSystem.cs
new file mode 100644
index 0000000000..7a0f01b9b6
--- /dev/null
+++ b/Content.Shared/Repairable/RepairableSystem.cs
@@ -0,0 +1,87 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Damage;
+using Content.Shared.Database;
+using Content.Shared.DoAfter;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Tools.Systems;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Repairable;
+
+public sealed partial class RepairableSystem : EntitySystem
+{
+    [Dependency] private readonly SharedToolSystem _toolSystem = default!;
+    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<RepairableComponent, InteractUsingEvent>(Repair);
+        SubscribeLocalEvent<RepairableComponent, RepairFinishedEvent>(OnRepairFinished);
+    }
+
+    private void OnRepairFinished(Entity<RepairableComponent> ent,  ref RepairFinishedEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!TryComp(ent.Owner, out DamageableComponent? damageable) || damageable.TotalDamage == 0)
+            return;
+
+        if (ent.Comp.Damage != null)
+        {
+            var damageChanged = _damageableSystem.TryChangeDamage(ent.Owner, ent.Comp.Damage, true, false, origin: args.User);
+            _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(ent.Owner):target} by {damageChanged?.GetTotal()}");
+        }
+
+        else
+        {
+            // Repair all damage
+            _damageableSystem.SetAllDamage(ent.Owner, damageable, 0);
+            _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(ent.Owner):target} back to full health");
+        }
+
+        var str = Loc.GetString("comp-repairable-repair", ("target", ent.Owner), ("tool", args.Used!));
+        _popup.PopupClient(str, ent.Owner, args.User);
+
+        var ev = new RepairedEvent(ent, args.User);
+        RaiseLocalEvent(ent.Owner, ref ev);
+    }
+
+    private void Repair(Entity<RepairableComponent> ent, ref InteractUsingEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        // Only try repair the target if it is damaged
+        if (!TryComp<DamageableComponent>(ent.Owner, out var damageable) || damageable.TotalDamage == 0)
+            return;
+
+        float delay = ent.Comp.DoAfterDelay;
+
+        // Add a penalty to how long it takes if the user is repairing itself
+        if (args.User == args.Target)
+        {
+            if (!ent.Comp.AllowSelfRepair)
+                return;
+
+            delay *= ent.Comp.SelfRepairPenalty;
+        }
+
+        // Run the repairing doafter
+        args.Handled = _toolSystem.UseTool(args.Used, args.User, ent.Owner, delay, ent.Comp.QualityNeeded, new RepairFinishedEvent(), ent.Comp.FuelCost);
+    }
+}
+
+/// <summary>
+/// Event raised on an entity when its successfully repaired.
+/// </summary>
+/// <param name="Ent"></param>
+/// <param name="User"></param>
+[ByRefEvent]
+public readonly record struct RepairedEvent(Entity<RepairableComponent> Ent, EntityUid User);
+
+[Serializable, NetSerializable]
+public sealed partial class RepairFinishedEvent : SimpleDoAfterEvent;
diff --git a/Content.Shared/Repairable/SharedRepairableSystem.cs b/Content.Shared/Repairable/SharedRepairableSystem.cs
deleted file mode 100644
index 2b0cb670e6..0000000000
--- a/Content.Shared/Repairable/SharedRepairableSystem.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Content.Shared.DoAfter;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Repairable;
-
-public abstract partial class SharedRepairableSystem : EntitySystem
-{
-    [Serializable, NetSerializable]
-    protected sealed partial class RepairFinishedEvent : SimpleDoAfterEvent
-    {
-    }
-}
-
diff --git a/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs b/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
index a69e4ee9dd..f00338aac7 100644
--- a/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
+++ b/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
@@ -2,8 +2,8 @@ using Content.Shared.Lathe;
 using Content.Shared.Research.Prototypes;
 using Content.Shared.Research.Systems;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Research.Components;
 
@@ -25,15 +25,15 @@ public sealed partial class TechnologyDatabaseComponent : Component
     /// Which research disciplines are able to be unlocked
     /// </summary>
     [AutoNetworkedField]
-    [DataField("supportedDisciplines", customTypeSerializer: typeof(PrototypeIdListSerializer<TechDisciplinePrototype>))]
-    public List<string> SupportedDisciplines = new();
+    [DataField]
+    public List<ProtoId<TechDisciplinePrototype>> SupportedDisciplines = new();
 
     /// <summary>
     /// The ids of all the technologies which have been unlocked.
     /// </summary>
     [AutoNetworkedField]
-    [DataField("unlockedTechnologies", customTypeSerializer: typeof(PrototypeIdListSerializer<TechnologyPrototype>))]
-    public List<string> UnlockedTechnologies = new();
+    [DataField]
+    public List<ProtoId<TechnologyPrototype>> UnlockedTechnologies = new();
 
     /// <summary>
     /// The ids of all the lathe recipes which have been unlocked.
@@ -41,8 +41,8 @@ public sealed partial class TechnologyDatabaseComponent : Component
     /// </summary>
     /// todo: if you unlock all the recipes in a tech, it doesn't count as unlocking the tech. sadge
     [AutoNetworkedField]
-    [DataField("unlockedRecipes", customTypeSerializer: typeof(PrototypeIdListSerializer<LatheRecipePrototype>))]
-    public List<string> UnlockedRecipes = new();
+    [DataField]
+    public List<ProtoId<LatheRecipePrototype>> UnlockedRecipes = new();
 }
 
 /// <summary>
diff --git a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
index cef8bd15e3..9547b6ce4e 100644
--- a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
+++ b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
@@ -12,17 +12,18 @@ namespace Content.Shared.SSDIndicator;
 [AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class SSDIndicatorComponent : Component
 {
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
     [AutoNetworkedField]
     public bool IsSSD = true;
 
-    [ViewVariables(VVAccess.ReadWrite)]
     [DataField]
     public ProtoId<SsdIconPrototype> Icon = "SSDIcon";
 
     /// <summary>
     ///     When the entity should fall asleep
     /// </summary>
-    [DataField, AutoPausedField, Access(typeof(SSDIndicatorSystem))]
+    [DataField]
+    [AutoNetworkedField, AutoPausedField]
+    [Access(typeof(SSDIndicatorSystem))]
     public TimeSpan FallAsleepTime = TimeSpan.Zero;
 }
diff --git a/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs b/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs
index ca7d73ac83..b9c6659c9c 100644
--- a/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs
+++ b/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs
@@ -16,7 +16,7 @@ public sealed class SSDIndicatorSystem : EntitySystem
 
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedStatusEffectsSystem _statusEffects = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
 
     private bool _icSsdSleep;
     private float _icSsdSleepTime;
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/IBiomeSpecificMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/IBiomeSpecificMod.cs
index f379df9a4c..d0c4916265 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/IBiomeSpecificMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/IBiomeSpecificMod.cs
@@ -1,3 +1,5 @@
+using Robust.Shared.Prototypes;
+
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
 public interface IBiomeSpecificMod : ISalvageMod
@@ -5,5 +7,5 @@ public interface IBiomeSpecificMod : ISalvageMod
     /// <summary>
     /// Whitelist for biomes. If null then any biome is allowed.
     /// </summary>
-    List<string>? Biomes { get; }
+    List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; }
 }
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs
index fda08281b0..b1a72a3110 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Atmos;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
@@ -24,8 +23,8 @@ public sealed partial class SalvageAirMod : IPrototype, IBiomeSpecificMod
     public float Cost { get; private set; } = 0f;
 
     /// <inheritdoc/>
-    [DataField("biomes", customTypeSerializer: typeof(PrototypeIdListSerializer<SalvageBiomeModPrototype>))]
-    public List<string>? Biomes { get; private set; } = null;
+    [DataField]
+    public List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; private set; } = null;
 
     /// <summary>
     /// Set to true if this planet will have no atmosphere.
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs
index c8fc22c2af..69c0e3af88 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs
@@ -1,7 +1,5 @@
 using Content.Shared.Procedural;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
@@ -17,8 +15,8 @@ public sealed partial class SalvageDungeonModPrototype : IPrototype, IBiomeSpeci
     public float Cost { get; private set; } = 0f;
 
     /// <inheridoc/>
-    [DataField("biomes", customTypeSerializer: typeof(PrototypeIdListSerializer<SalvageBiomeModPrototype>))]
-    public List<string>? Biomes { get; private set; } = null;
+    [DataField]
+    public List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; private set; } = null;
 
     /// <summary>
     /// The config to use for spawning the dungeon.
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs
index 8acfd8b7c4..9556899353 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs
@@ -1,5 +1,4 @@
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
@@ -15,8 +14,8 @@ public sealed partial class SalvageLightMod : IPrototype, IBiomeSpecificMod
     public float Cost { get; private set; } = 0f;
 
     /// <inheritdoc/>
-    [DataField("biomes", customTypeSerializer: typeof(PrototypeIdListSerializer<SalvageBiomeModPrototype>))]
-    public List<string>? Biomes { get; private set; } = null;
+    [DataField]
+    public List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; private set; } = null;
 
     [DataField("color", required: true)] public Color? Color;
 }
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs
index 8871c14572..d48ea7bd3a 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs
@@ -1,5 +1,4 @@
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
@@ -15,8 +14,8 @@ public sealed partial class SalvageTemperatureMod : IPrototype, IBiomeSpecificMo
     public float Cost { get; private set; } = 0f;
 
     /// <inheritdoc/>
-    [DataField("biomes", customTypeSerializer: typeof(PrototypeIdListSerializer<SalvageBiomeModPrototype>))]
-    public List<string>? Biomes { get; private set; } = null;
+    [DataField]
+    public List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; private set; } = null;
 
     /// <summary>
     /// Temperature in the planets air mix.
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs
index 1f3b13daee..8bf0614b46 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Weather;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
@@ -17,8 +16,8 @@ public sealed partial class SalvageWeatherMod : IPrototype, IBiomeSpecificMod
     public float Cost { get; private set; } = 0f;
 
     /// <inheritdoc/>
-    [DataField("biomes", customTypeSerializer: typeof(PrototypeIdListSerializer<SalvageBiomeModPrototype>))]
-    public List<string>? Biomes { get; private set; } = null;
+    [DataField]
+    public List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; private set; } = null;
 
     /// <summary>
     /// Weather prototype to use on the planet.
diff --git a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
index b4b383d800..0b091d3a61 100644
--- a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
+++ b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
@@ -33,7 +33,7 @@ public abstract partial class SharedFultonSystem : EntitySystem
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
-    [ValidatePrototypeId<EntityPrototype>] public const string EffectProto = "FultonEffect";
+    public static readonly EntProtoId EffectProto = "FultonEffect";
     protected static readonly Vector2 EffectOffset = Vector2.Zero;
 
     public override void Initialize()
diff --git a/Content.Shared/Salvage/SharedSalvageSystem.cs b/Content.Shared/Salvage/SharedSalvageSystem.cs
index 12d0a26449..6e596449b4 100644
--- a/Content.Shared/Salvage/SharedSalvageSystem.cs
+++ b/Content.Shared/Salvage/SharedSalvageSystem.cs
@@ -23,8 +23,7 @@ public abstract partial class SharedSalvageSystem : EntitySystem
     /// <summary>
     /// Main loot table for salvage expeditions.
     /// </summary>
-    [ValidatePrototypeId<SalvageLootPrototype>]
-    public const string ExpeditionsLootProto = "SalvageLoot";
+    public static readonly ProtoId<SalvageLootPrototype> ExpeditionsLootProto = "SalvageLoot";
 
     public string GetFTLName(LocalizedDatasetPrototype dataset, int seed)
     {
diff --git a/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs b/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs
index 2f47dd4cea..a45e2aa1d1 100644
--- a/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs
+++ b/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs
@@ -15,7 +15,6 @@ namespace Content.Shared.Silicons.Borgs;
 [Prototype]
 public sealed partial class BorgTypePrototype : IPrototype
 {
-    [ValidatePrototypeId<SoundCollectionPrototype>]
     private static readonly ProtoId<SoundCollectionPrototype> DefaultFootsteps = new("FootstepBorg");
 
     [IdDataField]
diff --git a/Content.Shared/Silicons/Borgs/Components/ItemBorgModuleComponent.cs b/Content.Shared/Silicons/Borgs/Components/ItemBorgModuleComponent.cs
index 75835d0cf0..e86edb3476 100644
--- a/Content.Shared/Silicons/Borgs/Components/ItemBorgModuleComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/ItemBorgModuleComponent.cs
@@ -1,7 +1,6 @@
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Silicons.Borgs.Components;
 
@@ -14,8 +13,8 @@ public sealed partial class ItemBorgModuleComponent : Component
     /// <summary>
     /// The items that are provided.
     /// </summary>
-    [DataField("items", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>), required: true)]
-    public List<string> Items = new();
+    [DataField(required: true)]
+    public List<EntProtoId> Items = new();
 
     /// <summary>
     /// The entities from <see cref="Items"/> that were spawned.
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
index 55287e4d23..914470e3c9 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
@@ -21,8 +21,7 @@ public abstract class SharedBorgSwitchableTypeSystem : EntitySystem
     [Dependency] protected readonly IPrototypeManager Prototypes = default!;
     [Dependency] private readonly InteractionPopupSystem _interactionPopup = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    public const string ActionId = "ActionSelectBorgType";
+    public static readonly EntProtoId ActionId = "ActionSelectBorgType";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs b/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs
index a3861504e9..9f33521d8f 100644
--- a/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs
+++ b/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs
@@ -1,7 +1,5 @@
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Silicons.Laws;
 
@@ -71,8 +69,8 @@ public sealed partial class SiliconLawsetPrototype : IPrototype
     /// <summary>
     /// List of law prototype ids in this lawset.
     /// </summary>
-    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdListSerializer<SiliconLawPrototype>))]
-    public List<string> Laws = new();
+    [DataField(required: true)]
+    public List<ProtoId<SiliconLawPrototype>> Laws = new();
 
     /// <summary>
     /// What entity the lawset considers as a figure of authority.
diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
index 1615ab0fa3..328dc58d85 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
@@ -69,7 +69,6 @@ public abstract partial class SharedStationAiSystem : EntitySystem
     private EntityQuery<BroadphaseComponent> _broadphaseQuery;
     private EntityQuery<MapGridComponent> _gridQuery;
 
-    [ValidatePrototypeId<EntityPrototype>]
     private static readonly EntProtoId DefaultAi = "StationAiBrain";
 
     private const float MaxVisionMultiplier = 5f;
@@ -122,6 +121,8 @@ public abstract partial class SharedStationAiSystem : EntitySystem
                 Category = VerbCategory.Debug,
                 Act = () =>
                 {
+                    if (_net.IsClient)
+                        return;
                     var brain = SpawnInContainerOrDrop(DefaultAi, ent.Owner, StationAiCoreComponent.Container);
                     _mind.ControlMob(user, brain);
                 },
diff --git a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
index c2e7af717b..dce2f92d0c 100644
--- a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
+++ b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
@@ -4,7 +4,6 @@ using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 
 namespace Content.Shared.Singularity.Components;
@@ -31,8 +30,8 @@ public sealed partial class EmitterComponent : Component
     [DataField("boltType", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
     public string BoltType = "EmitterBolt";
 
-    [DataField("selectableTypes", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string> SelectableTypes = new();
+    [DataField]
+    public List<EntProtoId> SelectableTypes = new();
 
     /// <summary>
     /// The current amount of power being used.
diff --git a/Content.Shared/Speech/AccentEvent.cs b/Content.Shared/Speech/AccentEvent.cs
new file mode 100644
index 0000000000..9b90709959
--- /dev/null
+++ b/Content.Shared/Speech/AccentEvent.cs
@@ -0,0 +1,21 @@
+namespace Content.Shared.Speech;
+
+public sealed class AccentGetEvent : EntityEventArgs
+{
+    /// <summary>
+    ///     The entity to apply the accent to.
+    /// </summary>
+    public EntityUid Entity { get; }
+
+    /// <summary>
+    ///     The message to apply the accent transformation to.
+    ///     Modify this to apply the accent.
+    /// </summary>
+    public string Message { get; set; }
+
+    public AccentGetEvent(EntityUid entity, string message)
+    {
+        Entity = entity;
+        Message = message;
+    }
+}
diff --git a/Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs b/Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs
index 1a5a4daeec..05358a04bb 100644
--- a/Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs
@@ -1,11 +1,11 @@
 using Content.Shared.StatusEffect;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Speech.EntitySystems;
 
 public abstract class SharedStutteringSystem : EntitySystem
 {
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    public const string StutterKey = "Stutter";
+    public static readonly ProtoId<StatusEffectPrototype> StutterKey = "Stutter";
 
     [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
 
diff --git a/Content.Shared/Spider/SpiderComponent.cs b/Content.Shared/Spider/SpiderComponent.cs
index 42213adcb1..3a1612fed0 100644
--- a/Content.Shared/Spider/SpiderComponent.cs
+++ b/Content.Shared/Spider/SpiderComponent.cs
@@ -18,6 +18,24 @@ public sealed partial class SpiderComponent : Component
     public string WebAction = "ActionSpiderWeb";
 
     [DataField] public EntityUid? Action;
+
+    /// <summary>
+    /// Whether the spider will spawn webs when not controlled by a player.
+    /// </summary>
+    [DataField]
+    public bool SpawnsWebsAsNonPlayer = true;
+
+    /// <summary>
+    /// The cooldown in seconds between web spawns when not controlled by a player.
+    /// </summary>
+    [DataField]
+    public TimeSpan WebSpawnCooldown = TimeSpan.FromSeconds(45f);
+
+    /// <summary>
+    /// The next time the spider can spawn a web when not controlled by a player.
+    /// </summary>
+    [DataField]
+    public TimeSpan? NextWebSpawn;
 }
 
 public sealed partial class SpiderWebActionEvent : InstantActionEvent { }
diff --git a/Content.Shared/SprayPainter/Components/PaintableAirlockComponent.cs b/Content.Shared/SprayPainter/Components/PaintableAirlockComponent.cs
deleted file mode 100644
index fdd0aeeb7f..0000000000
--- a/Content.Shared/SprayPainter/Components/PaintableAirlockComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Shared.Roles;
-using Content.Shared.SprayPainter.Prototypes;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.SprayPainter.Components;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class PaintableAirlockComponent : Component
-{
-    /// <summary>
-    /// Group of styles this airlock can be painted with, e.g. glass, standard or external.
-    /// </summary>
-    [DataField(required: true), AutoNetworkedField]
-    public ProtoId<AirlockGroupPrototype> Group = string.Empty;
-
-    /// <summary>
-    /// Department this airlock is painted as, or none.
-    /// Must be specified in prototypes for turf war to work.
-    /// To better catch any mistakes, you need to explicitly state a non-styled airlock has a null department.
-    /// </summary>
-    [DataField(required: true), AutoNetworkedField]
-    public ProtoId<DepartmentPrototype>? Department;
-}
diff --git a/Content.Shared/SprayPainter/Components/PaintableComponent.cs b/Content.Shared/SprayPainter/Components/PaintableComponent.cs
new file mode 100644
index 0000000000..cfcb6a6c63
--- /dev/null
+++ b/Content.Shared/SprayPainter/Components/PaintableComponent.cs
@@ -0,0 +1,19 @@
+using Content.Shared.SprayPainter.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.SprayPainter.Components;
+
+/// <summary>
+/// Marks objects that can be painted with the spray painter.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PaintableComponent : Component
+{
+    /// <summary>
+    /// Group of styles this airlock can be painted with, e.g. glass, standard or external.
+    /// Set to null to make an entity unpaintable.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<PaintableGroupPrototype>? Group;
+}
diff --git a/Content.Shared/SprayPainter/Components/PaintedComponent.cs b/Content.Shared/SprayPainter/Components/PaintedComponent.cs
new file mode 100644
index 0000000000..83f0e6e692
--- /dev/null
+++ b/Content.Shared/SprayPainter/Components/PaintedComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.SprayPainter.Components;
+
+/// <summary>
+/// Used to mark an entity that has been repainted.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class PaintedComponent : Component
+{
+    /// <summary>
+    /// The time after which the entity is dried and does not appear as "freshly painted".
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField, AutoPausedField]
+    public TimeSpan DryTime;
+}
diff --git a/Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs b/Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs
new file mode 100644
index 0000000000..d869c96d31
--- /dev/null
+++ b/Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.SprayPainter.Components;
+
+/// <summary>
+/// Items with this component can be used to recharge a spray painter.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SprayPainterAmmoSystem))]
+public sealed partial class SprayPainterAmmoComponent : Component
+{
+    /// <summary>
+    /// The value by which the charge in the spray painter will be recharged.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int Charges = 15;
+}
diff --git a/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs b/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs
index 0591cb2dcb..b9a7057347 100644
--- a/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs
+++ b/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs
@@ -1,26 +1,43 @@
-using Content.Shared.DoAfter;
+using Content.Shared.Decals;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.SprayPainter.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+/// <summary>
+/// Denotes an object that can be used to alter the appearance of paintable objects (e.g. doors, gas canisters).
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class SprayPainterComponent : Component
 {
+    public const string DefaultPickedColor = "red";
+    public static readonly ProtoId<DecalPrototype> DefaultDecal = "Arrows";
+
+    /// <summary>
+    /// The sound to be played after painting the entities.
+    /// </summary>
     [DataField]
     public SoundSpecifier SpraySound = new SoundPathSpecifier("/Audio/Effects/spray2.ogg");
 
-    [DataField]
-    public TimeSpan AirlockSprayTime = TimeSpan.FromSeconds(3);
-
+    /// <summary>
+    /// The amount of time it takes to paint a pipe.
+    /// </summary>
     [DataField]
     public TimeSpan PipeSprayTime = TimeSpan.FromSeconds(1);
 
+    /// <summary>
+    /// The cost of spray painting a pipe, in charges.
+    /// </summary>
+    [DataField]
+    public int PipeChargeCost = 1;
+
     /// <summary>
     /// Pipe color chosen to spray with.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public string? PickedColor;
+    public string PickedColor = DefaultPickedColor;
 
     /// <summary>
     /// Pipe colors that can be selected.
@@ -29,9 +46,83 @@ public sealed partial class SprayPainterComponent : Component
     public Dictionary<string, Color> ColorPalette = new();
 
     /// <summary>
-    /// Airlock style index selected.
-    /// After prototype reload this might not be the same style but it will never be out of bounds.
+    /// Spray paintable object styles selected per object.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public int Index;
+    public Dictionary<string, string> StylesByGroup = new();
+
+    /// <summary>
+    /// The currently open tab of the painter
+    /// (Are you selecting canister color?)
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int SelectedTab;
+
+    /// <summary>
+    /// Whether or not the painter should be painting or removing decals when clicked.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public DecalPaintMode DecalMode = DecalPaintMode.Off;
+
+    /// <summary>
+    /// The currently selected decal prototype.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<DecalPrototype> SelectedDecal = DefaultDecal;
+
+    /// <summary>
+    /// The color in which to paint the decal.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Color? SelectedDecalColor;
+
+    /// <summary>
+    /// The angle at which to paint the decal.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int SelectedDecalAngle;
+
+    /// <summary>
+    /// The angle at which to paint the decal.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool SnapDecals = true;
+
+    /// <summary>
+    /// The cost of spray painting a decal, in charges.
+    /// </summary>
+    [DataField]
+    public int DecalChargeCost = 1;
+
+    /// <summary>
+    /// How long does the painter leave items as freshly painted?
+    /// </summary>
+    [DataField]
+    public TimeSpan FreshPaintDuration = TimeSpan.FromMinutes(15);
+
+    /// <summary>
+    /// The sound to play when swapping between decal modes.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier SoundSwitchDecalMode = new SoundPathSpecifier("/Audio/Machines/quickbeep.ogg", AudioParams.Default.WithVolume(1.5f));
+}
+
+/// <summary>
+/// A set of operating modes for decal painting.
+/// </summary>
+[Serializable, NetSerializable]
+public enum DecalPaintMode : byte
+{
+    /// <summary>
+    /// Clicking on the floor does nothing.
+    /// </summary>
+    Off = 0,
+    /// <summary>
+    /// Clicking on the floor adds a decal at the requested spot (or snapped to the grid)
+    /// </summary>
+    Add = 1,
+    /// <summary>
+    /// Clicking on the floor removes all decals at the requested spot (or snapped to the grid)
+    /// </summary>
+    Remove = 2,
 }
diff --git a/Content.Shared/SprayPainter/Prototypes/AirlockDepartmentsPrototype.cs b/Content.Shared/SprayPainter/Prototypes/AirlockDepartmentsPrototype.cs
deleted file mode 100644
index 8f98a1a3c7..0000000000
--- a/Content.Shared/SprayPainter/Prototypes/AirlockDepartmentsPrototype.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Roles;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.SprayPainter.Prototypes;
-
-/// <summary>
-/// Maps airlock style names to department ids.
-/// </summary>
-[Prototype]
-public sealed partial class AirlockDepartmentsPrototype : IPrototype
-{
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    /// <summary>
-    /// Dictionary of style names to department ids.
-    /// If a style does not have a department (e.g. external) it is set to null.
-    /// </summary>
-    [DataField(required: true)]
-    public Dictionary<string, ProtoId<DepartmentPrototype>> Departments = new();
-}
diff --git a/Content.Shared/SprayPainter/Prototypes/AirlockGroupPrototype.cs b/Content.Shared/SprayPainter/Prototypes/AirlockGroupPrototype.cs
deleted file mode 100644
index 24c28b8b7a..0000000000
--- a/Content.Shared/SprayPainter/Prototypes/AirlockGroupPrototype.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.SprayPainter.Prototypes;
-
-[Prototype("AirlockGroup")]
-public sealed partial class AirlockGroupPrototype : IPrototype
-{
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    [DataField("stylePaths")]
-    public Dictionary<string, string> StylePaths = default!;
-
-    // The priority determines, which sprite is used when showing
-    // the icon for a style in the SprayPainter UI. The highest priority
-    // gets shown.
-    [DataField("iconPriority")]
-    public int IconPriority = 0;
-}
diff --git a/Content.Shared/SprayPainter/Prototypes/PaintableGroupCategoryPrototype.cs b/Content.Shared/SprayPainter/Prototypes/PaintableGroupCategoryPrototype.cs
new file mode 100644
index 0000000000..ba6423d94a
--- /dev/null
+++ b/Content.Shared/SprayPainter/Prototypes/PaintableGroupCategoryPrototype.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.SprayPainter.Prototypes;
+
+/// <summary>
+/// A category of spray paintable items (e.g. airlocks, crates)
+/// </summary>
+[Prototype]
+public sealed partial class PaintableGroupCategoryPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// Each group that makes up this category.
+    /// </summary>
+    [DataField(required: true)]
+    public List<ProtoId<PaintableGroupPrototype>> Groups = new();
+}
diff --git a/Content.Shared/SprayPainter/Prototypes/PaintableGroupPrototype.cs b/Content.Shared/SprayPainter/Prototypes/PaintableGroupPrototype.cs
new file mode 100644
index 0000000000..73944c4e6e
--- /dev/null
+++ b/Content.Shared/SprayPainter/Prototypes/PaintableGroupPrototype.cs
@@ -0,0 +1,53 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.SprayPainter.Prototypes;
+
+/// <summary>
+/// Contains a map of the objects from which the spray painter will take texture to paint another from the same group.
+/// </summary>
+[Prototype]
+public sealed partial class PaintableGroupPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// The time required to paint an object from a given group, in seconds.
+    /// </summary>
+    [DataField]
+    public float Time = 2.0f;
+
+    /// <summary>
+    /// To number of charges needed to paint an object of this group.
+    /// </summary>
+    [DataField]
+    public int Cost = 1;
+
+    /// <summary>
+    /// The default style to start painting.
+    /// </summary>
+    [DataField(required: true)]
+    public string DefaultStyle = default!;
+
+    /// <summary>
+    /// Map from localization keys and entity identifiers displayed in the spray painter menu.
+    /// </summary>
+    [DataField(required: true)]
+    public Dictionary<string, EntProtoId> Styles = new();
+
+    /// <summary>
+    /// If multiple groups have the same key, the group with the highest IconPriority has its icon displayed.
+    /// </summary>
+    [DataField]
+    public int IconPriority;
+}
+
+[Serializable, NetSerializable]
+public enum PaintableVisuals
+{
+    /// <summary>
+    /// The prototype to base the object's visuals off.
+    /// </summary>
+    Prototype
+}
diff --git a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
index 48a941d598..0a766df348 100644
--- a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
+++ b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
@@ -1,101 +1,77 @@
 using Content.Shared.Administration.Logs;
+using Content.Shared.Charges.Components;
+using Content.Shared.Charges.Systems;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
-using Content.Shared.Doors.Components;
+using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.SprayPainter.Components;
 using Content.Shared.SprayPainter.Prototypes;
+using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 using System.Linq;
 
 namespace Content.Shared.SprayPainter;
 
 /// <summary>
-/// System for painting airlocks using a spray painter.
+/// System for painting paintable objects using a spray painter.
 /// Pipes are handled serverside since AtmosPipeColorSystem is server only.
 /// </summary>
 public abstract class SharedSprayPainterSystem : EntitySystem
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] protected readonly IPrototypeManager Proto = default!;
-    [Dependency] private   readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
+    [Dependency] protected readonly SharedChargesSystem Charges = default!;
     [Dependency] protected readonly SharedDoAfterSystem DoAfter = default!;
-    [Dependency] private   readonly SharedPopupSystem _popup = default!;
-
-    public List<AirlockStyle> Styles { get; private set; } = new();
-    public List<AirlockGroupPrototype> Groups { get; private set; } = new();
-
-    [ValidatePrototypeId<AirlockDepartmentsPrototype>]
-    private const string Departments = "Departments";
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        CacheStyles();
-
         SubscribeLocalEvent<SprayPainterComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<SprayPainterComponent, SprayPainterDoorDoAfterEvent>(OnDoorDoAfter);
-        Subs.BuiEvents<SprayPainterComponent>(SprayPainterUiKey.Key, subs =>
-        {
-            subs.Event<SprayPainterSpritePickedMessage>(OnSpritePicked);
-            subs.Event<SprayPainterColorPickedMessage>(OnColorPicked);
-        });
 
-        SubscribeLocalEvent<PaintableAirlockComponent, InteractUsingEvent>(OnAirlockInteract);
+        SubscribeLocalEvent<SprayPainterComponent, SprayPainterDoAfterEvent>(OnPainterDoAfter);
+        SubscribeLocalEvent<SprayPainterComponent, GetVerbsEvent<AlternativeVerb>>(OnPainterGetAltVerbs);
+        SubscribeLocalEvent<PaintableComponent, InteractUsingEvent>(OnPaintableInteract);
+        SubscribeLocalEvent<PaintedComponent, ExaminedEvent>(OnPainedExamined);
 
-        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
+        Subs.BuiEvents<SprayPainterComponent>(SprayPainterUiKey.Key,
+            subs =>
+            {
+                subs.Event<SprayPainterSetPaintableStyleMessage>(OnSetPaintable);
+                subs.Event<SprayPainterSetPipeColorMessage>(OnSetPipeColor);
+                subs.Event<SprayPainterTabChangedMessage>(OnTabChanged);
+                subs.Event<SprayPainterSetDecalMessage>(OnSetDecal);
+                subs.Event<SprayPainterSetDecalColorMessage>(OnSetDecalColor);
+                subs.Event<SprayPainterSetDecalAngleMessage>(OnSetDecalAngle);
+                subs.Event<SprayPainterSetDecalSnapMessage>(OnSetDecalSnap);
+            });
     }
 
     private void OnMapInit(Entity<SprayPainterComponent> ent, ref MapInitEvent args)
     {
-        if (ent.Comp.ColorPalette.Count == 0)
-            return;
+        bool stylesByGroupPopulated = false;
+        foreach (var groupProto in Proto.EnumeratePrototypes<PaintableGroupPrototype>())
+        {
+            ent.Comp.StylesByGroup[groupProto.ID] = groupProto.DefaultStyle;
+            stylesByGroupPopulated = true;
+        }
+        if (stylesByGroupPopulated)
+            Dirty(ent);
 
-        SetColor(ent, ent.Comp.ColorPalette.First().Key);
+        if (ent.Comp.ColorPalette.Count > 0)
+            SetPipeColor(ent, ent.Comp.ColorPalette.First().Key);
     }
 
-    private void OnDoorDoAfter(Entity<SprayPainterComponent> ent, ref SprayPainterDoorDoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled)
-            return;
-
-        if (args.Args.Target is not {} target)
-            return;
-
-        if (!TryComp<PaintableAirlockComponent>(target, out var airlock))
-            return;
-
-        airlock.Department = args.Department;
-        Dirty(target, airlock);
-
-        Audio.PlayPredicted(ent.Comp.SpraySound, ent, args.Args.User);
-        Appearance.SetData(target, DoorVisuals.BaseRSI, args.Sprite);
-        _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(args.Args.User):user} painted {ToPrettyString(args.Args.Target.Value):target}");
-
-        args.Handled = true;
-    }
-
-    #region UI messages
-
-    private void OnColorPicked(Entity<SprayPainterComponent> ent, ref SprayPainterColorPickedMessage args)
-    {
-        SetColor(ent, args.Key);
-    }
-
-    private void OnSpritePicked(Entity<SprayPainterComponent> ent, ref SprayPainterSpritePickedMessage args)
-    {
-        if (args.Index >= Styles.Count)
-            return;
-
-        ent.Comp.Index = args.Index;
-        Dirty(ent, ent.Comp);
-    }
-
-    private void SetColor(Entity<SprayPainterComponent> ent, string? paletteKey)
+    private void SetPipeColor(Entity<SprayPainterComponent> ent, string? paletteKey)
     {
         if (paletteKey == null || paletteKey == ent.Comp.PickedColor)
             return;
@@ -104,12 +80,98 @@ public abstract class SharedSprayPainterSystem : EntitySystem
             return;
 
         ent.Comp.PickedColor = paletteKey;
-        Dirty(ent, ent.Comp);
+        Dirty(ent);
+        UpdateUi(ent);
     }
 
-    #endregion
+    #region Interaction
 
-    private void OnAirlockInteract(Entity<PaintableAirlockComponent> ent, ref InteractUsingEvent args)
+    private void OnPainterDoAfter(Entity<SprayPainterComponent> ent, ref SprayPainterDoAfterEvent args)
+    {
+        if (args.Handled || args.Cancelled)
+            return;
+
+        if (args.Args.Target is not { } target)
+            return;
+
+        if (!HasComp<PaintableComponent>(target))
+            return;
+
+        Appearance.SetData(target, PaintableVisuals.Prototype, args.Prototype);
+        Audio.PlayPredicted(ent.Comp.SpraySound, ent, args.Args.User);
+        Charges.TryUseCharges(new Entity<LimitedChargesComponent?>(ent, EnsureComp<LimitedChargesComponent>(ent)), args.Cost);
+
+        var paintedComponent = EnsureComp<PaintedComponent>(target);
+        paintedComponent.DryTime = _timing.CurTime + ent.Comp.FreshPaintDuration;
+        Dirty(target, paintedComponent);
+
+        var ev = new EntityPaintedEvent(
+            User: args.User,
+            Tool: ent,
+            Prototype: args.Prototype,
+            Group: args.Group);
+        RaiseLocalEvent(target, ref ev);
+
+        AdminLogger.Add(LogType.Action,
+            LogImpact.Low,
+            $"{ToPrettyString(args.Args.User):user} painted {ToPrettyString(args.Args.Target.Value):target}");
+
+        args.Handled = true;
+    }
+
+    private void OnPainterGetAltVerbs(Entity<SprayPainterComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || !args.Using.HasValue)
+            return;
+
+        var user = args.User;
+
+        AlternativeVerb verb = new()
+        {
+            Text = Loc.GetString("spray-painter-verb-toggle-decals"),
+            Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/settings.svg.192dpi.png")),
+            Act = () => TogglePaintDecals(ent, user),
+            Impact = LogImpact.Low
+        };
+        args.Verbs.Add(verb);
+    }
+
+    /// <summary>
+    /// Toggles whether clicking on the floor paints a decal or not.
+    /// </summary>
+    private void TogglePaintDecals(Entity<SprayPainterComponent> ent, EntityUid user)
+    {
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        var pitch = 1.0f;
+        switch (ent.Comp.DecalMode)
+        {
+            case DecalPaintMode.Off:
+            default:
+                ent.Comp.DecalMode = DecalPaintMode.Add;
+                pitch = 1.0f;
+                break;
+            case DecalPaintMode.Add:
+                ent.Comp.DecalMode = DecalPaintMode.Remove;
+                pitch = 1.2f;
+                break;
+            case DecalPaintMode.Remove:
+                ent.Comp.DecalMode = DecalPaintMode.Off;
+                pitch = 0.8f;
+                break;
+        }
+        Dirty(ent);
+
+        // Make the machine beep.
+        Audio.PlayPredicted(ent.Comp.SoundSwitchDecalMode, ent, user, ent.Comp.SoundSwitchDecalMode.Params.WithPitchScale(pitch));
+    }
+
+    /// <summary>
+    /// Handles spray paint interactions with an object.
+    /// An object must belong to a spray paintable group to be painted, and the painter must have sufficient ammo to paint it.
+    /// </summary>
+    private void OnPaintableInteract(Entity<PaintableComponent> ent, ref InteractUsingEvent args)
     {
         if (args.Handled)
             return;
@@ -117,79 +179,140 @@ public abstract class SharedSprayPainterSystem : EntitySystem
         if (!TryComp<SprayPainterComponent>(args.Used, out var painter))
             return;
 
-        var group = Proto.Index<AirlockGroupPrototype>(ent.Comp.Group);
+        if (ent.Comp.Group is not { } group
+            || !painter.StylesByGroup.TryGetValue(group, out var selectedStyle)
+            || !Proto.TryIndex(group, out PaintableGroupPrototype? targetGroup))
+            return;
 
-        var style = Styles[painter.Index];
-        if (!group.StylePaths.TryGetValue(style.Name, out var sprite))
+        // Valid paint target.
+        args.Handled = true;
+
+        if (TryComp<LimitedChargesComponent>(args.Used, out var charges)
+            && charges.LastCharges < targetGroup.Cost)
         {
-            string msg = Loc.GetString("spray-painter-style-not-available");
+            var msg = Loc.GetString("spray-painter-interact-no-charges");
             _popup.PopupClient(msg, args.User, args.User);
             return;
         }
 
-        var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, painter.AirlockSprayTime, new SprayPainterDoorDoAfterEvent(sprite, style.Department), args.Used, target: ent, used: args.Used)
+        if (!targetGroup.Styles.TryGetValue(selectedStyle, out var proto))
+        {
+            var msg = Loc.GetString("spray-painter-style-not-available");
+            _popup.PopupClient(msg, args.User, args.User);
+            return;
+        }
+
+        var doAfterEventArgs = new DoAfterArgs(EntityManager,
+            args.User,
+            targetGroup.Time,
+            new SprayPainterDoAfterEvent(proto, group, targetGroup.Cost),
+            args.Used,
+            target: ent,
+            used: args.Used)
         {
             BreakOnMove = true,
             BreakOnDamage = true,
             NeedHand = true,
         };
-        if (!DoAfter.TryStartDoAfter(doAfterEventArgs, out var id))
-            return;
 
-        args.Handled = true;
+        if (!DoAfter.TryStartDoAfter(doAfterEventArgs, out _))
+            return;
 
         // Log the attempt
-        _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(args.User):user} is painting {ToPrettyString(ent):target} to '{style.Name}' at {Transform(ent).Coordinates:targetlocation}");
+        AdminLogger.Add(LogType.Action,
+            LogImpact.Low,
+            $"{ToPrettyString(args.User):user} is painting {ToPrettyString(ent):target} to '{selectedStyle}' at {Transform(ent).Coordinates:targetlocation}");
     }
 
-    #region Style caching
-
-    private void OnPrototypesReloaded(PrototypesReloadedEventArgs args)
+    /// <summary>
+    /// Prints out if an object has been painted recently.
+    /// </summary>
+    private void OnPainedExamined(Entity<PaintedComponent> ent, ref ExaminedEvent args)
     {
-        if (!args.WasModified<AirlockGroupPrototype>() && !args.WasModified<AirlockDepartmentsPrototype>())
+        // If the paint's dried, it isn't detectable.
+        if (_timing.CurTime > ent.Comp.DryTime)
             return;
 
-        Styles.Clear();
-        Groups.Clear();
-        CacheStyles();
-
-        // style index might be invalid now so check them all
-        var max = Styles.Count - 1;
-        var query = AllEntityQuery<SprayPainterComponent>();
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            if (comp.Index > max)
-            {
-                comp.Index = max;
-                Dirty(uid, comp);
-            }
-        }
+        args.PushText(Loc.GetString("spray-painter-on-examined-painted-message"));
     }
 
-    protected virtual void CacheStyles()
-    {
-        // collect every style's name
-        var names = new SortedSet<string>();
-        foreach (var group in Proto.EnumeratePrototypes<AirlockGroupPrototype>())
-        {
-            Groups.Add(group);
-            foreach (var style in group.StylePaths.Keys)
-            {
-                names.Add(style);
-            }
-        }
+    #endregion Interaction
 
-        // get their department ids too for the final style list
-        var departments = Proto.Index<AirlockDepartmentsPrototype>(Departments);
-        Styles.Capacity = names.Count;
-        foreach (var name in names)
-        {
-            departments.Departments.TryGetValue(name, out var department);
-            Styles.Add(new AirlockStyle(name, department));
-        }
+    #region UI
+
+    /// <summary>
+    /// Sets the style that a particular type of paintable object (e.g. lockers) should be painted in.
+    /// </summary>
+    private void OnSetPaintable(Entity<SprayPainterComponent> ent, ref SprayPainterSetPaintableStyleMessage args)
+    {
+        if (!ent.Comp.StylesByGroup.ContainsKey(args.Group))
+            return;
+
+        ent.Comp.StylesByGroup[args.Group] = args.Style;
+        Dirty(ent);
+        UpdateUi(ent);
+    }
+
+    /// <summary>
+    /// Changes the color to paint pipes in.
+    /// </summary>
+    private void OnSetPipeColor(Entity<SprayPainterComponent> ent, ref SprayPainterSetPipeColorMessage args)
+    {
+        SetPipeColor(ent, args.Key);
+    }
+
+    /// <summary>
+    /// Tracks the tab the spray painter was on.
+    /// </summary>
+    private void OnTabChanged(Entity<SprayPainterComponent> ent, ref SprayPainterTabChangedMessage args)
+    {
+        ent.Comp.SelectedTab = args.Index;
+        Dirty(ent);
+    }
+
+    /// <summary>
+    /// Sets the decal prototype to paint.
+    /// </summary>
+    private void OnSetDecal(Entity<SprayPainterComponent> ent, ref SprayPainterSetDecalMessage args)
+    {
+        ent.Comp.SelectedDecal = args.DecalPrototype;
+        Dirty(ent);
+        UpdateUi(ent);
+    }
+
+    /// <summary>
+    /// Sets the angle to paint decals at.
+    /// </summary>
+    private void OnSetDecalAngle(Entity<SprayPainterComponent> ent, ref SprayPainterSetDecalAngleMessage args)
+    {
+        ent.Comp.SelectedDecalAngle = args.Angle;
+        Dirty(ent);
+        UpdateUi(ent);
+    }
+
+    /// <summary>
+    /// Enables or disables snap-to-grid when painting decals.
+    /// </summary>
+    private void OnSetDecalSnap(Entity<SprayPainterComponent> ent, ref SprayPainterSetDecalSnapMessage args)
+    {
+        ent.Comp.SnapDecals = args.Snap;
+        Dirty(ent);
+        UpdateUi(ent);
+    }
+
+    /// <summary>
+    /// Sets the decal to paint on the ground.
+    /// </summary>
+    private void OnSetDecalColor(Entity<SprayPainterComponent> ent, ref SprayPainterSetDecalColorMessage args)
+    {
+        ent.Comp.SelectedDecalColor = args.Color;
+        Dirty(ent);
+        UpdateUi(ent);
+    }
+
+    protected virtual void UpdateUi(Entity<SprayPainterComponent> ent)
+    {
     }
 
     #endregion
 }
-
-public record struct AirlockStyle(string Name, string? Department);
diff --git a/Content.Shared/SprayPainter/SprayPainterAmmoSystem.cs b/Content.Shared/SprayPainter/SprayPainterAmmoSystem.cs
new file mode 100644
index 0000000000..d43420efc5
--- /dev/null
+++ b/Content.Shared/SprayPainter/SprayPainterAmmoSystem.cs
@@ -0,0 +1,62 @@
+using Content.Shared.Charges.Components;
+using Content.Shared.Charges.Systems;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.SprayPainter.Components;
+
+namespace Content.Shared.SprayPainter;
+
+/// <summary>
+/// The system handles interactions with spray painter ammo.
+/// </summary>
+public sealed class SprayPainterAmmoSystem : EntitySystem
+{
+    [Dependency] private readonly SharedChargesSystem _charges = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SprayPainterAmmoComponent, ExaminedEvent>(OnExamine);
+        SubscribeLocalEvent<SprayPainterAmmoComponent, AfterInteractEvent>(OnAfterInteract);
+    }
+
+    private void OnAfterInteract(Entity<SprayPainterAmmoComponent> ent, ref AfterInteractEvent args)
+    {
+        if (args.Handled || !args.CanReach)
+            return;
+
+        if (args.Target is not { Valid: true } target ||
+            !HasComp<SprayPainterComponent>(target) ||
+            !TryComp<LimitedChargesComponent>(target, out var charges))
+            return;
+
+        var user = args.User;
+        args.Handled = true;
+        var count = Math.Min(charges.MaxCharges - charges.LastCharges, ent.Comp.Charges);
+        if (count <= 0)
+        {
+            _popup.PopupClient(Loc.GetString("spray-painter-ammo-after-interact-full"), target, user);
+            return;
+        }
+
+        _popup.PopupClient(Loc.GetString("spray-painter-ammo-after-interact-refilled"), target, user);
+        _charges.AddCharges(target, count);
+        ent.Comp.Charges -= count;
+        Dirty(ent, ent.Comp);
+
+        if (ent.Comp.Charges <= 0)
+            PredictedQueueDel(ent.Owner);
+    }
+
+    private void OnExamine(Entity<SprayPainterAmmoComponent> ent, ref ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        var examineMessage = Loc.GetString("rcd-ammo-component-on-examine", ("charges", ent.Comp.Charges));
+        args.PushText(examineMessage);
+    }
+}
diff --git a/Content.Shared/SprayPainter/SprayPainterEvents.cs b/Content.Shared/SprayPainter/SprayPainterEvents.cs
index b88b054ad1..db9de9c278 100644
--- a/Content.Shared/SprayPainter/SprayPainterEvents.cs
+++ b/Content.Shared/SprayPainter/SprayPainterEvents.cs
@@ -1,4 +1,7 @@
+using Content.Shared.Decals;
 using Content.Shared.DoAfter;
+using Content.Shared.SprayPainter.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.SprayPainter;
@@ -10,46 +13,75 @@ public enum SprayPainterUiKey
 }
 
 [Serializable, NetSerializable]
-public sealed class SprayPainterSpritePickedMessage : BoundUserInterfaceMessage
+public sealed class SprayPainterSetDecalMessage(ProtoId<DecalPrototype> protoId) : BoundUserInterfaceMessage
 {
-    public readonly int Index;
-
-    public SprayPainterSpritePickedMessage(int index)
-    {
-        Index = index;
-    }
+    public ProtoId<DecalPrototype> DecalPrototype = protoId;
 }
 
 [Serializable, NetSerializable]
-public sealed class SprayPainterColorPickedMessage : BoundUserInterfaceMessage
+public sealed class SprayPainterSetDecalColorMessage(Color? color) : BoundUserInterfaceMessage
 {
-    public readonly string? Key;
-
-    public SprayPainterColorPickedMessage(string? key)
-    {
-        Key = key;
-    }
+    public Color? Color = color;
 }
 
 [Serializable, NetSerializable]
-public sealed partial class SprayPainterDoorDoAfterEvent : DoAfterEvent
+public sealed class SprayPainterSetDecalSnapMessage(bool snap) : BoundUserInterfaceMessage
+{
+    public bool Snap = snap;
+}
+
+[Serializable, NetSerializable]
+public sealed class SprayPainterSetDecalAngleMessage(int angle) : BoundUserInterfaceMessage
+{
+    public int Angle = angle;
+}
+
+[Serializable, NetSerializable]
+public sealed class SprayPainterTabChangedMessage(int index, bool isSelectedTabWithDecals) : BoundUserInterfaceMessage
+{
+    public readonly int Index = index;
+    public readonly bool IsSelectedTabWithDecals = isSelectedTabWithDecals;
+}
+
+[Serializable, NetSerializable]
+public sealed class SprayPainterSetPaintableStyleMessage(string group, string style) : BoundUserInterfaceMessage
+{
+    public readonly string Group = group;
+    public readonly string Style = style;
+}
+
+[Serializable, NetSerializable]
+public sealed class SprayPainterSetPipeColorMessage(string? key) : BoundUserInterfaceMessage
+{
+    public readonly string? Key = key;
+}
+
+[Serializable, NetSerializable]
+public sealed partial class SprayPainterDoAfterEvent : DoAfterEvent
 {
     /// <summary>
-    /// Base RSI path to set for the door sprite.
+    /// The prototype to use to repaint this object.
     /// </summary>
     [DataField]
-    public string Sprite;
+    public string Prototype;
 
     /// <summary>
-    /// Department id to set for the door, if the style has one.
+    /// The group ID of the object being painted.
     /// </summary>
     [DataField]
-    public string? Department;
+    public string Group;
 
-    public SprayPainterDoorDoAfterEvent(string sprite, string? department)
+    /// <summary>
+    /// The cost, in charges, to paint this object.
+    /// </summary>
+    [DataField]
+    public int Cost;
+
+    public SprayPainterDoAfterEvent(string prototype, string group, int cost)
     {
-        Sprite = sprite;
-        Department = department;
+        Prototype = prototype;
+        Group = group;
+        Cost = cost;
     }
 
     public override DoAfterEvent Clone() => this;
@@ -71,3 +103,17 @@ public sealed partial class SprayPainterPipeDoAfterEvent : DoAfterEvent
 
     public override DoAfterEvent Clone() => this;
 }
+
+/// <summary>
+/// An action raised on an entity when it is spray painted.
+/// </summary>
+/// <param name="User">The entity painting this item.</param>
+/// <param name="Tool">The entity used to paint this item.</param>
+/// <param name="Prototype">The prototype used to generate the new painted appearance.</param>
+/// <param name="Group">The group of the entity being painted (e.g. airlocks with glass, canisters).</param>
+[ByRefEvent]
+public partial record struct EntityPaintedEvent(
+    EntityUid? User,
+    EntityUid Tool,
+    EntProtoId Prototype,
+    ProtoId<PaintableGroupPrototype> Group);
diff --git a/Content.Shared/StatusEffect/StatusEffectsSystem.cs b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
index f3409d1c2c..b56acd3cc5 100644
--- a/Content.Shared/StatusEffect/StatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
@@ -9,7 +9,7 @@ using Robust.Shared.Utility;
 
 namespace Content.Shared.StatusEffect
 {
-    [Obsolete("Migration to Content.Shared.StatusEffectNew.SharedStatusEffectsSystem is required")]
+    [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
     public sealed class StatusEffectsSystem : EntitySystem
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -106,7 +106,7 @@ namespace Content.Shared.StatusEffect
         /// <param name="status">The status effects component to change, if you already have it.</param>
         /// <returns>False if the effect could not be added or the component already exists, true otherwise.</returns>
         /// <typeparam name="T">The component type to add and remove from the entity.</typeparam>
-        [Obsolete("Migration to Content.Shared.StatusEffectNew.SharedStatusEffectsSystem is required")]
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryAddStatusEffect<T>(EntityUid uid, string key, TimeSpan time, bool refresh,
             StatusEffectsComponent? status = null)
             where T : IComponent, new()
@@ -126,7 +126,7 @@ namespace Content.Shared.StatusEffect
 
         }
 
-        [Obsolete("Migration to Content.Shared.StatusEffectNew.SharedStatusEffectsSystem is required")]
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryAddStatusEffect(EntityUid uid, string key, TimeSpan time, bool refresh, string component,
             StatusEffectsComponent? status = null)
         {
@@ -166,7 +166,7 @@ namespace Content.Shared.StatusEffect
         ///     If the effect already exists, it will simply replace the cooldown with the new one given.
         ///     If you want special 'effect merging' behavior, do it your own damn self!
         /// </remarks>
-        [Obsolete("Migration to Content.Shared.StatusEffectNew.SharedStatusEffectsSystem is required")]
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryAddStatusEffect(EntityUid uid,
             string key,
             TimeSpan time,
@@ -260,7 +260,7 @@ namespace Content.Shared.StatusEffect
         ///     Obviously this doesn't automatically clear any effects a status effect might have.
         ///     That's up to the removed component to handle itself when it's removed.
         /// </remarks>
-        [Obsolete("Migration to Content.Shared.StatusEffectNew.SharedStatusEffectsSystem is required")]
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryRemoveStatusEffect(EntityUid uid, string key,
             StatusEffectsComponent? status = null, bool remComp = true)
         {
@@ -304,7 +304,7 @@ namespace Content.Shared.StatusEffect
         /// <param name="uid">The entity to remove effects from.</param>
         /// <param name="status">The status effects component to change, if you already have it.</param>
         /// <returns>False if any status effects failed to be removed, true if they all did.</returns>
-        [Obsolete("Migration to Content.Shared.StatusEffectNew.SharedStatusEffectsSystem is required")]
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryRemoveAllStatusEffects(EntityUid uid,
             StatusEffectsComponent? status = null)
         {
@@ -328,7 +328,7 @@ namespace Content.Shared.StatusEffect
         /// <param name="uid">The entity to check on.</param>
         /// <param name="key">The status effect ID to check for</param>
         /// <param name="status">The status effect component, should you already have it.</param>
-        [Obsolete("Migration to Content.Shared.StatusEffectNew.SharedStatusEffectsSystem is required")]
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool HasStatusEffect(EntityUid uid, string key,
             StatusEffectsComponent? status = null)
         {
@@ -346,7 +346,7 @@ namespace Content.Shared.StatusEffect
         /// <param name="uid">The entity to check on.</param>
         /// <param name="key">The status effect ID to check for</param>
         /// <param name="status">The status effect component, should you already have it.</param>
-        [Obsolete("Migration to Content.Shared.StatusEffectNew.SharedStatusEffectsSystem is required")]
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool CanApplyEffect(EntityUid uid, string key, StatusEffectsComponent? status = null)
         {
             // don't log since stuff calling this prolly doesn't care if we don't actually have it
@@ -373,7 +373,7 @@ namespace Content.Shared.StatusEffect
         /// <param name="key">The status effect to add time to.</param>
         /// <param name="time">The amount of time to add.</param>
         /// <param name="status">The status effect component, should you already have it.</param>
-        [Obsolete("Migration to Content.Shared.StatusEffectNew.SharedStatusEffectsSystem is required")]
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryAddTime(EntityUid uid, string key, TimeSpan time,
             StatusEffectsComponent? status = null)
         {
@@ -405,7 +405,7 @@ namespace Content.Shared.StatusEffect
         /// <param name="key">The status effect to remove time from.</param>
         /// <param name="time">The amount of time to add.</param>
         /// <param name="status">The status effect component, should you already have it.</param>
-        [Obsolete("Migration to Content.Shared.StatusEffectNew.SharedStatusEffectsSystem is required")]
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryRemoveTime(EntityUid uid, string key, TimeSpan time,
             StatusEffectsComponent? status = null)
         {
@@ -441,7 +441,7 @@ namespace Content.Shared.StatusEffect
         /// <remarks>
         ///     Not used internally; just sets it itself.
         /// </remarks>
-        [Obsolete("Migration to Content.Shared.StatusEffectNew.SharedStatusEffectsSystem is required")]
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TrySetTime(EntityUid uid, string key, TimeSpan time,
             StatusEffectsComponent? status = null)
         {
@@ -465,7 +465,7 @@ namespace Content.Shared.StatusEffect
         /// <param name="time">Out var for the time, if it exists.</param>
         /// <param name="status">The status effects component to use, if any.</param>
         /// <returns>False if the status effect was not active, true otherwise.</returns>
-        [Obsolete("Migration to Content.Shared.StatusEffectNew.SharedStatusEffectsSystem is required")]
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryGetTime(EntityUid uid, string key,
             [NotNullWhen(true)] out (TimeSpan, TimeSpan)? time,
             StatusEffectsComponent? status = null)
diff --git a/Content.Shared/StatusEffectNew/Components/StatusEffectAlertComponent.cs b/Content.Shared/StatusEffectNew/Components/StatusEffectAlertComponent.cs
new file mode 100644
index 0000000000..a389be6947
--- /dev/null
+++ b/Content.Shared/StatusEffectNew/Components/StatusEffectAlertComponent.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Alert;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.StatusEffectNew.Components;
+
+/// <summary>
+/// Used in conjunction with <see cref="StatusEffectComponent"/> to display an alert when the status effect is present.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[EntityCategory("StatusEffects")]
+public sealed partial class StatusEffectAlertComponent : Component
+{
+    /// <summary>
+    /// Status effect indication for the player.
+    /// </summary>
+    [DataField]
+    public ProtoId<AlertPrototype> Alert;
+
+    /// <summary>
+    /// If the status effect has a set end time and this is true, a duration
+    /// indicator will be displayed with the alert.
+    /// </summary>
+    [DataField]
+    public bool ShowDuration = true;
+}
diff --git a/Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs b/Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs
index 6419874212..25f40718e9 100644
--- a/Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs
+++ b/Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs
@@ -11,7 +11,7 @@ namespace Content.Shared.StatusEffectNew.Components;
 /// Provides a link between the effect and the affected entity, and some data common to all status effects.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
-[Access(typeof(SharedStatusEffectsSystem))]
+[Access(typeof(StatusEffectsSystem))]
 [EntityCategory("StatusEffects")]
 public sealed partial class StatusEffectComponent : Component
 {
@@ -21,12 +21,6 @@ public sealed partial class StatusEffectComponent : Component
     [DataField, AutoNetworkedField]
     public EntityUid? AppliedTo;
 
-    /// <summary>
-    /// Status effect indication for the player. If Null, no Alert will be displayed.
-    /// </summary>
-    [DataField]
-    public ProtoId<AlertPrototype>? Alert;
-
     /// <summary>
     /// When this effect will end. If Null, the effect lasts indefinitely.
     /// </summary>
diff --git a/Content.Shared/StatusEffectNew/Components/StatusEffectContainerComponent.cs b/Content.Shared/StatusEffectNew/Components/StatusEffectContainerComponent.cs
index 6d9efaf3ac..9c2820653a 100644
--- a/Content.Shared/StatusEffectNew/Components/StatusEffectContainerComponent.cs
+++ b/Content.Shared/StatusEffectNew/Components/StatusEffectContainerComponent.cs
@@ -1,5 +1,5 @@
+using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
 
 namespace Content.Shared.StatusEffectNew.Components;
 
@@ -9,15 +9,14 @@ namespace Content.Shared.StatusEffectNew.Components;
 /// Can be used for tracking currently applied status effects.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-[Access(typeof(SharedStatusEffectsSystem))]
+[Access(typeof(StatusEffectsSystem))]
 public sealed partial class StatusEffectContainerComponent : Component
 {
-    [DataField]
-    public HashSet<EntityUid> ActiveStatusEffects = new();
-}
+    public const string ContainerId = "status-effects";
 
-[Serializable, NetSerializable]
-public sealed class StatusEffectContainerComponentState(HashSet<NetEntity> activeStatusEffects) : ComponentState
-{
-    public readonly HashSet<NetEntity> ActiveStatusEffects = activeStatusEffects;
+    /// <summary>
+    /// The actual container holding references to the active status effects
+    /// </summary>
+    [ViewVariables]
+    public Container? ActiveStatusEffects;
 }
diff --git a/Content.Shared/StatusEffectNew/StatusEffectAlertSystem.cs b/Content.Shared/StatusEffectNew/StatusEffectAlertSystem.cs
new file mode 100644
index 0000000000..d540f865c0
--- /dev/null
+++ b/Content.Shared/StatusEffectNew/StatusEffectAlertSystem.cs
@@ -0,0 +1,62 @@
+using Content.Shared.Alert;
+using Content.Shared.StatusEffectNew.Components;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.StatusEffectNew;
+
+/// <summary>
+/// Handles displaying status effects that should show an alert, optionally with a duration.
+/// </summary>
+public sealed class StatusEffectAlertSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly AlertsSystem _alerts = default!;
+
+    private EntityQuery<StatusEffectComponent> _effectQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<StatusEffectAlertComponent, StatusEffectAppliedEvent>(OnStatusEffectApplied);
+        SubscribeLocalEvent<StatusEffectAlertComponent, StatusEffectRemovedEvent>(OnStatusEffectRemoved);
+        SubscribeLocalEvent<StatusEffectAlertComponent, StatusEffectEndTimeUpdatedEvent>(OnEndTimeUpdated);
+
+        _effectQuery = GetEntityQuery<StatusEffectComponent>();
+    }
+
+    private void OnStatusEffectApplied(Entity<StatusEffectAlertComponent> ent, ref StatusEffectAppliedEvent args)
+    {
+        if (!_effectQuery.TryComp(ent, out var effectComp))
+            return;
+
+        RefreshAlert(ent, args.Target, effectComp.EndEffectTime);
+    }
+
+    private void OnStatusEffectRemoved(Entity<StatusEffectAlertComponent> ent, ref StatusEffectRemovedEvent args)
+    {
+        _alerts.ClearAlert(args.Target, ent.Comp.Alert);
+    }
+
+    private void OnEndTimeUpdated(Entity<StatusEffectAlertComponent> ent, ref StatusEffectEndTimeUpdatedEvent args)
+    {
+        RefreshAlert(ent, args.Target, args.EndTime);
+    }
+
+    private void RefreshAlert(Entity<StatusEffectAlertComponent> ent, EntityUid target, TimeSpan? endTime)
+    {
+        (TimeSpan Start, TimeSpan End)? cooldown = null;
+
+        // Make sure the start time of the alert cooldown is still accurate
+        // This ensures the progress wheel doesn't "reset" every duration change.
+        if (ent.Comp.ShowDuration
+            && endTime is not null
+            && _alerts.TryGet(ent.Comp.Alert, out var alert))
+        {
+            _alerts.TryGetAlertState(target, alert.AlertKey, out var alertState);
+            cooldown = (alertState.Cooldown?.Item1 ?? _timing.CurTime, endTime.Value);
+        }
+
+        _alerts.ShowAlert(target, ent.Comp.Alert, cooldown: cooldown);
+    }
+}
diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
index 5e20cea1bb..d508ea8b73 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Shared.StatusEffectNew;
 
-public abstract partial class SharedStatusEffectsSystem
+public sealed partial class StatusEffectsSystem
 {
     /// <summary>
     /// Increments duration of status effect by <see cref="duration"/>.
@@ -103,28 +103,22 @@ public abstract partial class SharedStatusEffectsSystem
     /// </summary>
     public bool TryRemoveStatusEffect(EntityUid target, EntProtoId effectProto)
     {
-        if (_net.IsClient) //We cant remove the effect on the client (we need someone more robust at networking than me)
-            return false;
-
         if (!_containerQuery.TryComp(target, out var container))
             return false;
 
-        foreach (var effect in container.ActiveStatusEffects)
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
         {
             var meta = MetaData(effect);
-            if (meta.EntityPrototype is not null && meta.EntityPrototype == effectProto)
-            {
-                if (!_effectQuery.TryComp(effect, out var effectComp))
-                    return false;
 
-                var ev = new StatusEffectRemovedEvent(target);
-                RaiseLocalEvent(effect, ref ev);
+            if (meta.EntityPrototype is null
+                || meta.EntityPrototype != effectProto)
+                continue;
 
-                QueueDel(effect);
-                container.ActiveStatusEffects.Remove(effect);
-                Dirty(target, container);
-                return true;
-            }
+            if (!_effectQuery.HasComp(effect))
+                return false;
+
+            PredictedQueueDel(effect);
+            return true;
         }
 
         return false;
@@ -138,7 +132,7 @@ public abstract partial class SharedStatusEffectsSystem
         if (!_containerQuery.TryComp(target, out var container))
             return false;
 
-        foreach (var effect in container.ActiveStatusEffects)
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
         {
             var meta = MetaData(effect);
             if (meta.EntityPrototype is not null && meta.EntityPrototype == effectProto)
@@ -157,7 +151,7 @@ public abstract partial class SharedStatusEffectsSystem
         if (!_containerQuery.TryComp(target, out var container))
             return false;
 
-        foreach (var e in container.ActiveStatusEffects)
+        foreach (var e in container.ActiveStatusEffects?.ContainedEntities ?? [])
         {
             var meta = MetaData(e);
             if (meta.EntityPrototype is not null && meta.EntityPrototype == effectProto)
@@ -188,7 +182,7 @@ public abstract partial class SharedStatusEffectsSystem
         if (!Resolve(uid, ref container))
             return false;
 
-        foreach (var effect in container.ActiveStatusEffects)
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
         {
             var meta = MetaData(effect);
             if (meta.EntityPrototype is not null && meta.EntityPrototype == effectProto)
@@ -218,7 +212,7 @@ public abstract partial class SharedStatusEffectsSystem
         if (!TryEffectsWithComp<T>(uid, out var status))
             return false;
 
-        time.Item2 = TimeSpan.Zero;
+        time.EndEffectTime = TimeSpan.Zero;
 
         foreach (var effect in status)
         {
@@ -228,7 +222,7 @@ public abstract partial class SharedStatusEffectsSystem
                 return true;
             }
 
-            if (effect.Comp2.EndEffectTime > time.Item2)
+            if (effect.Comp2.EndEffectTime > time.EndEffectTime)
                 time = (effect.Owner, effect.Comp2.EndEffectTime);
         }
         return true;
@@ -249,7 +243,7 @@ public abstract partial class SharedStatusEffectsSystem
         if (!_containerQuery.TryComp(uid, out var container))
             return false;
 
-        foreach (var effect in container.ActiveStatusEffects)
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
         {
             var meta = MetaData(effect);
             if (meta.EntityPrototype is not null && meta.EntityPrototype == effectProto)
@@ -273,7 +267,7 @@ public abstract partial class SharedStatusEffectsSystem
         if (!_containerQuery.TryComp(uid, out var container))
             return false;
 
-        foreach (var effect in container.ActiveStatusEffects)
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
         {
             var meta = MetaData(effect);
             if (meta.EntityPrototype is not null && meta.EntityPrototype == effectProto)
@@ -293,7 +287,7 @@ public abstract partial class SharedStatusEffectsSystem
         if (!_containerQuery.TryComp(target, out var container))
             return false;
 
-        foreach (var effect in container.ActiveStatusEffects)
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
         {
             if (HasComp<T>(effect))
                 return true;
@@ -311,7 +305,7 @@ public abstract partial class SharedStatusEffectsSystem
         if (!_containerQuery.TryComp(target, out var container))
             return false;
 
-        foreach (var effect in container.ActiveStatusEffects)
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
         {
             if (!_effectQuery.TryComp(effect, out var statusComp))
                 continue;
@@ -338,7 +332,7 @@ public abstract partial class SharedStatusEffectsSystem
         if (!_containerQuery.TryComp(target, out var container))
             return false;
 
-        foreach (var effect in container.ActiveStatusEffects)
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
         {
             if (!HasComp<T>(effect))
                 continue;
diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
index 0bf02b6cd6..35a9556736 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
@@ -5,9 +5,9 @@ using Robust.Shared.Player;
 
 namespace Content.Shared.StatusEffectNew;
 
-public abstract partial class SharedStatusEffectsSystem
+public sealed partial class StatusEffectsSystem
 {
-    protected void InitializeRelay()
+    private void InitializeRelay()
     {
         //CP14 Zone
         SubscribeLocalEvent<StatusEffectContainerComponent, DamageModifyEvent>(RelayStatusEffectEvent);
@@ -17,12 +17,12 @@ public abstract partial class SharedStatusEffectsSystem
         SubscribeLocalEvent<StatusEffectContainerComponent, LocalPlayerDetachedEvent>(RelayStatusEffectEvent);
     }
 
-    protected void RefRelayStatusEffectEvent<T>(EntityUid uid, StatusEffectContainerComponent component, ref T args) where T : struct
+    private void RefRelayStatusEffectEvent<T>(EntityUid uid, StatusEffectContainerComponent component, ref T args) where T : struct
     {
         RelayEvent((uid, component), ref args);
     }
 
-    protected void RelayStatusEffectEvent<T>(EntityUid uid, StatusEffectContainerComponent component, T args) where T : class
+    private void RelayStatusEffectEvent<T>(EntityUid uid, StatusEffectContainerComponent component, T args) where T : class
     {
         RelayEvent((uid, component), args);
     }
@@ -31,7 +31,7 @@ public abstract partial class SharedStatusEffectsSystem
     {
         // this copies the by-ref event if it is a struct
         var ev = new StatusEffectRelayedEvent<T>(args);
-        foreach (var activeEffect in statusEffect.Comp.ActiveStatusEffects)
+        foreach (var activeEffect in statusEffect.Comp.ActiveStatusEffects?.ContainedEntities ?? [])
         {
             RaiseLocalEvent(activeEffect, ref ev);
         }
@@ -43,7 +43,7 @@ public abstract partial class SharedStatusEffectsSystem
     {
         // this copies the by-ref event if it is a struct
         var ev = new StatusEffectRelayedEvent<T>(args);
-        foreach (var activeEffect in statusEffect.Comp.ActiveStatusEffects)
+        foreach (var activeEffect in statusEffect.Comp.ActiveStatusEffects?.ContainedEntities ?? [])
         {
             RaiseLocalEvent(activeEffect, ref ev);
         }
diff --git a/Content.Shared/StatusEffectNew/SharedStatusEffectsSystem.cs b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
similarity index 56%
rename from Content.Shared/StatusEffectNew/SharedStatusEffectsSystem.cs
rename to Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
index 9e6ed4d7ff..7f39a1f7c5 100644
--- a/Content.Shared/StatusEffectNew/SharedStatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
@@ -1,9 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.Alert;
 using Content.Shared.StatusEffectNew.Components;
 using Content.Shared.Whitelist;
-using Robust.Shared.GameStates;
-using Robust.Shared.Network;
+using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
@@ -13,15 +11,12 @@ namespace Content.Shared.StatusEffectNew;
 /// This system controls status effects, their lifetime, and provides an API for adding them to entities,
 /// removing them from entities, or getting information about current effects on entities.
 /// </summary>
-public abstract partial class SharedStatusEffectsSystem : EntitySystem
+public sealed partial class StatusEffectsSystem : EntitySystem
 {
-    [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly IComponentFactory _compFactory = default!;
-    [Dependency] private readonly INetManager _net = default!;
 
     private EntityQuery<StatusEffectContainerComponent> _containerQuery;
     private EntityQuery<StatusEffectComponent> _effectQuery;
@@ -32,20 +27,15 @@ public abstract partial class SharedStatusEffectsSystem : EntitySystem
 
         InitializeRelay();
 
-        SubscribeLocalEvent<StatusEffectComponent, StatusEffectAppliedEvent>(OnStatusEffectApplied);
-        SubscribeLocalEvent<StatusEffectComponent, StatusEffectRemovedEvent>(OnStatusEffectRemoved);
-
-        SubscribeLocalEvent<StatusEffectContainerComponent, ComponentGetState>(OnGetState);
+        SubscribeLocalEvent<StatusEffectContainerComponent, ComponentInit>(OnStatusContainerInit);
+        SubscribeLocalEvent<StatusEffectContainerComponent, ComponentShutdown>(OnStatusContainerShutdown);
+        SubscribeLocalEvent<StatusEffectContainerComponent, EntInsertedIntoContainerMessage>(OnEntityInserted);
+        SubscribeLocalEvent<StatusEffectContainerComponent, EntRemovedFromContainerMessage>(OnEntityRemoved);
 
         _containerQuery = GetEntityQuery<StatusEffectContainerComponent>();
         _effectQuery = GetEntityQuery<StatusEffectComponent>();
     }
 
-    private void OnGetState(Entity<StatusEffectContainerComponent> ent, ref ComponentGetState args)
-    {
-        args.State = new StatusEffectContainerComponentState(GetNetEntitySet(ent.Comp.ActiveStatusEffects));
-    }
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -70,15 +60,59 @@ public abstract partial class SharedStatusEffectsSystem : EntitySystem
         }
     }
 
-    private void AddStatusEffectTime(EntityUid effect, TimeSpan delta)
+    private void OnStatusContainerInit(Entity<StatusEffectContainerComponent> ent, ref ComponentInit args)
     {
-        if (!_effectQuery.TryComp(effect, out var effectComp))
+        ent.Comp.ActiveStatusEffects =
+            _container.EnsureContainer<Container>(ent, StatusEffectContainerComponent.ContainerId);
+        // We show the contents of the container to allow status effects to have visible sprites.
+        ent.Comp.ActiveStatusEffects.ShowContents = true;
+    }
+
+    private void OnStatusContainerShutdown(Entity<StatusEffectContainerComponent> ent, ref ComponentShutdown args)
+    {
+        if (ent.Comp.ActiveStatusEffects is { } container)
+            _container.ShutdownContainer(container);
+    }
+
+    private void OnEntityInserted(Entity<StatusEffectContainerComponent> ent, ref EntInsertedIntoContainerMessage args)
+    {
+        if (args.Container.ID != StatusEffectContainerComponent.ContainerId)
             return;
 
-        effectComp.EndEffectTime += delta;
-        Dirty(effect, effectComp);
+        if (!TryComp<StatusEffectComponent>(args.Entity, out var statusComp))
+            return;
 
-        ShowAlertIfNeeded(effectComp);
+        // Make sure AppliedTo is set correctly so events can rely on it
+        if (statusComp.AppliedTo != ent)
+        {
+            statusComp.AppliedTo = ent;
+            Dirty(args.Entity, statusComp);
+        }
+
+        var ev = new StatusEffectAppliedEvent(ent);
+        RaiseLocalEvent(args.Entity, ref ev);
+    }
+
+    private void OnEntityRemoved(Entity<StatusEffectContainerComponent> ent, ref EntRemovedFromContainerMessage args)
+    {
+        if (args.Container.ID != StatusEffectContainerComponent.ContainerId)
+            return;
+
+        if (!TryComp<StatusEffectComponent>(args.Entity, out var statusComp))
+            return;
+
+        var ev = new StatusEffectRemovedEvent(ent);
+        RaiseLocalEvent(args.Entity, ref ev);
+
+        // Clear AppliedTo after events are handled so event handlers can use it.
+        if (statusComp.AppliedTo == null)
+            return;
+
+        // Why not just delete it? Well, that might end up being best, but this
+        // could theoretically allow for moving status effects from one entity
+        // to another. That might be good to have for polymorphs or something.
+        statusComp.AppliedTo = null;
+        Dirty(args.Entity, statusComp);
     }
 
     private void SetStatusEffectTime(EntityUid effect, TimeSpan? duration)
@@ -97,8 +131,6 @@ public abstract partial class SharedStatusEffectsSystem : EntitySystem
             effectComp.EndEffectTime = _timing.CurTime + duration;
 
         Dirty(effect, effectComp);
-
-        ShowAlertIfNeeded(effectComp);
     }
 
     private void UpdateStatusEffectTime(EntityUid effect, TimeSpan? duration)
@@ -122,24 +154,6 @@ public abstract partial class SharedStatusEffectsSystem : EntitySystem
         }
 
         Dirty(effect, effectComp);
-
-        ShowAlertIfNeeded(effectComp);
-    }
-
-
-    private void OnStatusEffectApplied(Entity<StatusEffectComponent> ent, ref StatusEffectAppliedEvent args)
-    {
-        StatusEffectComponent statusEffect = ent;
-        ShowAlertIfNeeded(statusEffect);
-    }
-
-    private void OnStatusEffectRemoved(Entity<StatusEffectComponent> ent, ref StatusEffectRemovedEvent args)
-    {
-        if (ent.Comp.AppliedTo is null)
-            return;
-
-        if (ent.Comp is { AppliedTo: not null, Alert: not null })
-            _alerts.ClearAlert(ent.Comp.AppliedTo.Value, ent.Comp.Alert.Value);
     }
 
     private bool CanAddStatusEffect(EntityUid uid, EntProtoId effectProto)
@@ -147,7 +161,7 @@ public abstract partial class SharedStatusEffectsSystem : EntitySystem
         if (!_proto.TryIndex(effectProto, out var effectProtoData))
             return false;
 
-        if (!effectProtoData.TryGetComponent<StatusEffectComponent>(out var effectProtoComp, _compFactory))
+        if (!effectProtoData.TryGetComponent<StatusEffectComponent>(out var effectProtoComp, Factory))
             return false;
 
         if (!_whitelist.CheckBoth(uid, effectProtoComp.Blacklist, effectProtoComp.Whitelist))
@@ -181,43 +195,50 @@ public abstract partial class SharedStatusEffectsSystem : EntitySystem
         if (!CanAddStatusEffect(target, effectProto))
             return false;
 
-        var container = EnsureComp<StatusEffectContainerComponent>(target);
+        EnsureComp<StatusEffectContainerComponent>(target);
+
+        // And only if all checks passed we spawn the effect
+        if (!PredictedTrySpawnInContainer(effectProto,
+                target,
+                StatusEffectContainerComponent.ContainerId,
+                out var effect))
+            return false;
 
-        //And only if all checks passed we spawn the effect
-        var effect = PredictedSpawnAttachedTo(effectProto, Transform(target).Coordinates);
-        _transform.SetParent(effect, target);
         if (!_effectQuery.TryComp(effect, out var effectComp))
             return false;
 
         statusEffect = effect;
-
-        if (duration != null)
-            effectComp.EndEffectTime = _timing.CurTime + duration;
-
-        container.ActiveStatusEffects.Add(effect);
-        effectComp.AppliedTo = target;
-        Dirty(target, container);
-        Dirty(effect, effectComp);
-
-        var ev = new StatusEffectAppliedEvent(target);
-        RaiseLocalEvent(effect, ref ev);
+        SetStatusEffectEndTime((effect.Value, effectComp), _timing.CurTime + duration);
 
         return true;
     }
 
-    private void ShowAlertIfNeeded(StatusEffectComponent effectComp)
+    private void AddStatusEffectTime(EntityUid effect, TimeSpan delta)
     {
-        if (effectComp is { AppliedTo: not null, Alert: not null })
-        {
-            (TimeSpan, TimeSpan)? cooldown = effectComp.EndEffectTime is null
-                ? null
-                : (_timing.CurTime, effectComp.EndEffectTime.Value);
-            _alerts.ShowAlert(
-                effectComp.AppliedTo.Value,
-                effectComp.Alert.Value,
-                cooldown: cooldown
-            );
-        }
+        if (!_effectQuery.TryComp(effect, out var effectComp))
+            return;
+
+        // If we don't have an end time set, we want to just make the status effect end in delta time from now.
+        SetStatusEffectEndTime((effect, effectComp), (effectComp.EndEffectTime ?? _timing.CurTime) + delta);
+    }
+
+    private void SetStatusEffectEndTime(Entity<StatusEffectComponent?> ent, TimeSpan? endTime)
+    {
+        if (!_effectQuery.Resolve(ent, ref ent.Comp))
+            return;
+
+        if (ent.Comp.EndEffectTime == endTime)
+            return;
+
+        ent.Comp.EndEffectTime = endTime;
+
+        if (ent.Comp.AppliedTo is not { } appliedTo)
+            return; // Not much we can do!
+
+        var ev = new StatusEffectEndTimeUpdatedEvent(appliedTo, endTime);
+        RaiseLocalEvent(ent, ref ev);
+
+        Dirty(ent);
     }
 }
 
@@ -238,3 +259,11 @@ public readonly record struct StatusEffectRemovedEvent(EntityUid Target);
 /// </summary>
 [ByRefEvent]
 public record struct BeforeStatusEffectAddedEvent(EntProtoId Effect, bool Cancelled = false);
+
+/// <summary>
+/// Raised on an effect entity when its <see cref="StatusEffectComponent.EndEffectTime"/> is updated in any way.
+/// </summary>
+/// <param name="Target">The entity the effect is attached to.</param>
+/// <param name="EndTime">The new end time of the status effect, included for convenience.</param>
+[ByRefEvent]
+public record struct StatusEffectEndTimeUpdatedEvent(EntityUid Target, TimeSpan? EndTime);
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index dc5f2bf33c..1276f43cad 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -84,8 +84,7 @@ public abstract class SharedStorageSystem : EntitySystem
     /// </summary>
     public bool NestedStorage = true;
 
-    [ValidatePrototypeId<ItemSizePrototype>]
-    public const string DefaultStorageMaxItemSize = "Normal";
+    public static readonly ProtoId<ItemSizePrototype> DefaultStorageMaxItemSize = "Normal";
 
     public const float AreaInsertDelayPerItem = 0.075f;
     private static AudioParams _audioParams = AudioParams.Default
@@ -258,7 +257,7 @@ public abstract class SharedStorageSystem : EntitySystem
 
     private void UpdatePrototypeCache()
     {
-        _defaultStorageMaxItemSize = _prototype.Index<ItemSizePrototype>(DefaultStorageMaxItemSize);
+        _defaultStorageMaxItemSize = _prototype.Index(DefaultStorageMaxItemSize);
         _sortedSizes.Clear();
         _sortedSizes.AddRange(_prototype.EnumeratePrototypes<ItemSizePrototype>());
         _sortedSizes.Sort();
diff --git a/Content.Shared/Stunnable/SharedStunSystem.Visualizer.cs b/Content.Shared/Stunnable/SharedStunSystem.Visualizer.cs
new file mode 100644
index 0000000000..4d49621a8a
--- /dev/null
+++ b/Content.Shared/Stunnable/SharedStunSystem.Visualizer.cs
@@ -0,0 +1,55 @@
+using Content.Shared.Bed.Sleep;
+using Content.Shared.Mobs;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Stunnable;
+
+public abstract partial class SharedStunSystem
+{
+    public void InitializeAppearance()
+    {
+        SubscribeLocalEvent<StunVisualsComponent, MobStateChangedEvent>(OnStunMobStateChanged);
+        SubscribeLocalEvent<StunVisualsComponent, SleepStateChangedEvent>(OnSleepStateChanged);
+    }
+
+    private bool GetStarsData(Entity<StunVisualsComponent, StunnedComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp2, false))
+            return false;
+
+        return Blocker.CanConsciouslyPerformAction(entity);
+    }
+
+    private void OnStunMobStateChanged(Entity<StunVisualsComponent> entity, ref MobStateChangedEvent args)
+    {
+        Appearance.SetData(entity, StunVisuals.SeeingStars, GetStarsData(entity));
+    }
+
+    private void OnSleepStateChanged(Entity<StunVisualsComponent> entity, ref SleepStateChangedEvent args)
+    {
+        Appearance.SetData(entity, StunVisuals.SeeingStars, GetStarsData(entity));
+    }
+
+    public void TrySeeingStars(Entity<AppearanceComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return;
+
+        // Here so server can tell the client to do things
+        // Don't dirty the component if we don't need to
+        if (!Appearance.TryGetData<bool>(entity, StunVisuals.SeeingStars, out var stars, entity.Comp) && stars)
+            return;
+
+        if (!Blocker.CanConsciouslyPerformAction(entity))
+            return;
+
+        Appearance.SetData(entity, StunVisuals.SeeingStars, true);
+        Dirty(entity);
+    }
+
+    [Serializable, NetSerializable, Flags]
+    public enum StunVisuals
+    {
+        SeeingStars,
+    }
+}
diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs
index e18a7f3439..c46dd10ed7 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.cs
@@ -20,15 +20,17 @@ using Robust.Shared.Audio.Systems;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.Stunnable;
 
-public abstract class SharedStunSystem : EntitySystem
+public abstract partial class SharedStunSystem : EntitySystem
 {
-    [Dependency] private readonly ActionBlockerSystem _blocker = default!;
+    [Dependency] protected readonly ActionBlockerSystem Blocker = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!;
     [Dependency] private readonly StandingStateSystem _standingState = default!;
     [Dependency] private readonly StatusEffectsSystem _statusEffect = default!;
@@ -49,7 +51,7 @@ public abstract class SharedStunSystem : EntitySystem
         SubscribeLocalEvent<SlowedDownComponent, ComponentShutdown>(OnSlowRemove);
 
         SubscribeLocalEvent<StunnedComponent, ComponentStartup>(UpdateCanMove);
-        SubscribeLocalEvent<StunnedComponent, ComponentShutdown>(UpdateCanMove);
+        SubscribeLocalEvent<StunnedComponent, ComponentShutdown>(OnStunShutdown);
 
         SubscribeLocalEvent<StunOnContactComponent, StartCollideEvent>(OnStunOnContactCollide);
 
@@ -71,6 +73,9 @@ public abstract class SharedStunSystem : EntitySystem
         SubscribeLocalEvent<StunnedComponent, IsEquippingAttemptEvent>(OnEquipAttempt);
         SubscribeLocalEvent<StunnedComponent, IsUnequippingAttemptEvent>(OnUnequipAttempt);
         SubscribeLocalEvent<MobStateComponent, MobStateChangedEvent>(OnMobStateChanged);
+
+        // Stun Appearance Data
+        InitializeAppearance();
     }
 
     private void OnAttemptInteract(Entity<StunnedComponent> ent, ref InteractionAttemptEvent args)
@@ -107,9 +112,16 @@ public abstract class SharedStunSystem : EntitySystem
 
     }
 
+    private void OnStunShutdown(Entity<StunnedComponent> ent, ref ComponentShutdown args)
+    {
+        // This exists so the client can end their funny animation if they're playing one.
+        UpdateCanMove(ent, ent.Comp, args);
+        Appearance.RemoveData(ent, StunVisuals.SeeingStars);
+    }
+
     private void UpdateCanMove(EntityUid uid, StunnedComponent component, EntityEventArgs args)
     {
-        _blocker.UpdateCanMove(uid);
+        Blocker.UpdateCanMove(uid);
     }
 
     private void OnStunOnContactCollide(Entity<StunOnContactComponent> ent, ref StartCollideEvent args)
diff --git a/Content.Shared/Stunnable/StunVisualsComponent.cs b/Content.Shared/Stunnable/StunVisualsComponent.cs
new file mode 100644
index 0000000000..6f1070a558
--- /dev/null
+++ b/Content.Shared/Stunnable/StunVisualsComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Stunnable;
+
+/// <summary>
+/// This is used to listen to incoming events from the AppearanceSystem
+/// </summary>
+[RegisterComponent]
+public sealed partial class StunVisualsComponent : Component
+{
+    [DataField]
+    public ResPath StarsPath = new ("Mobs/Effects/stunned.rsi");
+
+    [DataField]
+    public string State = "stunned";
+}
diff --git a/Content.Shared/Stunnable/StunnedComponent.cs b/Content.Shared/Stunnable/StunnedComponent.cs
index 51a27ac90a..037a3cd3ac 100644
--- a/Content.Shared/Stunnable/StunnedComponent.cs
+++ b/Content.Shared/Stunnable/StunnedComponent.cs
@@ -3,6 +3,4 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.Stunnable;
 
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedStunSystem))]
-public sealed partial class StunnedComponent : Component
-{
-}
+public sealed partial class StunnedComponent : Component;
diff --git a/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs b/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
index 822b8acaf0..a4fa463ee0 100644
--- a/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
+++ b/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
@@ -2,6 +2,7 @@ using Content.Shared.Audio;
 using Content.Shared.Construction.Components;
 using Content.Shared.Explosion;
 using Content.Shared.Eye;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Maps;
 using Content.Shared.Popups;
@@ -83,6 +84,10 @@ namespace Content.Shared.SubFloor
 
         private void OnInteractionAttempt(EntityUid uid, SubFloorHideComponent component, ref GettingInteractedWithAttemptEvent args)
         {
+            // Allow admins (e.g., mappers/aghosts) to twiddle with stuff under subfloors
+            if (HasComp<BypassInteractionChecksComponent>(args.Uid))
+                return;
+
             // No interactions with entities hidden under floor tiles.
             if (component.BlockInteractions && component.IsUnderCover)
                 args.Cancelled = true;
diff --git a/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraMonitorSystem.cs b/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraMonitorSystem.cs
index cc6193a090..aa03e7aee9 100644
--- a/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraMonitorSystem.cs
+++ b/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraMonitorSystem.cs
@@ -1,3 +1,5 @@
+using Content.Shared.DeviceNetwork;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.SurveillanceCamera;
@@ -83,11 +85,11 @@ public sealed class SurveillanceCameraSetupBoundUiState : BoundUserInterfaceStat
 {
     public string Name { get; }
     public uint Network { get; }
-    public List<string> Networks { get; }
+    public List<ProtoId<DeviceFrequencyPrototype>> Networks { get; }
     public bool NameDisabled { get; }
     public bool NetworkDisabled { get; }
 
-    public SurveillanceCameraSetupBoundUiState(string name, uint network, List<string> networks, bool nameDisabled, bool networkDisabled)
+    public SurveillanceCameraSetupBoundUiState(string name, uint network, List<ProtoId<DeviceFrequencyPrototype>> networks, bool nameDisabled, bool networkDisabled)
     {
         Name = name;
         Network = network;
diff --git a/Content.Shared/Telephone/TelephoneComponent.cs b/Content.Shared/Telephone/TelephoneComponent.cs
index c24840ce01..89748d78a4 100644
--- a/Content.Shared/Telephone/TelephoneComponent.cs
+++ b/Content.Shared/Telephone/TelephoneComponent.cs
@@ -81,12 +81,6 @@ public sealed partial class TelephoneComponent : Component
     [DataField]
     public float ListeningRange = 2;
 
-    /// <summary>
-    /// Specifies whether this telephone require power to fucntion
-    /// </summary>
-    [DataField]
-    public bool RequiresPower = true;
-
     /// <summary>
     /// This telephone should not appear on public telephone directories
     /// </summary>
diff --git a/Content.Shared/Throwing/CatchAttemptEvent.cs b/Content.Shared/Throwing/CatchAttemptEvent.cs
new file mode 100644
index 0000000000..03206bdcd9
--- /dev/null
+++ b/Content.Shared/Throwing/CatchAttemptEvent.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.Throwing;
+
+/// <summary>
+/// Raised on someone when they try to catch an item.
+/// </summary>
+[ByRefEvent]
+public record struct CatchAttemptEvent(EntityUid Item, float CatchChance, bool Cancelled = false);
diff --git a/Content.Shared/Throwing/CatchableComponent.cs b/Content.Shared/Throwing/CatchableComponent.cs
new file mode 100644
index 0000000000..ce68374440
--- /dev/null
+++ b/Content.Shared/Throwing/CatchableComponent.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Throwing;
+
+/// <summary>
+/// Allows this entity to be caught in your hands when someone else throws it at you.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class CatchableComponent : Component
+{
+    /// <summary>
+    /// If true this item can only be caught while in combat mode.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RequireCombatMode;
+
+    /// <summary>
+    /// The chance of successfully catching.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float CatchChance = 1.0f;
+
+    /// <summary>
+    /// Optional whitelist for who can catch this item.
+    /// </summary>
+    /// <summary>
+    /// Example usecase: Only someone who knows martial arts can catch grenades.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? CatcherWhitelist;
+
+    /// <summary>
+    /// The sound to play when successfully catching.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? CatchSuccessSound;
+}
diff --git a/Content.Shared/Throwing/CatchableSystem.cs b/Content.Shared/Throwing/CatchableSystem.cs
new file mode 100644
index 0000000000..8f2fd355ba
--- /dev/null
+++ b/Content.Shared/Throwing/CatchableSystem.cs
@@ -0,0 +1,84 @@
+using Content.Shared.CombatMode;
+using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Popups;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Throwing;
+
+public sealed partial class CatchableSystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly ThrownItemSystem _thrown = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+
+    private EntityQuery<HandsComponent> _handsQuery;
+    private EntityQuery<CombatModeComponent> _combatModeQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<CatchableComponent, ThrowDoHitEvent>(OnDoHit);
+
+        _handsQuery = GetEntityQuery<HandsComponent>();
+        _combatModeQuery = GetEntityQuery<CombatModeComponent>();
+    }
+
+    private void OnDoHit(Entity<CatchableComponent> ent, ref ThrowDoHitEvent args)
+    {
+        if (!_handsQuery.TryGetComponent(args.Target, out var handsComp))
+            return; // don't do anything for walls etc
+
+        // Is the catcher in combat mode if required?
+        if (ent.Comp.RequireCombatMode && (!_combatModeQuery.TryComp(args.Target, out var combatModeComp) || !combatModeComp.IsInCombatMode))
+            return;
+
+        // Is the catcher able to catch this item?
+        if (!_whitelist.IsWhitelistPassOrNull(ent.Comp.CatcherWhitelist, args.Target))
+            return;
+
+        var attemptEv = new CatchAttemptEvent(ent.Owner, ent.Comp.CatchChance);
+        RaiseLocalEvent(args.Target, ref attemptEv);
+
+        if (attemptEv.Cancelled)
+            return;
+
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        var seed = HashCode.Combine((int)_timing.CurTick.Value, GetNetEntity(ent).Id);
+        var rand = new System.Random(seed);
+        if (!rand.Prob(ent.Comp.CatchChance))
+            return;
+
+        // Try to catch!
+        if (!_hands.TryPickupAnyHand(args.Target, ent.Owner, handsComp: handsComp, animate: false))
+            return; // The hands are full!
+
+        // Success!
+
+        // We picked it up already but we still have to raise the throwing stop (but not the landing) events at the right time,
+        // otherwise it will raise the events for that later while still in your hand
+        _thrown.StopThrow(ent.Owner, args.Component);
+
+        // Collisions don't work properly with PopupPredicted or PlayPredicted.
+        // So we make this server only.
+        if (_net.IsClient)
+            return;
+
+        var selfMessage = Loc.GetString("catchable-component-success-self", ("item", ent.Owner), ("catcher", Identity.Entity(args.Target, EntityManager)));
+        var othersMessage = Loc.GetString("catchable-component-success-others", ("item", ent.Owner), ("catcher", Identity.Entity(args.Target, EntityManager)));
+        _popup.PopupEntity(selfMessage, args.Target, args.Target);
+        _popup.PopupEntity(othersMessage, args.Target, Filter.PvsExcept(args.Target), true);
+        _audio.PlayPvs(ent.Comp.CatchSuccessSound, args.Target);
+    }
+}
diff --git a/Content.Shared/Tiles/FloorTileComponent.cs b/Content.Shared/Tiles/FloorTileComponent.cs
index 92208a76d4..5b9c48ca8b 100644
--- a/Content.Shared/Tiles/FloorTileComponent.cs
+++ b/Content.Shared/Tiles/FloorTileComponent.cs
@@ -1,7 +1,7 @@
 using Content.Shared.Maps;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Tiles
 {
@@ -12,8 +12,8 @@ namespace Content.Shared.Tiles
     [RegisterComponent, NetworkedComponent]
     public sealed partial class FloorTileComponent : Component
     {
-        [DataField("outputs", customTypeSerializer: typeof(PrototypeIdListSerializer<ContentTileDefinition>))]
-        public List<string>? OutputTiles;
+        [DataField]
+        public List<ProtoId<ContentTileDefinition>>? Outputs;
 
         [DataField("placeTileSound")] public SoundSpecifier PlaceTileSound =
             new SoundPathSpecifier("/Audio/Items/genhit.ogg")
diff --git a/Content.Shared/Tiles/FloorTileSystem.cs b/Content.Shared/Tiles/FloorTileSystem.cs
index 875f2277c4..e7bd03979b 100644
--- a/Content.Shared/Tiles/FloorTileSystem.cs
+++ b/Content.Shared/Tiles/FloorTileSystem.cs
@@ -2,7 +2,6 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Audio;
 using Content.Shared.Database;
 using Content.Shared.Interaction;
 using Content.Shared.Maps;
@@ -17,7 +16,6 @@ using Robust.Shared.Network;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Tiles;
@@ -60,7 +58,7 @@ public sealed class FloorTileSystem : EntitySystem
         if (!TryComp<StackComponent>(uid, out var stack))
             return;
 
-        if (component.OutputTiles == null)
+        if (component.Outputs == null)
             return;
 
         // this looks a bit sussy but it might be because it needs to be able to place off of grids and expand them
@@ -127,7 +125,7 @@ public sealed class FloorTileSystem : EntitySystem
         }
         TryComp<MapGridComponent>(location.EntityId, out var mapGrid);
 
-        foreach (var currentTile in component.OutputTiles)
+        foreach (var currentTile in component.Outputs)
         {
             var currentTileDefinition = (ContentTileDefinition) _tileDefinitionManager[currentTile];
 
@@ -167,7 +165,7 @@ public sealed class FloorTileSystem : EntitySystem
                 var gridXform = Transform(grid);
                 _transform.SetWorldPosition((grid, gridXform), locationMap.Position);
                 location = new EntityCoordinates(grid, Vector2.Zero);
-                PlaceAt(args.User, grid, grid.Comp, location, _tileDefinitionManager[component.OutputTiles[0]].TileId, component.PlaceTileSound, grid.Comp.TileSize / 2f);
+                PlaceAt(args.User, grid, grid.Comp, location, _tileDefinitionManager[component.Outputs[0]].TileId, component.PlaceTileSound, grid.Comp.TileSize / 2f);
                 return;
             }
         }
diff --git a/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs b/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs
index 84e75129b1..42b72efede 100644
--- a/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs
+++ b/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs
@@ -1,7 +1,4 @@
-using System.Numerics;
 using Robust.Shared.GameStates;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Weapons.Melee.Components;
 
@@ -9,7 +6,7 @@ namespace Content.Shared.Weapons.Melee.Components;
 /// This is used for a melee weapon that throws whatever gets hit by it in a line
 /// until it hits a wall or a time limit is exhausted.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true)]
 [Access(typeof(MeleeThrowOnHitSystem))]
 public sealed partial class MeleeThrowOnHitComponent : Component
 {
@@ -42,6 +39,21 @@ public sealed partial class MeleeThrowOnHitComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public bool ActivateOnThrown;
+
+    /// <summary>
+    /// Whether the entity can apply knockback this instance of being thrown.
+    /// If true, the entity cannot apply knockback.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    [ViewVariables(VVAccess.ReadOnly)]
+    public bool ThrowOnCooldown;
+
+    /// <summary>
+    /// Whether this item has hit anyone while it was thrown.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    [ViewVariables(VVAccess.ReadOnly)]
+    public bool HitWhileThrown;
 }
 
 /// <summary>
diff --git a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
index 035432ef85..eaaf336e96 100644
--- a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
+++ b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
@@ -22,6 +22,29 @@ public sealed class MeleeThrowOnHitSystem : EntitySystem
     {
         SubscribeLocalEvent<MeleeThrowOnHitComponent, MeleeHitEvent>(OnMeleeHit);
         SubscribeLocalEvent<MeleeThrowOnHitComponent, ThrowDoHitEvent>(OnThrowHit);
+        SubscribeLocalEvent<MeleeThrowOnHitComponent, ThrownEvent>(OnThrow);
+        SubscribeLocalEvent<MeleeThrowOnHitComponent, LandEvent>(OnLand);
+    }
+
+    private void OnThrow(Entity<MeleeThrowOnHitComponent> ent, ref ThrownEvent args)
+    {
+        if (_delay.IsDelayed(ent.Owner))
+            return;
+
+        ent.Comp.HitWhileThrown = false;
+        ent.Comp.ThrowOnCooldown = false;
+
+        DirtyField(ent, ent.Comp, nameof(MeleeThrowOnHitComponent.HitWhileThrown));
+        DirtyField(ent, ent.Comp, nameof(MeleeThrowOnHitComponent.ThrowOnCooldown));
+    }
+
+    private void OnLand(Entity<MeleeThrowOnHitComponent> ent, ref LandEvent args)
+    {
+        if (ent.Comp.HitWhileThrown && !_delay.IsDelayed(ent.Owner))
+            _delay.TryResetDelay(ent.Owner);
+
+        ent.Comp.ThrowOnCooldown = true;
+        DirtyField(ent, ent.Comp, nameof(MeleeThrowOnHitComponent.ThrowOnCooldown));
     }
 
     private void OnMeleeHit(Entity<MeleeThrowOnHitComponent> weapon, ref MeleeHitEvent args)
@@ -50,9 +73,15 @@ public sealed class MeleeThrowOnHitSystem : EntitySystem
         if (!weapon.Comp.ActivateOnThrown)
             return;
 
+        if (weapon.Comp.ThrowOnCooldown)
+            return;
+
         if (!TryComp<PhysicsComponent>(args.Thrown, out var weaponPhysics))
             return;
 
+        weapon.Comp.HitWhileThrown = true;
+        DirtyField(weapon, weapon.Comp, nameof(MeleeThrowOnHitComponent.HitWhileThrown));
+
         ThrowOnHitHelper(weapon, args.Component.Thrower, args.Target, weaponPhysics.LinearVelocity);
     }
 
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 7537663113..8cebb0b7ae 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -583,6 +583,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         var distance = Math.Min(component.Range, direction.Length());
 
         var damage = GetDamage(meleeUid, user, component);
+        var resistanceBypass = GetResistanceBypass(meleeUid, user, component);
         var entities = GetEntityList(ev.Entities);
 
         if (entities.Count == 0)
@@ -687,7 +688,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
             RaiseLocalEvent(entity, attackedEvent);
             var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
 
-            var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin:user);
+            var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin: user, ignoreResistances: resistanceBypass);
 
             if (damageResult != null && damageResult.GetTotal() > FixedPoint2.Zero)
             {
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 982b8c1345..7e578657eb 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -567,7 +567,7 @@ public abstract partial class SharedGunSystem : EntitySystem
             DirtyField(gun, nameof(GunComponent.AngleDecayModified));
         }
 
-        if (!comp.MaxAngleModified.EqualsApprox(ev.MinAngle))
+        if (!comp.MaxAngleModified.EqualsApprox(ev.MaxAngle))
         {
             comp.MaxAngleModified = ev.MaxAngle;
             DirtyField(gun, nameof(GunComponent.MaxAngleModified));
diff --git a/Content.Shared/Zombies/ZombieComponent.cs b/Content.Shared/Zombies/ZombieComponent.cs
index 47ae35b4c5..2a69a7553f 100644
--- a/Content.Shared/Zombies/ZombieComponent.cs
+++ b/Content.Shared/Zombies/ZombieComponent.cs
@@ -93,10 +93,8 @@ public sealed partial class ZombieComponent : Component
     [DataField("beforeZombifiedEyeColor")]
     public Color BeforeZombifiedEyeColor;
 
-    [DataField("emoteId", customTypeSerializer: typeof(PrototypeIdSerializer<EmoteSoundsPrototype>))]
-    public string? EmoteSoundsId = "Zombie";
-
-    public EmoteSoundsPrototype? EmoteSounds;
+    [DataField("emoteId")]
+    public ProtoId<EmoteSoundsPrototype>? EmoteSoundsId = "Zombie";
 
     [DataField("nextTick", customTypeSerializer:typeof(TimeOffsetSerializer))]
     public TimeSpan NextTick;
diff --git a/Content.Tests/Shared/DamageTest.cs b/Content.Tests/Shared/DamageTest.cs
index 58fa8fbde3..27543e6533 100644
--- a/Content.Tests/Shared/DamageTest.cs
+++ b/Content.Tests/Shared/DamageTest.cs
@@ -15,6 +15,11 @@ namespace Content.Tests.Shared
     [TestOf(typeof(DamageGroupPrototype))]
     public sealed class DamageTest : ContentUnitTest
     {
+        private static readonly ProtoId<DamageGroupPrototype> BruteDamageGroup = "Brute";
+        private static readonly ProtoId<DamageTypePrototype> RadiationDamageType = "Radiation";
+        private static readonly ProtoId<DamageTypePrototype> SlashDamageType = "Slash";
+        private static readonly ProtoId<DamageTypePrototype> PiercingDamageType = "Piercing";
+
         private IPrototypeManager _prototypeManager;
 
         private DamageSpecifier _damageSpec;
@@ -29,9 +34,9 @@ namespace Content.Tests.Shared
             _prototypeManager.ResolveResults();
 
             // Create a damage data set
-            _damageSpec = new(_prototypeManager.Index<DamageGroupPrototype>("Brute"), 6);
-            _damageSpec += new DamageSpecifier(_prototypeManager.Index<DamageTypePrototype>("Radiation"), 3);
-            _damageSpec += new DamageSpecifier(_prototypeManager.Index<DamageTypePrototype>("Slash"), -1); // already exists in brute
+            _damageSpec = new(_prototypeManager.Index(BruteDamageGroup), 6);
+            _damageSpec += new DamageSpecifier(_prototypeManager.Index(RadiationDamageType), 3);
+            _damageSpec += new DamageSpecifier(_prototypeManager.Index(SlashDamageType), -1); // already exists in brute
         }
 
         //Check that DamageSpecifier will split groups and can do arithmetic operations
@@ -100,7 +105,7 @@ namespace Content.Tests.Shared
             Assert.That(damage, Is.EqualTo(FixedPoint2.New(3)));
 
             // Lets also test the constructor with damage types and damage groups works properly.
-            damageSpec = new(_prototypeManager.Index<DamageGroupPrototype>("Brute"), 4);
+            damageSpec = new(_prototypeManager.Index(BruteDamageGroup), 4);
             Assert.That(damageSpec.DamageDict.TryGetValue("Blunt", out damage));
             Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.33)));
             Assert.That(damageSpec.DamageDict.TryGetValue("Slash", out damage));
@@ -108,7 +113,7 @@ namespace Content.Tests.Shared
             Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
             Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.34))); // doesn't divide evenly, so the 0.01 goes to the last one
 
-            damageSpec = new(_prototypeManager.Index<DamageTypePrototype>("Piercing"), 4);
+            damageSpec = new(_prototypeManager.Index(PiercingDamageType), 4);
             Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
             Assert.That(damage, Is.EqualTo(FixedPoint2.New(4)));
         }
@@ -121,7 +126,7 @@ namespace Content.Tests.Shared
             DamageSpecifier damageSpec = 10 * new DamageSpecifier(_damageSpec);
 
             // Create a modifier set
-            var modifierSet = _prototypeManager.Index<DamageModifierSetPrototype>("ModifierTestSet");
+            var modifierSet = _prototypeManager.Index<DamageModifierSetPrototype>(ModifierTestSetId);
 
             //damage is initially   20 / 20 / 10 / 30
             //Each time we subtract -5 /  0 /  8 /  0.5
@@ -142,8 +147,10 @@ namespace Content.Tests.Shared
             Assert.That(damageSpec.DamageDict["Radiation"], Is.EqualTo(FixedPoint2.New(65.62)));
         }
 
+        private const string ModifierTestSetId = "ModifierTestSet";
+
         // Default damage Yaml
-        private string _damagePrototypes = @"
+        private readonly string _damagePrototypes = $@"
 - type: damageType
   id: Blunt
   name: damage-type-blunt
@@ -268,7 +275,7 @@ namespace Content.Tests.Shared
     Blunt: 5
 
 - type: damageModifierSet
-  id: ModifierTestSet
+  id: {ModifierTestSetId}
   coefficients:
     Piercing: -2
     Slash: 3
diff --git a/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs b/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs
index b07b18efa0..77f001bfe1 100644
--- a/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs
+++ b/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs
@@ -12,6 +12,8 @@ namespace Content.Tests.Shared;
 [TestOf(typeof(LocalizedDatasetPrototype))]
 public sealed class LocalizedDatasetPrototypeTest : ContentUnitTest
 {
+    private const string TestDatasetId = "Test";
+
     private IPrototypeManager _prototypeManager;
 
     [OneTimeSetUp]
@@ -24,9 +26,9 @@ public sealed class LocalizedDatasetPrototypeTest : ContentUnitTest
         _prototypeManager.ResolveResults();
     }
 
-    private const string TestPrototypes = @"
+    private const string TestPrototypes = $@"
 - type: localizedDataset
-  id: Test
+  id: {TestDatasetId}
   values:
     prefix: test-dataset-
     count: 4
@@ -35,7 +37,7 @@ public sealed class LocalizedDatasetPrototypeTest : ContentUnitTest
     [Test]
     public void LocalizedDatasetTest()
     {
-        var testPrototype = _prototypeManager.Index<LocalizedDatasetPrototype>("Test");
+        var testPrototype = _prototypeManager.Index<LocalizedDatasetPrototype>(TestDatasetId);
         var values = new ValueList<string>();
         foreach (var value in testPrototype.Values)
         {
diff --git a/Content.YAMLLinter/Program.cs b/Content.YAMLLinter/Program.cs
index 32078faeef..d37acff8e0 100644
--- a/Content.YAMLLinter/Program.cs
+++ b/Content.YAMLLinter/Program.cs
@@ -36,7 +36,9 @@ namespace Content.YAMLLinter
             {
                 foreach (var errorNode in errorHashset)
                 {
-                    Console.WriteLine($"::error file={file},line={errorNode.Node.Start.Line},col={errorNode.Node.Start.Column}::{file}({errorNode.Node.Start.Line},{errorNode.Node.Start.Column})  {errorNode.ErrorReason}");
+                    // TODO YAML LINTER Fix inheritance
+                    // If a parent/abstract prototype has na error, this will misreport the file name (but with the correct line/column).
+                    Console.WriteLine($"::error in {file}({errorNode.Node.Start.Line},{errorNode.Node.Start.Column})  {errorNode.ErrorReason}");
                 }
             }
 
@@ -143,22 +145,24 @@ namespace Content.YAMLLinter
             foreach (var (key, val) in clientErrors.YamlErrors)
             {
                 var newErrors = val.Where(n => n.AlwaysRelevant).ToHashSet();
-                if (newErrors.Count == 0)
-                    continue;
-
-                if (yamlErrors.TryGetValue(key, out var errors))
-                    errors.UnionWith(val.Where(n => n.AlwaysRelevant));
-                else
-                    yamlErrors[key] = newErrors;
 
                 // Include any errors that relate to client-only types
                 foreach (var errorNode in val)
                 {
-                    if (errorNode is FieldNotFoundErrorNode fieldNotFoundNode && !serverTypes.Contains(fieldNotFoundNode.FieldType.Name))
+                    if (errorNode is FieldNotFoundErrorNode fieldNotFoundNode
+                        && !serverTypes.Contains(fieldNotFoundNode.FieldType.Name))
                     {
                         newErrors.Add(errorNode);
                     }
                 }
+
+                if (newErrors.Count == 0)
+                    continue;
+
+                if (yamlErrors.TryGetValue(key, out var errors))
+                    errors.UnionWith(newErrors);
+                else
+                    yamlErrors[key] = newErrors;
             }
 
             // Finally, combine the prototype ID field errors.
diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml
index f330220421..3a7f18c7a3 100644
--- a/Resources/Audio/Effects/attributions.yml
+++ b/Resources/Audio/Effects/attributions.yml
@@ -247,6 +247,11 @@
   copyright: "Created by mattroks101 for Bee Station. cig_snuff converted to mono"
   source: "https://github.com/BeeStation/BeeStation-Hornet/pull/29"
 
+- files: [stealthoff.ogg]
+  copyright: 'TGStation at d4f678a1772007ff8d7eddd21cf7218c8e07bfc0'
+  license: "CC-BY-SA-3.0"
+  source: https://github.com/tgstation/tgstation/commit/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0
+
 - files: ["soft_thump.ogg"]
   license: "CC-BY-4.0"
   copyright: "Clipped by FairlySadPanda (Github) from a sound created by CheChoDj (Freesound)"
diff --git a/Resources/Audio/Effects/stealthoff.ogg b/Resources/Audio/Effects/stealthoff.ogg
new file mode 100644
index 0000000000..d78706e9cd
Binary files /dev/null and b/Resources/Audio/Effects/stealthoff.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/attributions.yml b/Resources/Audio/Items/Anomaly/attributions.yml
new file mode 100644
index 0000000000..27bf35d875
--- /dev/null
+++ b/Resources/Audio/Items/Anomaly/attributions.yml
@@ -0,0 +1,114 @@
+- files: ["flesh_crit.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Mashup by GonTar Quantumcross of malescream_1.ogg, malescream_2.ogg, femalescream_4.ogg, femalescream_5.ogg, alien_claw_flesh_2.ogg, alien_claw_flesh_3.ogg"
+  source: "https://github.com/tgstation/tgstation/commit/3d049e69fe71a0be2133005e65ea469135d648c8"
+  # additional source for alien claw sounds:
+  # source: "https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/sound/weapons"
+
+- files: ["shadow_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by GonTar and Quantumcross of sourced sound effect and anomaly_scary.ogg"
+  source: https://pixabay.com/sound-effects/psychedelic-144822/
+  # Additional sources:
+  # source: https://pixabay.com/sound-effects/boom-geomorphism-cinematic-trailer-sound-effects-123876/
+
+- files: ["tech_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by Gontar"
+  source: https://freesound.org/people/wtermini/sounds/546450/
+  # Additional sources:
+  # source: https://freesound.org/people/unfa/sounds/124547/
+  # source: https://pixabay.com/sound-effects/elemental-magic-spell-cast-d-228349/
+
+- files: ["present_crit.ogg"]
+  license: "CC0-1.0"
+  copyright: "richwise (Freesound), edited by Quantum-cross@github"
+  source: https://freesound.org/people/richwise/sounds/414374/
+
+- files: ["pyro_crit.ogg"]
+  license: "Custom"
+  copyright: "Multiple sounds, edited and layered by GonTar"
+  source: https://freesound.org/people/Robinhood76/sounds/612277/
+  # additional sources:
+  # source: https://freesound.org/people/Fission9/sounds/474850/
+  # source: https://pixabay.com/sound-effects/rubber-stretch-sound-effect-201310/ (Pixabay license)
+  # source: https://pixabay.com/sound-effects/fx-collection-of-flame-sword-swoosh-sound-design-elements-275902/ (Pixabay license)
+
+- files: ["grav_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by GonTar"
+  source: "https://freesound.org/people/Joao_Janz/sounds/478472/"
+  # additional sources:
+  # source: https://pixabay.com/sound-effects/horror-metallic-screeches-183236/
+  # source: https://pixabay.com/sound-effects/dark-textures-sfx-001-322559/
+  # source: https://pixabay.com/sound-effects/dark-textures-sfx-014-322578/
+  # source: https://freesound.org/people/BlenderDiplom/sounds/201094/
+  # source: https://pixabay.com/sound-effects/metal-creaking-36742/
+  # source: https://pixabay.com/sound-effects/metal-container-rumble-325675/
+  # source: https://pixabay.com/sound-effects/metal-hit-10-193281/
+  # source: https://pixabay.com/sound-effects/closing-metal-container-for-garbage-303735/
+
+
+- files: ["electricity_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by GonTar"
+  source: https://pixabay.com/sound-effects/sliding-discharge-160kv-71800/
+  # additional sources:
+  # source: https://pixabay.com/sound-effects/elemental-magic-spell-impact-outgoing-228342/
+  # source: https://pixabay.com/sound-effects/elemental-magic-spell-cast-d-228349/
+  # source: https://pixabay.com/sound-effects/electric-shock-short-circuit-1-204989/
+  # source: https://pixabay.com/sound-effects/electric-impact-37128/
+
+- files: ["bluespace_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by GonTar"
+  source: https://pixabay.com/sound-effects/boom-geomorphism-cinematic-trailer-sound-effects-123876/
+  # additional sources:
+  # source: https://pixabay.com/sound-effects/riser-hit-sfx-001-289802/
+  # source: https://pixabay.com/sound-effects/pulse3d-106110/
+  # source: https://freesound.org/people/Soapuel/sounds/489442/
+
+- files: ["ice_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by GonTar"
+  source: https://pixabay.com/sound-effects/ice-1-104148/
+  # additional sources:
+  # source: https://pixabay.com/sound-effects/ice-3-85025/
+  # source: https://pixabay.com/sound-effects/ice-4-104135/
+  # source: https://pixabay.com/sound-effects/ice-6-104141/
+  # source: https://pixabay.com/sound-effects/deep-bass-drone-31424/
+  # source: https://pixabay.com/sound-effects/cinematic-deep-tremor-6740/
+  # source: https://pixabay.com/sound-effects/cinematic-impact-boom-3-326123/
+  # source: https://pixabay.com/sound-effects/dark-textures-sfx-007-322567/
+  # source: https://pixabay.com/sound-effects/atmosphere-deep-amp-booming-256197/
+
+- files: ["fluid_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by GonTar"
+  source: https://freesound.org/people/unfa/sounds/504930/
+  # additional sources:
+  # source: https://freesound.org/people/DJT4NN3R/sounds/484158/
+  # source: https://freesound.org/people/klankbeeld/sounds/325537/
+  # source: https://github.com/ParadiseSS13/Paradise
+  # source: https://pixabay.com/sound-effects/water-flowing-2-327662/
+
+- files: ["flora_crit.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Clusman, hereforthebass, eyesplice, Clearwavsound (all Freesound), layered and edited by Quantum-cross@github"
+  source: https://freesound.org/people/Clusman/sounds/543508/
+  # additional sources:
+  # source: https://freesound.org/people/hereforthebass/sounds/733255/
+  # source: https://freesound.org/people/eyesplice/sounds/717773/
+  # source: https://freesound.org/people/Clearwavsound/sounds/541032/
+  # source: https://freesound.org/people/Stickinthemud/sounds/44162/
+
+- files: ["rock_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by GonTar"
+  source: https://pixabay.com/sound-effects/cinematic-deep-rumble-6418/
+  # additional sources:
+  # source: https://pixabay.com/sound-effects/lowrumblesnd-77876/
+  # source: https://pixabay.com/sound-effects/077381-scraping-stone-83768/
+  # source: https://pixabay.com/sound-effects/stone-slide-sound-effects-322794/
+  # source: https://pixabay.com/sound-effects/falling-pebbles-rocks-and-boulders-168593/
+  # source: https://pixabay.com/sound-effects/small-rock-break-194553/
diff --git a/Resources/Audio/Items/Anomaly/bluespace_crit.ogg b/Resources/Audio/Items/Anomaly/bluespace_crit.ogg
new file mode 100644
index 0000000000..4e84ac278d
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/bluespace_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/electricity_crit.ogg b/Resources/Audio/Items/Anomaly/electricity_crit.ogg
new file mode 100644
index 0000000000..8649a92aeb
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/electricity_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/flesh_crit.ogg b/Resources/Audio/Items/Anomaly/flesh_crit.ogg
new file mode 100644
index 0000000000..1a429d876b
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/flesh_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/flora_crit.ogg b/Resources/Audio/Items/Anomaly/flora_crit.ogg
new file mode 100644
index 0000000000..f098b6c8f5
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/flora_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/fluid_crit.ogg b/Resources/Audio/Items/Anomaly/fluid_crit.ogg
new file mode 100644
index 0000000000..c672e09b55
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/fluid_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/grav_crit.ogg b/Resources/Audio/Items/Anomaly/grav_crit.ogg
new file mode 100644
index 0000000000..f4fd579fe5
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/grav_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/ice_crit.ogg b/Resources/Audio/Items/Anomaly/ice_crit.ogg
new file mode 100644
index 0000000000..010cb38fce
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/ice_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/present_crit.ogg b/Resources/Audio/Items/Anomaly/present_crit.ogg
new file mode 100644
index 0000000000..1e2ddebc28
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/present_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/pyro_crit.ogg b/Resources/Audio/Items/Anomaly/pyro_crit.ogg
new file mode 100644
index 0000000000..3e07ecd270
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/pyro_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/rock_crit.ogg b/Resources/Audio/Items/Anomaly/rock_crit.ogg
new file mode 100644
index 0000000000..e32be2fa0e
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/rock_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/shadow_crit.ogg b/Resources/Audio/Items/Anomaly/shadow_crit.ogg
new file mode 100644
index 0000000000..d5b7cf7f4c
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/shadow_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/tech_crit.ogg b/Resources/Audio/Items/Anomaly/tech_crit.ogg
new file mode 100644
index 0000000000..50c11ed921
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/tech_crit.ogg differ
diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml
index 52f0a6c9a2..5a5927c878 100644
--- a/Resources/Audio/Items/attributions.yml
+++ b/Resources/Audio/Items/attributions.yml
@@ -169,3 +169,8 @@
   license: "CC-BY-NC-4.0"
   copyright: "Original sound by QEDionium on freesound.org. Coverted to ogg and edited by Prole0 (GitHub)"
   source: "https://freesound.org/s/489803/"
+
+- files: ["wirebrushing.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by romulofs, converted to OGG, and edited by TiniestShark (Github)"
+  source: "https://freesound.org/s/127541/"
diff --git a/Resources/Audio/Items/wirebrushing.ogg b/Resources/Audio/Items/wirebrushing.ogg
new file mode 100644
index 0000000000..4e54033b4c
Binary files /dev/null and b/Resources/Audio/Items/wirebrushing.ogg differ
diff --git a/Resources/Audio/Voice/Human/female_cough_1.ogg b/Resources/Audio/Voice/Human/female_cough_1.ogg
index 3509dcb0ac..6a82af0ace 100644
Binary files a/Resources/Audio/Voice/Human/female_cough_1.ogg and b/Resources/Audio/Voice/Human/female_cough_1.ogg differ
diff --git a/Resources/Audio/Voice/Human/female_cough_2.ogg b/Resources/Audio/Voice/Human/female_cough_2.ogg
index 32b2372a78..ec1e32ea60 100644
Binary files a/Resources/Audio/Voice/Human/female_cough_2.ogg and b/Resources/Audio/Voice/Human/female_cough_2.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_ask.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_ask.ogg
index c40c08d830..69c4e06b6c 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_ask.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_ask.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_bikehorn.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_bikehorn.ogg
index a9309f7d8a..a9f36bdf6f 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_bikehorn.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_bikehorn.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-sigh.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-sigh.ogg
index 7879ec485c..c3a72ea807 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-sigh.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-sigh.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-two.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-two.ogg
index d62e674f30..09e0c7c64a 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-two.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-two.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_chime.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_chime.ogg
index 91aed63ca9..5216f3d28b 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_chime.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_chime.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_exclaim.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_exclaim.ogg
index 7c23477b01..2afe7d560d 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_exclaim.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_exclaim.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_1.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_1.ogg
index ab585237b0..a2748478a0 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_1.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_1.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_2.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_2.ogg
index b03c8df226..5ea6813064 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_2.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_2.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_3.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_3.ogg
index 4d094c77ec..d6a9162c5e 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_3.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_3.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_4.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_4.ogg
index db66c8a92e..c4a4629d97 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_4.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_4.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_ping.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_ping.ogg
index 6bd5cc3591..40e1ec0e62 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_ping.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_ping.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_talk.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_talk.ogg
index 4b54caaa38..aa54adb017 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_talk.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_talk.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_twobeep.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_twobeep.ogg
index dfe0d0d55c..0ccdf2f465 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_twobeep.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_twobeep.ogg differ
diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 62c8d88d0d..a656e42976 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1240,5 +1240,42 @@ Entries:
   id: 150
   time: '2025-06-30T21:09:16.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38531
+- author: Smugman
+  changes:
+  - message: Added the ID locked CentComm flippo for admeme use
+    type: Add
+  id: 151
+  time: '2025-07-07T18:53:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35514
+- author: perryprog
+  changes:
+  - message: Admin ghosts can now interact with things beneath subfloors, such as
+      disposal routers.
+    type: Tweak
+  id: 152
+  time: '2025-07-10T11:14:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38813
+- author: VerinSenpai
+  changes:
+  - message: The showrules command now has autocomplete.
+    type: Tweak
+  id: 153
+  time: '2025-07-11T17:48:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38855
+- author: perryprog
+  changes:
+  - message: The runverbas command should now work better with other toolshed commands.
+    type: Fix
+  id: 154
+  time: '2025-07-14T15:45:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38155
+- author: slarticodefast
+  changes:
+  - message: The aghost's satchel of holding is now explosion resistant. Same for
+      the aghost themselves, so held explosives no longer chain react.
+    type: Tweak
+  id: 155
+  time: '2025-07-16T22:35:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38384
 Name: Admin
 Order: 2
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f0137f6dbb..204359a17f 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,360 +1,4 @@
 Entries:
-- author: lzk228
-  changes:
-  - message: Borgs, clowns and mimes now can choose a custom name in loadouts.
-    type: Tweak
-  id: 8222
-  time: '2025-04-18T02:32:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35170
-- author: DogZeroX
-  changes:
-  - message: Added Experiment plushie from the game Scav Prototype!
-    type: Add
-  id: 8223
-  time: '2025-04-18T02:38:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36663
-- author: slarticodefast
-  changes:
-  - message: Fire extinguishers and sprays now allow you to push the grids you are
-      standing on when you have magboots on.
-    type: Add
-  id: 8224
-  time: '2025-04-18T03:41:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31754
-- author: aada
-  changes:
-  - message: Filter categories added to the security techfab.
-    type: Add
-  id: 8225
-  time: '2025-04-18T03:52:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35594
-- author: Fildrance
-  changes:
-  - message: returned deconstruct to the top level option on RCD
-    type: Fix
-  id: 8226
-  time: '2025-04-18T04:50:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36486
-- author: ciaran
-  changes:
-  - message: Added a button to scroll back to the bottom of the chat box
-    type: Add
-  id: 8227
-  time: '2025-04-18T07:43:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35913
-- author: Tayrtahn
-  changes:
-  - message: The popup when pointing at an item in a character's inventory now mentions
-      that character.
-    type: Tweak
-  id: 8228
-  time: '2025-04-18T12:09:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36252
-- author: slarticodefast
-  changes:
-  - message: Punching lights while wearing insulated gloves will no longer electrocute
-      you.
-    type: Fix
-  id: 8229
-  time: '2025-04-18T12:26:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36686
-- author: Minemoder
-  changes:
-  - message: Rainbow Cannabis Leaves no longer emit light due to a renderer limitation.
-    type: Remove
-  id: 8230
-  time: '2025-04-18T14:12:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36479
-- author: IProduceWidgets
-  changes:
-  - message: Holobarrier projectors are now more power efficient.
-    type: Tweak
-  id: 8231
-  time: '2025-04-18T16:10:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34473
-- author: K-Dynamic
-  changes:
-  - message: Removed egg-plant from MegaSeed Servitor. (Egg-plant seeds can still
-      be obtained by mutation or exotic seed crate.)
-    type: Remove
-  id: 8232
-  time: '2025-04-18T16:42:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36579
-- author: Failed, Centronias
-  changes:
-  - message: The drink shaker now has in-hand sprites
-    type: Tweak
-  id: 8233
-  time: '2025-04-18T17:12:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36382
-- author: IProduceWidgets
-  changes:
-  - message: filing cabinets no longer have whitelists.
-    type: Tweak
-  id: 8234
-  time: '2025-04-18T17:37:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36185
-- author: aada
-  changes:
-  - message: Egg-plants now have 6 reagent per egg at 20 potency, up from 3.
-    type: Tweak
-  id: 8235
-  time: '2025-04-18T19:52:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36693
-- author: Nox38
-  changes:
-  - message: Nuclear operative agent is renamed to nuclear operative corpsman.
-    type: Tweak
-  id: 8236
-  time: '2025-04-18T19:56:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34627
-- author: Ilya246
-  changes:
-  - message: The actions hotbar now has up to 10 more hotkeys accessible through the
-      shift key.
-    type: Add
-  id: 8237
-  time: '2025-04-18T22:45:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33872
-- author: lzk228
-  changes:
-  - message: Fixed breaking small mobs (e.g. mice) mask after getting into an air
-      flow.
-    type: Fix
-  id: 8238
-  time: '2025-04-18T22:52:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33888
-- author: YoungThugSS14
-  changes:
-  - message: The Diona and Gingerbread species now get unique typing indicators
-    type: Add
-  id: 8239
-  time: '2025-04-18T23:19:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36126
-- author: Rainbeon
-  changes:
-  - message: Fixed Revolvers not correctly reloading from Speedloaders when the Revolver
-      is partially loaded.
-    type: Fix
-  - message: Speedloaders will now prioritize loading the active and upcoming chambers
-      in a Revolver when the Speedloader is only partially filled, rather than the
-      ones farthest away.
-    type: Fix
-  id: 8240
-  time: '2025-04-18T23:26:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32396
-- author: ScarKy0
-  changes:
-  - message: Changed the air vent and scrubber sprites.
-    type: Tweak
-  id: 8241
-  time: '2025-04-18T23:34:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34223
-- author: EmoGarbage404
-  changes:
-  - message: Added the material silo. This machine allows nearby machines to share
-      a pool of resources, cutting down on micromanagement.
-    type: Add
-  id: 8242
-  time: '2025-04-18T23:43:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36492
-- author: Onezero0
-  changes:
-  - message: Modular Grenades can now fit inside Security belts and carriers.
-    type: Tweak
-  id: 8243
-  time: '2025-04-19T00:04:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34169
-- author: Alpaccalypse
-  changes:
-  - message: The cocktail "Irish slammer" has been renamed to "Grenade Penguin".
-    type: Tweak
-  id: 8244
-  time: '2025-04-19T00:24:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34181
-- author: ScarKy0
-  changes:
-  - message: Added a couple more tools to the artifact borg module.
-    type: Tweak
-  id: 8245
-  time: '2025-04-19T00:25:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33338
-- author: august-sun
-  changes:
-  - message: Resprited the Chief Engineer's mantle.
-    type: Tweak
-  id: 8246
-  time: '2025-04-19T00:26:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36697
-- author: IProduceWidgets
-  changes:
-  - message: Vox are no longer immune to the zombie virus under certain circumstances
-    type: Fix
-  - message: The zombie virus no longer provides non-Initial Infected an undue grace
-      period before poisoning them.
-    type: Fix
-  id: 8247
-  time: '2025-04-19T00:38:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34472
-- author: Booblesnoot42
-  changes:
-  - message: Airlocks will now animate properly after crushing someone.
-    type: Fix
-  id: 8248
-  time: '2025-04-19T00:57:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34523
-- author: SlamBamActionman
-  changes:
-  - message: Fingerprints and fibers are now always applied to items being held, regardless
-      of how they got into your hands.
-    type: Fix
-  - message: Changing gloves now correctly applies new fibers/fingerprints on held
-      items.
-    type: Fix
-  id: 8249
-  time: '2025-04-19T01:02:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30609
-- author: Coolsurf6
-  changes:
-  - message: Attachbodypart command now functions as intended.
-    type: Fix
-  id: 8250
-  time: '2025-04-19T01:23:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34577
-- author: metalgearsloth
-  changes:
-  - message: Fix disarm swing sound even if a disarm isn't possible on the target.
-    type: Fix
-  id: 8251
-  time: '2025-04-19T01:38:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36546
-- author: metalgearsloth
-  changes:
-  - message: Predict gas volume pumps.
-    type: Tweak
-  id: 8252
-  time: '2025-04-19T01:48:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33835
-- author: SharkSnake98
-  changes:
-  - message: Added 12 new, varied drinks for the bartender to mix during shifts.
-    type: Add
-  id: 8253
-  time: '2025-04-19T05:12:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36287
-- author: Ko4erga
-  changes:
-  - message: Added new color turtlenecks in WinterDrobe.
-    type: Add
-  id: 8254
-  time: '2025-04-19T05:14:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32920
-- author: metalgearsloth
-  changes:
-  - message: Virtual items (e.g. wielding) are now predicted.
-    type: Add
-  id: 8255
-  time: '2025-04-19T06:51:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36617
-- author: metalgearsloth
-  changes:
-  - message: Fix charges sometimes breaking for auto-recharge devices such as RCDs.
-    type: Fix
-  id: 8256
-  time: '2025-04-19T08:49:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36714
-- author: Boaz1111
-  changes:
-  - message: Reduced the range at which security radios pick up noise from 4 tiles
-      to 1 tile.
-    type: Tweak
-  id: 8257
-  time: '2025-04-19T13:10:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34878
-- author: Quantus
-  changes:
-  - message: Fixed the unusual delay in production after de-aging a plant with cryoxadone.
-    type: Fix
-  id: 8258
-  time: '2025-04-19T13:43:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34668
-- author: ArtisticRoomba
-  changes:
-  - message: The Go Go Hat now checks if your message matches either the name of the
-      item or the label of the item. This allows people with accents to name their
-      items according to how their character would say the item, or for a faster retrieval
-      without having to type out the full name.
-    type: Tweak
-  id: 8259
-  time: '2025-04-19T14:11:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35658
-- author: GrownSamoyedDog
-  changes:
-  - message: Pineapple Juice Cartons are new and added to Booze-O-Mat.
-    type: Add
-  id: 8260
-  time: '2025-04-19T14:25:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34769
-- author: claustro305
-  changes:
-  - message: Fixed a bug where dragged objects would collide with wall mounted lights
-      and cameras.
-    type: Fix
-  id: 8261
-  time: '2025-04-19T14:29:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35908
-- author: metalgearsloth
-  changes:
-  - message: Fix detailed examine buttons sometimes showing up incorrectly.
-    type: Fix
-  id: 8262
-  time: '2025-04-19T14:37:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33814
-- author: sowelipililimute
-  changes:
-  - message: Servers with the number of open inventories set to two have a new alignment
-      that doesn't shift as much when opening and closing multiple inventories
-    type: Tweak
-  id: 8263
-  time: '2025-04-19T14:40:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35041
-- author: ps3moira
-  changes:
-  - message: Removed interior shuttle walls
-    type: Remove
-  id: 8264
-  time: '2025-04-19T14:41:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34261
-- author: Minemoder
-  changes:
-  - message: Most roles on the station now require significantly less playtime playtime
-      to unlock.
-    type: Tweak
-  id: 8265
-  time: '2025-04-19T15:31:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36666
-- author: Fildrance
-  changes:
-  - message: fixed spessman getting stuck after unlocking portal node
-    type: Fix
-  id: 8266
-  time: '2025-04-19T17:07:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36719
-- author: VlaDOS1408
-  changes:
-  - message: Fixed Gravity gen menu resizing! Now it looks like it should.
-    type: Fix
-  id: 8267
-  time: '2025-04-19T20:20:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34036
-- author: coffeeware, MilenVolf
-  changes:
-  - message: Most common mobs without hands now can't dump containers wtih solution
-      by drag and dropping.
-    type: Tweak
-  id: 8268
-  time: '2025-04-19T20:32:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33350
 - author: ScarKy0
   changes:
   - message: Salvage borgs now start with a tool module
@@ -3877,3 +3521,380 @@
   id: 8733
   time: '2025-07-03T18:51:40.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38689
+- author: TrixxedHeart
+  changes:
+  - message: Moved Syndicate Uplink TC purchase button beneath the respective item's
+      icon.
+    type: Tweak
+  id: 8734
+  time: '2025-07-03T23:49:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38596
+- author: maland1
+  changes:
+  - message: Updating a number of guidebook pages to be more easily readable and accurate
+    type: Tweak
+  id: 8735
+  time: '2025-07-04T00:04:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38699
+- author: TiniestShark
+  changes:
+  - message: Added a Wire Brush to the Janitor's tool kit for scrubbing unsightly
+      rust off of the station's walls!
+    type: Add
+  id: 8736
+  time: '2025-07-04T02:02:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38667
+- author: Velken
+  changes:
+  - message: Revenants' malfunction ability now properly works on MediBots and Stasis
+      Beds again.
+    type: Fix
+  id: 8737
+  time: '2025-07-04T05:08:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38664
+- author: perryprog
+  changes:
+  - message: You can now mop space lube, letting it evaporate faster than it would
+      on its own.
+    type: Tweak
+  id: 8738
+  time: '2025-07-04T21:50:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38743
+- author: TrixxedHeart
+  changes:
+  - message: Vox now have scar markings.
+    type: Add
+  id: 8739
+  time: '2025-07-04T23:06:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38592
+- author: perryprog
+  changes:
+  - message: Spellbooks with infinite charges work again.
+    type: Fix
+  id: 8740
+  time: '2025-07-05T06:28:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38376
+- author: beck-thompson
+  changes:
+  - message: The escape menu ui has been updated slightly.
+    type: Tweak
+  id: 8741
+  time: '2025-07-05T09:28:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38650
+- author: EmoGarbage404
+  changes:
+  - message: Fixed people asphyxiating if left on a stasis bed.
+    type: Fix
+  id: 8742
+  time: '2025-07-06T00:59:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38762
+- author: slarticodefast
+  changes:
+  - message: You can now catch basketballs, footballs and beach balls that are thrown
+      at you!
+    type: Add
+  id: 8743
+  time: '2025-07-06T16:54:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37702
+- author: ArtisticRoomba
+  changes:
+  - message: The Go Go Hat now correctly retrieves and deposits items again.
+    type: Fix
+  id: 8744
+  time: '2025-07-06T23:42:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38810
+- author: maland1
+  changes:
+  - message: Reduced the size of the go go hat inventory
+    type: Tweak
+  id: 8745
+  time: '2025-07-06T23:50:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38808
+- author: AsnDen
+  changes:
+  - message: Golden PAI was added. It is extremely rare and expensive. This PAI can
+      be found in maint lockers
+    type: Add
+  id: 8746
+  time: '2025-07-07T05:07:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38549
+- author: Smugman
+  changes:
+  - message: Many new lighters can now be found in both Maints loot and the Syndicate
+      Uplink.
+    type: Add
+  id: 8747
+  time: '2025-07-07T18:53:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35514
+- author: Jopaglazik, Golub
+  changes:
+  - message: Added Jump Boots In T1 "Salvage Equipment" technology.
+    type: Add
+  id: 8748
+  time: '2025-07-07T19:19:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36862
+- author: slarticodefast, EmoGarbage404
+  changes:
+  - message: 'Added a new science gadget: The H.A.R.M.P.A.C.K., a backpack that gives
+      you two extra hands when worn. Unlocked with a T2 arsenal research and printable
+      at the protolathe and secfab.'
+    type: Fix
+  id: 8749
+  time: '2025-07-07T21:43:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38824
+- author: kosticia
+  changes:
+  - message: Added new reagent for artifact researching - artifact glue! Use it on
+      the artefact with active node for repair its durability.
+    type: Add
+  id: 8750
+  time: '2025-07-08T01:45:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38670
+- author: maland1
+  changes:
+  - message: Updated contraband tags on pulse weapons, temp gun, portable particle
+      decelerator, tesla gun and makeshift laser pistol to be more consistent with
+      their intended owners and legality
+    type: Tweak
+  id: 8751
+  time: '2025-07-08T11:55:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38698
+- author: TrixxedHeart
+  changes:
+  - message: Vox can now have heterochromia in the overlays category under markings.
+    type: Add
+  id: 8752
+  time: '2025-07-08T23:22:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38595
+- author: Quantum-cross
+  changes:
+  - message: Fix lingering ghost entities after taking ghost roles.
+    type: Fix
+  id: 8753
+  time: '2025-07-09T11:07:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38788
+- author: Sparlight
+  changes:
+  - message: Dragons no longer destroy non-humanoid mobs upon eating them.
+    type: Tweak
+  id: 8754
+  time: '2025-07-09T12:43:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38087
+- author: Crude Oil
+  changes:
+  - message: Parrots now parrot nearby speech, sometimes even using the radio if they
+      have one equipped
+    type: Add
+  - message: Polly the Parrot, CE's pet parrot, may be found on some maps parroting
+      things into an engineering headset.
+    type: Add
+  id: 8755
+  time: '2025-07-09T19:04:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38243
+- author: slarticodefast
+  changes:
+  - message: Added VV buttons to the solution editor.
+    type: Add
+  id: 8756
+  time: '2025-07-10T06:31:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38889
+- author: Toby222
+  changes:
+  - message: pAIs can emote like borgs now
+    type: Add
+  id: 8757
+  time: '2025-07-10T07:56:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38425
+- author: Quantum-cross, slarticodefast
+  changes:
+  - message: The flash effect is now replaced with a reduced motion variant if the
+      accessibility setting is enabled in the game options.
+    type: Add
+  id: 8758
+  time: '2025-07-10T09:30:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37824
+- author: K-Dynamic
+  changes:
+  - message: Minigun now has inhand sprites.
+    type: Add
+  - message: Miniguns and other HMGs now require two hands to pick up and slows you
+      by 20%.
+    type: Tweak
+  id: 8759
+  time: '2025-07-10T12:42:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35344
+- author: ScarKy0
+  changes:
+  - message: SecTech vendor now starts with a few bolas.
+    type: Add
+  id: 8760
+  time: '2025-07-10T14:47:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38902
+- author: Hitlinemoss
+  changes:
+  - message: The station AI can now pick kobold/monkey holograms as customization
+      options.
+    type: Add
+  id: 8761
+  time: '2025-07-10T17:11:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38888
+- author: slarticodefast
+  changes:
+  - message: Fixed clones not getting the thieving skill.
+    type: Fix
+  id: 8762
+  time: '2025-07-10T21:37:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38914
+- author: Ertanic and whatston3
+  changes:
+  - message: The spray painter can now paint gas canisters, crates, lockers, and floor
+      decals.
+    type: Add
+  - message: The spray painter now consumes compressed paint, available from the YouTool
+      or printable in the autolathe.
+    type: Tweak
+  id: 8763
+  time: '2025-07-11T00:36:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37341
+- author: Princess-Cheeseballs
+  changes:
+  - message: Added Stamina and Stun animations
+    type: Add
+  id: 8764
+  time: '2025-07-11T12:13:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37196
+- author: Centronias
+  changes:
+  - message: Muzzles now prevent wearers from screaming and suppress sounds on audio
+      emotes.
+    type: Tweak
+  id: 8765
+  time: '2025-07-11T17:18:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32588
+- author: TiniestShark
+  changes:
+  - message: Added inhand sprites to all bottled drinks.
+    type: Add
+  id: 8766
+  time: '2025-07-12T14:28:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38937
+- author: Velken
+  changes:
+  - message: Ian and McGriff are more fashionable by letting them wear hats and glasses.
+    type: Add
+  id: 8767
+  time: '2025-07-13T16:11:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38634
+- author: Toast_Enjoyer, huaqas
+  changes:
+  - message: The Purchaseable Scurret now comes in a livestock crate instead of a
+      plastic one. Wawa!
+    type: Fix
+  id: 8768
+  time: '2025-07-13T16:48:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38951
+- author: lzk228
+  changes:
+  - message: Changed ocarina's size from Normal to Small
+    type: Tweak
+  id: 8769
+  time: '2025-07-13T19:31:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38971
+- author: ToastEnjoyer
+  changes:
+  - message: The nukeop war declarator is now syndicate contraband.
+    type: Tweak
+  id: 8770
+  time: '2025-07-13T20:50:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38972
+- author: Flareguy
+  changes:
+  - message: Added several new vox customization options, including additional tails,
+      hairstyles, and tattoos.
+    type: Add
+  - message: Added eyeshadow markings. They're available on every species except for
+      Moth and Arachnid.
+    type: Add
+  id: 8771
+  time: '2025-07-14T02:49:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38906
+- author: Trosling
+  changes:
+  - message: Moved Bible/Holy Book choice to loadout options for chaplain.
+    type: Tweak
+  - message: Implemented new holy book sprites, as well as one existing one (space
+      quran).
+    type: Add
+  id: 8772
+  time: '2025-07-15T00:49:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38986
+- author: RedBookcase
+  changes:
+  - message: The Kardashev-Mosin's bayonet can now be used while the weapon is wielded.
+      Tally ho!
+    type: Add
+  id: 8773
+  time: '2025-07-15T00:49:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38295
+- author: SlamBamActionman
+  changes:
+  - message: Throwable item hitboxes have been updated to better reflect their sprites.
+    type: Tweak
+  id: 8774
+  time: '2025-07-15T00:51:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38985
+- author: Velken
+  changes:
+  - message: Moproaches have been added to the game.
+    type: Add
+  - message: Moproaches can sometimes appear from the station's sewage system.
+    type: Add
+  id: 8775
+  time: '2025-07-15T02:47:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38700
+- author: nabegator
+  changes:
+  - message: You can now put remote signallers into utility belts.
+    type: Tweak
+  id: 8776
+  time: '2025-07-16T00:43:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35212
+- author: ArtisticRoomba
+  changes:
+  - message: Firelocks will now properly drop fast enough to prevent the spacing of
+      an entire atmos volume.
+    type: Fix
+  - message: Only the necessary firelocks required to stop a spacing will drop when
+      a spacing is triggered, instead of all firelocks in a spaced volume.
+    type: Fix
+  id: 8777
+  time: '2025-07-16T03:18:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38918
+- author: ScarKy0
+  changes:
+  - message: Wizard's Mjollnir can no longer stun when thrown off-cooldown.
+    type: Fix
+  id: 8778
+  time: '2025-07-16T20:27:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39018
+- author: SlamBamActionman
+  changes:
+  - message: Grilles under diagonal windows no longer electrocute you.
+    type: Fix
+  id: 8779
+  time: '2025-07-17T13:33:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39032
+- author: qwerltaz
+  changes:
+  - message: NPC spiders now spin webs sometimes!
+    type: Add
+  id: 8780
+  time: '2025-07-17T16:34:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38319
+- author: Quantum-cross
+  changes:
+  - message: Anomalies make anomalous noises if you let them go supercritical
+    type: Add
+  id: 8781
+  time: '2025-07-17T17:01:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36425
diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index b938873843..5a34fafeb7 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -405,4 +405,11 @@
   id: 49
   time: '2025-07-03T18:51:40.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38689
+- author: qwerltaz
+  changes:
+  - message: On Bagel, redesigned Security to have GenPop.
+    type: Tweak
+  id: 50
+  time: '2025-07-10T18:16:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38829
 Order: 1
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 8f68e79e82..467de6b225 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, crazybrain23, Crazydave91920, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hoshizora, Hreno, Hrosts, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, maland1, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnyxTheBrave, Orange-Winds, OrangeMoronage9622, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, qrtDaniil, qrwas, Quantum-cross, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, vexerot, viceemargo, VigersRay, violet754, Visne, vitusveit, vlad, vlados1408, VMSolidus, vmzd, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
+0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, crazybrain23, Crazydave91920, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hoshizora, Hreno, Hrosts, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, Kowlin, KrasnoshchekovPavel, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, maland1, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnyxTheBrave, Orange-Winds, OrangeMoronage9622, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, qrtDaniil, qrwas, Quantum-cross, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, viceemargo, VigersRay, violet754, Visne, vitusveit, vlad, vlados1408, VMSolidus, vmzd, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
diff --git a/Resources/Locale/en-US/accessories/vox-hair.ftl b/Resources/Locale/en-US/accessories/vox-hair.ftl
index 0e11e1a9b8..e6e32e9c80 100644
--- a/Resources/Locale/en-US/accessories/vox-hair.ftl
+++ b/Resources/Locale/en-US/accessories/vox-hair.ftl
@@ -21,4 +21,8 @@ marking-VoxHairSurf = Vox Surf
 marking-VoxHairTielQuills = Vox Tiel Quills
 marking-VoxHairYasu = Vox Yasuhiro
 marking-VoxHairWiseBraid = Vox Wise Braids
-marking-VoxHairSpotty = Vox Spotty Hair
\ No newline at end of file
+marking-VoxHairSpotty = Vox Spotty Quills
+marking-VoxHairMadScientist = Vox Mad Scientist
+marking-VoxHairHedgehog = Vox Hedgehog
+marking-VoxHairBushy = Vox Bushy Quills
+marking-VoxHairSlick = Vox Slick Quills
\ No newline at end of file
diff --git a/Resources/Locale/en-US/administration/ui/manage-solutions/manage-solutions.ftl b/Resources/Locale/en-US/administration/ui/manage-solutions/manage-solutions.ftl
index e5c0b33d4e..9374644985 100644
--- a/Resources/Locale/en-US/administration/ui/manage-solutions/manage-solutions.ftl
+++ b/Resources/Locale/en-US/administration/ui/manage-solutions/manage-solutions.ftl
@@ -1,5 +1,9 @@
 admin-solutions-window-title = Solution Editor - {$targetName}
 admin-solutions-window-solution-label = Target solution:
+admin-solutions-window-solution-button = Solution
+admin-solutions-window-solution-button-tooltip = Opens the corresponding server-side Solution instance in ViewVariables. Useful for debugging prediction issues.
+admin-solutions-window-vv-button = VV
+admin-solutions-window-vv-button-tooltip = Opens the corresponding solution entity in ViewVariables.
 admin-solutions-window-add-new-button = Add new reagent
 admin-solutions-window-volume-label = Volume {$currentVolume}/{$maxVolume}u
 admin-solutions-window-capacity-label = Capacity (u):
@@ -7,4 +11,4 @@ admin-solutions-window-specific-heat-label = Specific Heat: {$specificHeat} J/(K
 admin-solutions-window-heat-capacity-label = Heat Capacity: {$heatCapacity} J/K
 admin-solutions-window-temperature-label = Temperature (K):
 admin-solutions-window-thermal-energy-label = Thermal Energy (J):
-admin-solutions-window-thermals = Thermals
\ No newline at end of file
+admin-solutions-window-thermals = Thermals
diff --git a/Resources/Locale/en-US/animals/parrot/parrot.ftl b/Resources/Locale/en-US/animals/parrot/parrot.ftl
new file mode 100644
index 0000000000..8262324d81
--- /dev/null
+++ b/Resources/Locale/en-US/animals/parrot/parrot.ftl
@@ -0,0 +1,2 @@
+parrot-verb-clear-memory = Clear parrot memory
+parrot-popup-memory-cleared = Parrot memory cleared
diff --git a/Resources/Locale/en-US/bonk/components/bonkable-component.ftl b/Resources/Locale/en-US/bonk/components/bonkable-component.ftl
deleted file mode 100644
index 1a79da3509..0000000000
--- a/Resources/Locale/en-US/bonk/components/bonkable-component.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-forced-bonkable-success-message = { CAPITALIZE($bonker) } bonks {$victim}s head against { THE($bonkable) }!
-
-bonkable-success-message-user = You bonk your head against { THE($bonkable) }!
-bonkable-success-message-others = {$victim} bonks their head against { THE($bonkable) }!
diff --git a/Resources/Locale/en-US/chat/emotes.ftl b/Resources/Locale/en-US/chat/emotes.ftl
index 0944aa48dd..cf6d91b511 100644
--- a/Resources/Locale/en-US/chat/emotes.ftl
+++ b/Resources/Locale/en-US/chat/emotes.ftl
@@ -4,7 +4,7 @@ chat-emote-name-laugh = Laugh
 chat-emote-name-honk = Honk
 chat-emote-name-sigh = Sigh
 chat-emote-name-whistle = Whistle
-chat-emote-name-crying = Crying
+chat-emote-name-crying = Cry
 chat-emote-name-squish = Squish
 chat-emote-name-chitter = Chitter
 chat-emote-name-squeak = Squeak
@@ -27,8 +27,8 @@ chat-emote-name-ping = Ping
 chat-emote-name-sneeze = Sneeze
 chat-emote-name-cough = Cough
 chat-emote-name-catmeow = Cat Meow
-chat-emote-name-cathisses = Cat Hisses
-chat-emote-name-monkeyscreeches = Monkey Screeches
+chat-emote-name-cathisses = Cat Hiss
+chat-emote-name-monkeyscreeches = Monkey Screech
 chat-emote-name-robotbeep = Robot
 chat-emote-name-yawn = Yawn
 chat-emote-name-snore = Snore
diff --git a/Resources/Locale/en-US/chemistry/components/hypospray-component.ftl b/Resources/Locale/en-US/chemistry/components/hypospray-component.ftl
index 52dbf9010e..96ebaa3ed0 100644
--- a/Resources/Locale/en-US/chemistry/components/hypospray-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/hypospray-component.ftl
@@ -10,7 +10,6 @@ hypospray-volume-label = Volume: [color=white]{$currentVolume}/{$totalVolume}u[/
 
 hypospray-component-inject-other-message = You inject {$other}.
 hypospray-component-inject-self-message = You inject yourself.
-hypospray-component-inject-self-clumsy-message = Oops! You injected yourself.
 hypospray-component-empty-message = Nothing to inject.
 hypospray-component-feel-prick-message = You feel a tiny prick!
 hypospray-component-transfer-already-full-message = {$owner} is already full!
diff --git a/Resources/Locale/en-US/clown/components/clumsy-component.ftl b/Resources/Locale/en-US/clown/components/clumsy-component.ftl
new file mode 100644
index 0000000000..055b3b9c4e
--- /dev/null
+++ b/Resources/Locale/en-US/clown/components/clumsy-component.ftl
@@ -0,0 +1,10 @@
+clumsy-vaulting-fail-forced-message = { CAPITALIZE($bonker) } bonks { $victim }s head against { THE($bonkable) }!
+clumsy-vaulting-fail-message-user = You bonk your head against { THE($bonkable) }!
+clumsy-vaulting-fail-message-others = { $victim } bonks their head against { THE($bonkable) }!
+
+clumsy-gun-fail-message = The gun blows up in your face!
+
+clumsy-hypospray-fail-message = Oops! You injected yourself.
+
+clumsy-catch-fail-message-user = { CAPITALIZE(THE($item)) } hits your head!
+clumsy-catch-fail-message-others = { CAPITALIZE(THE($item)) } hits { THE($catcher) }'s head!
diff --git a/Resources/Locale/en-US/commands/showrules-command.ftl b/Resources/Locale/en-US/commands/showrules-command.ftl
new file mode 100644
index 0000000000..d997427de4
--- /dev/null
+++ b/Resources/Locale/en-US/commands/showrules-command.ftl
@@ -0,0 +1,3 @@
+cmd-showrules-desc = Opens the rules popup for the specified player.
+cmd-showrules-help = Usage: showrules <username> [seconds]
+cmd-showrules-invalid-seconds = {$seconds} is not a valid number of seconds!
diff --git a/Resources/Locale/en-US/commands/unlocknode-command.ftl b/Resources/Locale/en-US/commands/unlocknode-command.ftl
new file mode 100644
index 0000000000..5a3b8259dd
--- /dev/null
+++ b/Resources/Locale/en-US/commands/unlocknode-command.ftl
@@ -0,0 +1,4 @@
+cmd-unlocknode-desc = Unlocks a node on a given artifact
+cmd-unlocknode-help = unlocknode <artifact uid> <node uid>
+cmd-unlocknode-artifact-hint = <artifact uid>
+cmd-unlocknode-node-hint = <node uid>
diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl
index 6d66566c20..c000c37c1e 100644
--- a/Resources/Locale/en-US/datasets/figurines.ftl
+++ b/Resources/Locale/en-US/datasets/figurines.ftl
@@ -134,9 +134,9 @@ figurines-ce-6 = Power's out again.
 figurines-engineer-1 = SINGULOOSE!
 figurines-engineer-2 = TESLOOSE!
 figurines-engineer-3 = What is AME?
-figurines-engineer-4 = Free insuls at engineering
+figurines-engineer-4 = Free insuls at Engineering!
 figurines-engineer-5 = Where'd the power go?
-figurines-engineer-6 = Someone bombed medbay... again...
+figurines-engineer-6 = Someone bombed the medbay... again...
 figurines-engineer-7 = Well, why don't you come and fix it?
 
 figurines-atmostech-1 = I put plasma in distro.
@@ -148,7 +148,7 @@ figurines-atmostech-6 = Distro? That's short for disposal.
 figurines-atmostech-7 = TEG: Thermal Energy? Gone!
 
 figurines-rd-1 = Blowing up all of the borgs!
-figurines-rd-2 = Tier 3 arsenal? No way.
+figurines-rd-2 = Tier 3 Arsenal? No way.
 figurines-rd-3 = Now where did I leave my hardsuit...?
 figurines-rd-4 = Now you're thinking with portals!
 figurines-rd-5 = The cake is a lie!
@@ -245,22 +245,22 @@ figurines-nukie-3 = The nuke makes boom.
 figurines-nukie-4 = What's the code?
 figurines-nukie-5 = Commander...? ...That's a balloon...
 
-figurines-nukie-elite-1 = Not a word in nanotrasen.
+figurines-nukie-elite-1 = Not a word in Nanotrasen.
 figurines-nukie-elite-2 = THAT'S A KEG!
-figurines-nukie-elite-3 = Guys are you alive?
+figurines-nukie-elite-3 = Guys, are you alive?
 figurines-nukie-elite-4 = Breach and clear!
 figurines-nukie-elite-5 = Leave no survivors.
 figurines-nukie-elite-6 = Good work, team.
 
 figurines-nukie-commander-1 = GET DAT FUKKEN DISK!
 figurines-nukie-commander-2 = Fuckin' flukies.
-figurines-nukie-commander-3 = The syndicate sends its regards.
+figurines-nukie-commander-3 = The Syndicate sends its regards.
 figurines-nukie-commander-4 = Failure is not an option.
 figurines-nukie-commander-5 = Whoops.
 
 figurines-footsoldier-1 = I'm an evil boy. Less boy every day, more evil every day.
 figurines-footsoldier-2 = Who will you choose? Them or us? Us or them?
-figurines-footsoldier-3 = Glory to the syndicate!
+figurines-footsoldier-3 = Glory to the Syndicate!
 figurines-footsoldier-4 = Down with Nanotrasen!
 figurines-footsoldier-5 = I'd rather die than join Nanotrasen.
 
diff --git a/Resources/Locale/en-US/emote/emote.ftl b/Resources/Locale/en-US/emote/emote.ftl
new file mode 100644
index 0000000000..11ccd71178
--- /dev/null
+++ b/Resources/Locale/en-US/emote/emote.ftl
@@ -0,0 +1,2 @@
+chat-system-emote-cancelled-generic = You can't {$emote} right now!
+chat-system-emote-cancelled-blocked = You can't {$emote} because of {THE($blocker)}!
diff --git a/Resources/Locale/en-US/engineer-painter/engineer-painter.ftl b/Resources/Locale/en-US/engineer-painter/engineer-painter.ftl
deleted file mode 100644
index d3d3ccc444..0000000000
--- a/Resources/Locale/en-US/engineer-painter/engineer-painter.ftl
+++ /dev/null
@@ -1,14 +0,0 @@
-spray-painter-window-title = Spray painter
-
-spray-painter-style-not-available = Cannot apply the selected style to this type of airlock
-spray-painter-selected-style = Selected style:
-
-spray-painter-selected-color = Selected color:
-spray-painter-color-red = red
-spray-painter-color-yellow = yellow
-spray-painter-color-brown = brown
-spray-painter-color-green = green
-spray-painter-color-cyan = cyan
-spray-painter-color-blue = blue
-spray-painter-color-white = white
-spray-painter-color-black = black
diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index 35dda778a2..bdc0ea858a 100644
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -342,5 +342,6 @@ flavor-complex-bee = unbeelievable
 flavor-complex-sax = like jazz
 flavor-complex-bottledlightning = like lightning in a bottle
 flavor-complex-punishment = like punishment
+flavor-complex-artifact-glue = like crushed artifacts
 flavor-weh = like weh
 flavor-hew = like hew
diff --git a/Resources/Locale/en-US/fluids/components/absorbent-component.ftl b/Resources/Locale/en-US/fluids/components/absorbent-component.ftl
index 51e500a6fe..d6cb60e25e 100644
--- a/Resources/Locale/en-US/fluids/components/absorbent-component.ftl
+++ b/Resources/Locale/en-US/fluids/components/absorbent-component.ftl
@@ -1,7 +1,7 @@
 mopping-system-target-container-empty = { CAPITALIZE(THE($target)) } is empty!
 mopping-system-target-container-empty-water = { CAPITALIZE(THE($target)) } has no water!
-mopping-system-puddle-space = { CAPITALIZE(THE($used)) } is full of water
-mopping-system-puddle-evaporate = {  CAPITALIZE(THE($target)) } is evaporating
+mopping-system-puddle-space = { CAPITALIZE(THE($used)) } is full of water.
+mopping-system-puddle-already-mopped = { CAPITALIZE(THE($target)) } is already mopped.
 mopping-system-no-water = { CAPITALIZE(THE($used)) } has no water!
 mopping-system-no-hands = You have no hands!
 
diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
index d2fe9b306f..ce52b88655 100644
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -35,6 +35,9 @@ ghost-role-information-mouse-description = A hungry and mischievous mouse.
 ghost-role-information-mothroach-name = Mothroach
 ghost-role-information-mothroach-description = A cute but mischievous mothroach.
 
+ghost-role-information-moproach-name = Moproach
+ghost-role-information-moproach-description = A cute mothroach with more cute moplike shoes on its feet.
+
 ghost-role-information-snail-name = Snail
 ghost-role-information-snail-description = A little snail who doesn't mind a bit of space. Just stay on grid!
 
diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
index 1b3ae1f314..2357a43122 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
@@ -378,6 +378,9 @@ reagent-effect-guidebook-artifact-unlock =
         *[other] help
         } unlock an alien artifact.
 
+reagent-effect-guidebook-artifact-durability-restore =
+    Restores {$restored} durability in active alien artifact nodes.
+
 reagent-effect-guidebook-plant-attribute =
     { $chance ->
         [1] Adjusts
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
index 5a0b615b47..a4b80d8b3f 100644
--- a/Resources/Locale/en-US/job/job-names.ftl
+++ b/Resources/Locale/en-US/job/job-names.ftl
@@ -49,6 +49,7 @@ job-name-ertjanitor = ERT Janitor
 job-name-boxer = Boxer
 job-name-zookeeper = Zookeeper
 job-name-visitor = Visitor
+job-name-cluwne = Cluwne
 
 # unused jobs
 # these are required for the agent ID job icon tooltips
diff --git a/Resources/Locale/en-US/markings/tattoos.ftl b/Resources/Locale/en-US/markings/tattoos.ftl
index c16b105467..c47f8ae962 100644
--- a/Resources/Locale/en-US/markings/tattoos.ftl
+++ b/Resources/Locale/en-US/markings/tattoos.ftl
@@ -33,3 +33,30 @@ marking-TattooEyeMothRight = Right Eye
 
 marking-TattooEyeMothLeft-tattoo_eye_moth_l = Left Eye
 marking-TattooEyeMothLeft = Left Eye
+
+marking-TattooEyeVoxRight-tattoo_eye_vox_r = Right Eye
+marking-TattooEyeVoxRight = Right Eye
+
+marking-TattooEyeVoxLeft-tattoo_eye_vox_l = Left Eye
+marking-TattooEyeVoxLeft = Left Eye
+
+marking-TattooEyeshadowUpper-tattoo_eyeshadow_upper = Eyeshadow (Upper)
+marking-TattooEyeshadowUpper = Eyeshadow (Upper)
+
+marking-TattooEyeshadowLower-tattoo_eyeshadow_lower = Eyeshadow (Lower)
+marking-TattooEyeshadowLower = Eyeshadow (Lower)
+
+marking-TattooEyeshadowLowerReptilian-tattoo_eyeshadow_lower_reptilian = Eyeshadow (Lower)
+marking-TattooEyeshadowLowerReptilian = Eyeshadow (Lower)
+
+marking-TattooEyeshadowVoxSmall-tattoo_eyeshadow_small = Eyeshadow (Small)
+marking-TattooEyeshadowVoxSmall = Eyeshadow (Small)
+
+marking-TattooEyeshadowVoxMedium-tattoo_eyeshadow_medium = Eyeshadow (Medium)
+marking-TattooEyeshadowVoxMedium = Eyeshadow (Medium)
+
+marking-TattooEyeshadowVoxLarge-tattoo_eyeshadow_Large = Eyeshadow (Large)
+marking-TattooEyeshadowVoxLarge = Eyeshadow (Large)
+
+marking-TattooVoxTailRing-tattoo_vox_tail_ring = Tail Ring
+marking-TattooVoxTailRing = Tail Ring
diff --git a/Resources/Locale/en-US/markings/undergarment.ftl b/Resources/Locale/en-US/markings/undergarment.ftl
index 4e2c5c91fa..3740d0573d 100644
--- a/Resources/Locale/en-US/markings/undergarment.ftl
+++ b/Resources/Locale/en-US/markings/undergarment.ftl
@@ -1,21 +1,21 @@
-marking-UndergarmentTopTanktop-tanktop = Tanktop
-marking-UndergarmentTopBinder-binder = Binder
-marking-UndergarmentTopBra-classic = Classic Bra
-marking-UndergarmentTopSportsbra-sports = Sports Bra
+marking-UndergarmentTopTanktop = Tanktop
+marking-UndergarmentTopBinder = Binder
+marking-UndergarmentTopBra = Classic Bra
+marking-UndergarmentTopSportsbra = Sports Bra
 
-marking-UndergarmentBottomBoxers-boxers = Boxers
-marking-UndergarmentBottomBriefs-briefs = Briefs
-marking-UndergarmentBottomSatin-satin = Satin
+marking-UndergarmentBottomBoxers = Boxers
+marking-UndergarmentBottomBriefs = Briefs
+marking-UndergarmentBottomSatin = Satin
 
-marking-UndergarmentTopTanktopVox-tanktop_vox = Tanktop
-marking-UndergarmentTopBinderVox-binder_vox = Binder
-marking-UndergarmentTopBraVox-classic_vox = Classic Bra
-marking-UndergarmentTopSportsbraVox-sports_vox = Sports Bra
+marking-UndergarmentTopTanktopVox = Tanktop
+marking-UndergarmentTopBinderVox = Binder
+marking-UndergarmentTopBraVox = Classic Bra
+marking-UndergarmentTopSportsbraVox = Sports Bra
 
-marking-UndergarmentBottomBoxersVox-boxers_vox = Boxers
-marking-UndergarmentBottomBriefsVox-briefs_vox = Briefs
-marking-UndergarmentBottomSatinVox-satin_vox = Satin
+marking-UndergarmentBottomBoxersVox = Boxers
+marking-UndergarmentBottomBriefsVox = Briefs
+marking-UndergarmentBottomSatinVox = Satin
 
-marking-UndergarmentBottomBoxersReptilian-boxers_reptilian = Boxers
-marking-UndergarmentBottomBriefsReptilian-briefs_reptilian = Briefs
-marking-UndergarmentBottomSatinReptilian-satin_reptilian = Satin
+marking-UndergarmentBottomBoxersReptilian = Boxers
+marking-UndergarmentBottomBriefsReptilian = Briefs
+marking-UndergarmentBottomSatinReptilian = Satin
diff --git a/Resources/Locale/en-US/markings/vox.ftl b/Resources/Locale/en-US/markings/vox.ftl
new file mode 100644
index 0000000000..1ae829ebbf
--- /dev/null
+++ b/Resources/Locale/en-US/markings/vox.ftl
@@ -0,0 +1,56 @@
+marking-TattooVoxHeartLeftArm-heart_l_arm = Vox Left Arm Tattoo (Heart)
+marking-TattooVoxHeartLeftArm = Vox Left Arm Tattoo (Heart)
+
+marking-TattooVoxHeartRightArm-heart_r_arm = Vox Right Arm Tattoo (Heart)
+marking-TattooVoxHeartRightArm = Vox Right Arm Tattoo (Heart)
+
+marking-TattooVoxHiveChest-hive_s = Vox Chest Tattoo (hive)
+marking-TattooVoxHiveChest = Vox Chest Tattoo (hive)
+
+marking-TattooVoxNightlingChest-nightling_s = Vox Chest Tattoo (nightling)
+marking-TattooVoxNightlingChest = Vox Chest Tattoo (nightling)
+
+marking-VoxScarEyeRight-vox_scar_eye_right = Right Eye Scar
+marking-VoxScarEyeRight = Eye Scar (Right)
+
+marking-VoxScarEyeLeft-vox_scar_eye_left = Left Eye Scar
+marking-VoxScarEyeLeft = Eye Scar (Left)
+
+marking-VoxScarTopSurgeryShort-vox_scar_top_surgery_short = Thoracotomy Scar
+marking-VoxScarTopSurgeryShort = Thoracotomy Scar
+
+marking-VoxScarTopSurgeryLong-vox_scar_top_surgery_long = Clamshell Scar
+marking-VoxScarTopSurgeryLong = Clamshell Scar
+
+marking-VoxScarChest-vox_scar_chest = Chest Scar
+marking-VoxScarChest = Chest Scar
+
+marking-VoxScarNeck-vox_scar_neck = Neck Scar
+marking-VoxScarNeck = Neck Scar
+
+marking-VoxScarChestBullets-vox_scar_chest_bullets = Bullet Holes Scar
+marking-VoxScarChestBullets = Chest Scar (Bullets)
+
+marking-VoxScarStomachBullets-vox_scar_stomach_bullets = Bullet Holes Scar
+marking-VoxScarStomachBullets = Stomach Scar (Bullets)
+
+marking-VoxScarFace1-vox_scar_face_1 = Face Scar
+marking-VoxScarFace1 = Face Scar (Large)
+
+marking-VoxScarFace2-vox_scar_face_2 = Face Scar
+marking-VoxScarFace2 = Face Scar (Small)
+
+marking-VoxScarEyeRightSmall-vox_scar_eye_right_small = Right Eye Scar (Small)
+marking-VoxScarEyeRightSmall = Small Eye Scar (Right)
+
+marking-VoxScarEyeLeftSmall-vox_scar_eye_left_small = Left Eye Scar (Small)
+marking-VoxScarEyeLeftSmall = Small Eye Scar (Left)
+
+marking-VoxTailShort-vox_tail_small = Vox Tail (Short)
+marking-VoxTailShort = Vox Tail (Short)
+
+marking-VoxTail-vox_tail = Vox Tail (Medium)
+marking-VoxTail = Vox Tail (Medium)
+
+marking-VoxTailBig-vox_tail_big = Vox Tail (Big)
+marking-VoxTailBig = Vox Tail (Big)
\ No newline at end of file
diff --git a/Resources/Locale/en-US/markings/vox_tattoos.ftl b/Resources/Locale/en-US/markings/vox_tattoos.ftl
deleted file mode 100644
index f7f3c7292c..0000000000
--- a/Resources/Locale/en-US/markings/vox_tattoos.ftl
+++ /dev/null
@@ -1,11 +0,0 @@
-marking-TattooVoxHeartLeftArm-heart_l_arm = Vox Left Arm Tattoo (Heart)
-marking-TattooVoxHeartLeftArm = Vox Left Arm Tattoo (Heart)
-
-marking-TattooVoxHeartRightArm-heart_r_arm = Vox Right Arm Tattoo (Heart)
-marking-TattooVoxHeartRightArm = Vox Right Arm Tattoo (Heart)
-
-marking-TattooVoxHiveChest-hive_s = Vox Chest Tattoo (hive)
-marking-TattooVoxHiveChest = Vox Chest Tattoo (hive)
-
-marking-TattooVoxNightlingChest-nightling_s = Vox Chest Tattoo (nightling)
-marking-TattooVoxNightlingChest = Vox Chest Tattoo (nightling)
diff --git a/Resources/Locale/en-US/materials/material-extractor.ftl b/Resources/Locale/en-US/materials/material-extractor.ftl
new file mode 100644
index 0000000000..baa4b98bd1
--- /dev/null
+++ b/Resources/Locale/en-US/materials/material-extractor.ftl
@@ -0,0 +1 @@
+material-extractor-comp-wrongreagent = {CAPITALIZE(THE($used))} does not have enough reagent for extraction!
diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index c07e288e8c..53955ed1f6 100644
--- a/Resources/Locale/en-US/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl
@@ -59,6 +59,7 @@ loadout-group-chaplain-mask = Chaplain mask
 loadout-group-chaplain-jumpsuit = Chaplain jumpsuit
 loadout-group-chaplain-outerclothing = Chaplain outer clothing
 loadout-group-chaplain-neck = Chaplain neck
+loadout-group-chaplain-bible = Holy Book
 
 loadout-group-janitor-head = Janitor head
 loadout-group-janitor-jumpsuit = Janitor jumpsuit
diff --git a/Resources/Locale/en-US/reagents/meta/chemicals.ftl b/Resources/Locale/en-US/reagents/meta/chemicals.ftl
index ad9d12e26f..f5dfec7d6a 100644
--- a/Resources/Locale/en-US/reagents/meta/chemicals.ftl
+++ b/Resources/Locale/en-US/reagents/meta/chemicals.ftl
@@ -10,6 +10,9 @@ reagent-desc-sodium-carbonate = A white, odorless, water-soluble salt that yield
 reagent-name-artifexium = artifexium
 reagent-desc-artifexium = A lavender mixture of microscopic artifact fragments and a strong acid. It has the ability to activate artifacts.
 
+reagent-name-artifact-glue = artifact glue
+reagent-desc-artifact-glue = Mixture of glue and artifexium. It can restore durability of nodes in artifact on touch.
+
 reagent-name-benzene = benzene
 reagent-desc-benzene = An aromatic, slightly carcinogenic, ring of carbon, forming a base for many organic compounds.
 
diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
index 55818df8b9..6e0ebf53bf 100644
--- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
+++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
@@ -96,3 +96,4 @@ reagent-physical-desc-holy = holy
 reagent-physical-desc-slimy = slimy
 reagent-physical-desc-neural = neural
 reagent-physical-desc-unidentifiable = unidentifiable
+reagent-physical-desc-non-newtonian = non-newtonian
diff --git a/Resources/Locale/en-US/recipes/tags.ftl b/Resources/Locale/en-US/recipes/tags.ftl
index 11722a6f5a..39d39e7f0c 100644
--- a/Resources/Locale/en-US/recipes/tags.ftl
+++ b/Resources/Locale/en-US/recipes/tags.ftl
@@ -71,6 +71,7 @@ construction-graph-tag-corgi-hide = corgi hide
 construction-graph-tag-apron = an apron
 construction-graph-tag-utility-belt = a utility belt
 soil-construction-graph-any-mushroom = any mushroom
+construction-graph-tag-mop-basic = mop
 
 # toys
 construction-graph-tag-rubber-ducky = a rubber ducky
diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index 876579eea5..62432b8dd6 100644
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -39,6 +39,7 @@ research-technology-kinetic-modifications = Kinetic Modifications
 research-technology-basic-shuttle-armament = Shuttle Basic Armament
 research-technology-advanced-shuttle-weapon = Advanced Shuttle Weapons
 research-technology-thermal-weaponry = Thermal Weaponry
+research-technology-dual-wielding-technology = Dual Wielding Technology
 
 research-technology-basic-robotics = Basic Robotics
 research-technology-basic-anomalous-research = Basic Anomalous Research
diff --git a/Resources/Locale/en-US/spray-painter/spray-painter.ftl b/Resources/Locale/en-US/spray-painter/spray-painter.ftl
new file mode 100644
index 0000000000..dc54c5c8b8
--- /dev/null
+++ b/Resources/Locale/en-US/spray-painter/spray-painter.ftl
@@ -0,0 +1,194 @@
+# Components
+spray-painter-ammo-on-examine = It holds {$charges} charges.
+spray-painter-ammo-after-interact-full = The spray painter is full!
+spray-painter-ammo-after-interact-refilled = You refill the spray painter.
+
+spray-painter-interact-no-charges = Not enough paint left.
+spray-painter-interact-nothing-to-remove = Nothing to remove!
+
+spray-painter-on-examined-painted-message = It seems to have been freshly painted.
+spray-painter-style-not-available = Cannot apply the selected style to this object.
+
+spray-painter-verb-toggle-decals = Toggle decal painting
+
+spray-painter-item-status-label = Decals: {$mode}
+spray-painter-item-status-add = [color=green]Add[/color]
+spray-painter-item-status-remove = [color=red]Remove[/color]
+spray-painter-item-status-off = [color=gray]Off[/color]
+
+# UI
+spray-painter-window-title = Spray Painter
+
+spray-painter-selected-style = Selected style:
+
+spray-painter-selected-decals = Selected decal:
+spray-painter-use-custom-color = Use custom color
+spray-painter-use-snap-to-tile = Snap to tile
+
+spray-painter-angle-rotation = Rotation:
+spray-painter-angle-rotation-90-sub = -90°
+spray-painter-angle-rotation-reset = 0°
+spray-painter-angle-rotation-90-add = +90°
+
+spray-painter-selected-color = Selected color:
+spray-painter-color-red = red
+spray-painter-color-yellow = yellow
+spray-painter-color-brown = brown
+spray-painter-color-green = green
+spray-painter-color-cyan = cyan
+spray-painter-color-blue = blue
+spray-painter-color-white = white
+spray-painter-color-black = black
+
+# Categories (tabs)
+spray-painter-tab-category-airlocks = Airlocks
+spray-painter-tab-category-canisters = Canisters
+spray-painter-tab-category-crates = Crates
+spray-painter-tab-category-lockers = Lockers
+spray-painter-tab-category-pipes = Pipes
+spray-painter-tab-category-decals = Decals
+
+# Groups (subtabs)
+spray-painter-tab-group-airlockstandard = Standard
+spray-painter-tab-group-airlockglass = Glass
+
+spray-painter-tab-group-cratesteel = Steel
+spray-painter-tab-group-crateplastic = Plastic
+spray-painter-tab-group-cratesecure = Secure
+
+spray-painter-tab-group-closet = Unlocked
+spray-painter-tab-group-locker = Secure
+spray-painter-tab-group-wallcloset = Unlocked (Wall)
+spray-painter-tab-group-walllocker = Secure (Wall)
+
+# Airlocks
+spray-painter-style-airlockstandard-atmospherics = Atmospheric
+spray-painter-style-airlockstandard-basic = Basic
+spray-painter-style-airlockstandard-cargo = Cargo
+spray-painter-style-airlockstandard-chemistry = Chemistry
+spray-painter-style-airlockstandard-command = Command
+spray-painter-style-airlockstandard-engineering = Engineering
+spray-painter-style-airlockstandard-freezer = Freezer
+spray-painter-style-airlockstandard-hydroponics = Hydroponics
+spray-painter-style-airlockstandard-maintenance = Maintenance
+spray-painter-style-airlockstandard-medical = Medical
+spray-painter-style-airlockstandard-salvage = Salvage
+spray-painter-style-airlockstandard-science = Science
+spray-painter-style-airlockstandard-security = Security
+spray-painter-style-airlockstandard-virology = Virology
+
+spray-painter-style-airlockglass-atmospherics = Atmospherics
+spray-painter-style-airlockglass-basic = Basic
+spray-painter-style-airlockglass-cargo = Cargo
+spray-painter-style-airlockglass-chemistry = Chemistry
+spray-painter-style-airlockglass-command = Command
+spray-painter-style-airlockglass-engineering = Engineering
+spray-painter-style-airlockglass-hydroponics = Hydroponics
+spray-painter-style-airlockglass-maintenance = Maintenance
+spray-painter-style-airlockglass-medical = Medical
+spray-painter-style-airlockglass-salvage = Salvage
+spray-painter-style-airlockglass-science = Science
+spray-painter-style-airlockglass-security = Security
+spray-painter-style-airlockglass-virology = Virology
+
+# Lockers
+spray-painter-style-locker-atmospherics = Atmospherics
+spray-painter-style-locker-basic = Basic
+spray-painter-style-locker-botanist = Botanist
+spray-painter-style-locker-brigmedic = Brigmedic
+spray-painter-style-locker-captain = Captain
+spray-painter-style-locker-ce = CE
+spray-painter-style-locker-chemical = Chemical
+spray-painter-style-locker-clown = Clown
+spray-painter-style-locker-cmo = CMO
+spray-painter-style-locker-doctor = Doctor
+spray-painter-style-locker-electrical = Electrical
+spray-painter-style-locker-engineer = Engineer
+spray-painter-style-locker-evac = Evac repair
+spray-painter-style-locker-hop = HOP
+spray-painter-style-locker-hos = HOS
+spray-painter-style-locker-medicine = Medicine
+spray-painter-style-locker-mime = Mime
+spray-painter-style-locker-paramedic = Paramedic
+spray-painter-style-locker-quartermaster = Quartermaster
+spray-painter-style-locker-rd = RD
+spray-painter-style-locker-representative = Representative
+spray-painter-style-locker-salvage = Salvage
+spray-painter-style-locker-scientist = Scientist
+spray-painter-style-locker-security = Security
+spray-painter-style-locker-welding = Welding
+
+spray-painter-style-closet-basic = Basic
+spray-painter-style-closet-biohazard = Biohazard
+spray-painter-style-closet-biohazard-science = Biohazard (science)
+spray-painter-style-closet-biohazard-virology = Biohazard (virology)
+spray-painter-style-closet-biohazard-security = Biohazard (security)
+spray-painter-style-closet-biohazard-janitor = Biohazard (janitor)
+spray-painter-style-closet-bomb = Bomb suit
+spray-painter-style-closet-bomb-janitor = Bomb suit (janitor)
+spray-painter-style-closet-chef = Chef
+spray-painter-style-closet-fire = Fire-safety
+spray-painter-style-closet-janitor = Janitor
+spray-painter-style-closet-legal = Lawyer
+spray-painter-style-closet-nitrogen = Internals (nitrogen)
+spray-painter-style-closet-oxygen = Internals (oxygen)
+spray-painter-style-closet-radiation = Radiation suit
+spray-painter-style-closet-tool = Tools
+
+spray-painter-style-wallcloset-atmospherics = Atmospherics
+spray-painter-style-wallcloset-basic = Basic
+spray-painter-style-wallcloset-black = Black
+spray-painter-style-wallcloset-blue = Blue
+spray-painter-style-wallcloset-fire = Fire-safety
+spray-painter-style-wallcloset-green = Green
+spray-painter-style-wallcloset-grey = Grey
+spray-painter-style-wallcloset-mixed = Mixed
+spray-painter-style-wallcloset-nitrogen = Internals (nitrogen)
+spray-painter-style-wallcloset-orange = Orange
+spray-painter-style-wallcloset-oxygen = Internals (oxygen)
+spray-painter-style-wallcloset-pink = Pink
+spray-painter-style-wallcloset-white = White
+spray-painter-style-wallcloset-yellow = Yellow
+
+spray-painter-style-walllocker-evac = Evac repair
+spray-painter-style-walllocker-medical = Medical
+
+# Crates
+spray-painter-style-cratesteel-basic = Basic
+spray-painter-style-cratesteel-electrical = Electrical
+spray-painter-style-cratesteel-engineering = Engineering
+spray-painter-style-cratesteel-radiation = Radiation
+spray-painter-style-cratesteel-science = Science
+spray-painter-style-cratesteel-surgery = Surgery
+
+spray-painter-style-crateplastic-basic = Basic
+spray-painter-style-crateplastic-chemistry = Chemistry
+spray-painter-style-crateplastic-command = Command
+spray-painter-style-crateplastic-hydroponics = Hydroponics
+spray-painter-style-crateplastic-medical = Medical
+spray-painter-style-crateplastic-oxygen = Oxygen
+
+spray-painter-style-cratesecure-basic = Basic
+spray-painter-style-cratesecure-chemistry = Chemistry
+spray-painter-style-cratesecure-command = Command
+spray-painter-style-cratesecure-engineering = Engineering
+spray-painter-style-cratesecure-hydroponics = Hydroponics
+spray-painter-style-cratesecure-medical = Medical
+spray-painter-style-cratesecure-plasma = Plasma
+spray-painter-style-cratesecure-private = Private
+spray-painter-style-cratesecure-science = Science
+spray-painter-style-cratesecure-secgear = Secgear
+spray-painter-style-cratesecure-weapon = Weapon
+
+# Canisters
+spray-painter-style-canisters-air = Air
+spray-painter-style-canisters-ammonia = Ammonia
+spray-painter-style-canisters-carbon-dioxide = Carbon dioxide
+spray-painter-style-canisters-frezon = Frezon
+spray-painter-style-canisters-nitrogen = Nitrogen
+spray-painter-style-canisters-nitrous-oxide = Nitrous oxide
+spray-painter-style-canisters-oxygen = Oxygen
+spray-painter-style-canisters-plasma = Plasma
+spray-painter-style-canisters-storage = Storage
+spray-painter-style-canisters-tritium = Tritium
+spray-painter-style-canisters-water-vapor = Water vapor
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 3c7218b69c..066ac4376d 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -487,5 +487,8 @@ uplink-business-card-desc = A business card that you can give to someone to demo
 uplink-fake-mindshield-name = Fake Mindshield
 uplink-fake-mindshield-desc = A togglable implant capable of mimicking the same transmissions a real mindshield puts out when on, tricking capable Heads-up displays into thinking you have a mindshield (Nanotrasen brand implanter not provided.)
 
+uplink-contraband-lighter-name = Contraband Lighter box
+uplink-contraband-lighter-desc = A mystery box guaranteed to contain a syndicate branded lighter. No fuel required
+
 uplink-smuggler-satchel-name = Smuggler's Satchel
 uplink-smuggler-satchel-desc = A handy, suspicious looking satchel. Just flat enough to fit underneath floor tiles.
diff --git a/Resources/Locale/en-US/throwing/catchable.ftl b/Resources/Locale/en-US/throwing/catchable.ftl
new file mode 100644
index 0000000000..8db3befd68
--- /dev/null
+++ b/Resources/Locale/en-US/throwing/catchable.ftl
@@ -0,0 +1,4 @@
+catchable-component-success-self = You catch {THE($item)}!
+catchable-component-success-others = {CAPITALIZE(THE($catcher))} catches {THE($item)}!
+catchable-component-fail-self = You fail to catch {THE($item)}!
+catchable-component-fail-others = {CAPITALIZE(THE($catcher))} fails to catch {THE($item)}!
diff --git a/Resources/Locale/en-US/tools/tool-qualities.ftl b/Resources/Locale/en-US/tools/tool-qualities.ftl
index 14e42390a7..b4918ec26c 100644
--- a/Resources/Locale/en-US/tools/tool-qualities.ftl
+++ b/Resources/Locale/en-US/tools/tool-qualities.ftl
@@ -32,4 +32,7 @@ tool-quality-rolling-name = Rolling
 tool-quality-rolling-tool-name = Rolling Pin
 
 tool-quality-digging-name = Digging
-tool-quality-digging-tool-name = Shovel
\ No newline at end of file
+tool-quality-digging-tool-name = Shovel
+
+tool-quality-brushing-name = Brushing
+tool-quality-brushing-tool-name = Wire Brush
diff --git a/Resources/Locale/en-US/weapons/ranged/gun.ftl b/Resources/Locale/en-US/weapons/ranged/gun.ftl
index 18e01e31c8..a364075be9 100644
--- a/Resources/Locale/en-US/weapons/ranged/gun.ftl
+++ b/Resources/Locale/en-US/weapons/ranged/gun.ftl
@@ -4,7 +4,6 @@ gun-fire-rate-examine = Fire rate is [color={$color}]{$fireRate}[/color] per sec
 gun-selector-verb = Change to {$mode}
 gun-selected-mode = Selected {$mode}
 gun-disabled = You can't use guns!
-gun-clumsy = The gun blows up in your face!
 gun-set-fire-mode = Set to {$mode}
 gun-magazine-whitelist-fail = That won't fit into the gun!
 gun-magazine-fired-empty = No ammo left!
diff --git a/Resources/Locale/en-US/xenoarchaeology/artifact-component.ftl b/Resources/Locale/en-US/xenoarchaeology/artifact-component.ftl
index 50fa136928..90029b282c 100644
--- a/Resources/Locale/en-US/xenoarchaeology/artifact-component.ftl
+++ b/Resources/Locale/en-US/xenoarchaeology/artifact-component.ftl
@@ -1,10 +1,4 @@
-### Commands
-cmd-unlocknode-desc = Unlocks a node on a given artifact
-cmd-unlocknode-help = unlocknode <artifact uid> <node uid>
-cmd-parse-failure-unlocknode-arg-num = Incorrect number of args
-cmd-parse-failure-unlocknode-invalid-entity = Provided netEntity is not valid node
-
-### Verbs
+### Verbs
 artifact-verb-make-always-active = Make artifact always active
 artifact-verb-activate = Activate artifact
 
diff --git a/Resources/Maps/Nonstations/dm01-entryway.yml b/Resources/Maps/Nonstations/dm01-entryway.yml
index bb252e35ab..2f15189a67 100644
--- a/Resources/Maps/Nonstations/dm01-entryway.yml
+++ b/Resources/Maps/Nonstations/dm01-entryway.yml
@@ -3958,8 +3958,6 @@ entities:
     - type: Transform
       pos: 8.5,27.5
       parent: 2
-    - type: Advertise
-      nextAdvertisementTime: 6277.3942716
 - proto: WallPlastitaniumDiagonalIndestructible
   entities:
   - uid: 171
diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index cbee5a1327..3da417fc4b 100644
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 260.1.0
+  engineVersion: 264.0.0
   forkId: ""
   forkVersion: ""
-  time: 05/20/2025 21:40:45
-  entityCount: 25722
+  time: 07/10/2025 16:46:10
+  entityCount: 25502
 maps:
 - 943
 grids:
@@ -61,9 +61,11 @@ tilemap:
   5: FloorSteelLime
   104: FloorSteelMono
   106: FloorSteelPavement
+  11: FloorSteelPavementVertical
   108: FloorTechMaint
   109: FloorTechMaint2
   110: FloorTechMaint3
+  10: FloorTechMaintDark
   112: FloorWhite
   115: FloorWhiteHerringbone
   116: FloorWhiteMini
@@ -93,7 +95,7 @@ entities:
           version: 7
         -1,-1:
           ind: -1,-1
-          tiles: XQAAAAACAF0AAAAAAwB+AAAAAAAAXQAAAAAAAF0AAAAAAwBdAAAAAAAAZAAAAAAAAB8AAAAAAQAfAAAAAAEAHwAAAAABAB8AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAXQAAAAADAF0AAAAAAgBdAAAAAAIAfgAAAAAAAF0AAAAAAwBdAAAAAAMAXQAAAAABAGQAAAAAAABdAAAAAAEAZAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAMAXQAAAAABAH4AAAAAAABdAAAAAAIAXQAAAAABAF0AAAAAAgBkAAAAAAAAXQAAAAABAGQAAAAAAAB+AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAADAF0AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAIAZAAAAAAAAGQAAAAAAABkAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAwBdAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAADAGQAAAAAAABdAAAAAAEAXQAAAAABAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAAuAAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAIAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAH4AAAAAAAB0AAAAAAAAdAAAAAACAH4AAAAAAABdAAAAAAIAXQAAAAAAAF0AAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAdAAAAAADAHMAAAAAAQB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABwAAAAAAEAfgAAAAAAAH4AAAAAAABdAAAAAAMAXQAAAAADAH4AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAABAH4AAAAAAAAfAAAAAAEAXQAAAAACAF0AAAAAAgB+AAAAAAAAfQAAAAAAAAAAAAAAAAB9AAAAAAAAfgAAAAAAAH4AAAAAAAB6AAAAAAEAegAAAAACADMAAAAAAAB6AAAAAAIAegAAAAADAHoAAAAAAwB+AAAAAAAAHwAAAAACAF0AAAAAAQBdAAAAAAEAfgAAAAAAAH0AAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAB6AAAAAAMAegAAAAABAHoAAAAAAAAzAAAAAAAAegAAAAADAHoAAAAAAQB6AAAAAAMAfgAAAAAAAB8AAAAAAgBdAAAAAAEAXQAAAAABAH4AAAAAAAB9AAAAAAAAAAAAAAAAAH0AAAAAAAB+AAAAAAAAegAAAAACAHoAAAAAAgB6AAAAAAIAJAAAAAADAHoAAAAAAgB6AAAAAAAAegAAAAAAAH4AAAAAAAAfAAAAAAAAXQAAAAADAF0AAAAAAAB+AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAACAH4AAAAAAAB6AAAAAAMAegAAAAACAHoAAAAAAgB+AAAAAAAAHwAAAAAAAE0AAAAAAgBNAAAAAAIAfgAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAACAB8AAAAAAQB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAEAfgAAAAAAAB8AAAAAAgBdAAAAAAIAXQAAAAAAAF0AAAAAAwB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAIAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAMAHwAAAAABAA==
+          tiles: XQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAXQAAAAADAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAAuAAAAAAAAfgAAAAAAAF0AAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAABsAAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAB0AAAAAAAAdAAAAAACAH4AAAAAAABdAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAAbAAAAAAAAH4AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB+AAAAAAAAdAAAAAADAHMAAAAAAQB+AAAAAAAAXQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABwAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAABAH4AAAAAAAAfAAAAAAEAfgAAAAAAAH4AAAAAAABsAAAAAAAAfQAAAAAAAAAAAAAAAAB9AAAAAAAAfgAAAAAAAH4AAAAAAAB6AAAAAAEAegAAAAACADMAAAAAAAB6AAAAAAIAegAAAAADAHoAAAAAAwB+AAAAAAAAHwAAAAACAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAB6AAAAAAMAegAAAAABAHoAAAAAAAAzAAAAAAAAegAAAAADAHoAAAAAAQB6AAAAAAMAfgAAAAAAAB8AAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB+AAAAAAAAegAAAAACAHoAAAAAAgB6AAAAAAIAJAAAAAADAHoAAAAAAgB6AAAAAAAAegAAAAAAAH4AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAACAH4AAAAAAAB6AAAAAAMAegAAAAACAHoAAAAAAgB+AAAAAAAAHwAAAAAAAGwAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAACAB8AAAAAAQB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAEAfgAAAAAAAB8AAAAAAgBsAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAMAHwAAAAABAA==
           version: 7
         0,0:
           ind: 0,0
@@ -101,7 +103,7 @@ entities:
           version: 7
         -1,0:
           ind: -1,0
-          tiles: XQAAAAADAF0AAAAAAQBdAAAAAAMAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB+AAAAAAAAHwAAAAACAB8AAAAAAgAfAAAAAAAAHwAAAAABAF0AAAAAAwBdAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAB8AAAAAAwAfAAAAAAMAHwAAAAADAB8AAAAAAABdAAAAAAEAXQAAAAADAH4AAAAAAABtAAAAAAAAbQAAAAAAAB8AAAAAAwAfAAAAAAAAHwAAAAABAB8AAAAAAwB+AAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAABAB8AAAAAAgAfAAAAAAMAXQAAAAADAF0AAAAAAwAfAAAAAAMAbQAAAAAAAG0AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAAAfAAAAAAMAfgAAAAAAAAAAAAAAAAB9AAAAAAAAfgAAAAAAAB8AAAAAAgAfAAAAAAEAHwAAAAACAF0AAAAAAwBdAAAAAAIAfgAAAAAAAG0AAAAAAABtAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAHwAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAADAH4AAAAAAAA4AAAAAAAAOAAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAB8AAAAAAgB+AAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAATQAAAAADAE0AAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAABdAAAAAAAATQAAAAACAF0AAAAAAwBdAAAAAAEAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAABdAAAAAAAAXQAAAAADAE0AAAAAAgBdAAAAAAEAXQAAAAACAF0AAAAAAQBdAAAAAAIAXQAAAAABAF0AAAAAAQBdAAAAAAIAXQAAAAABAF0AAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAADAF0AAAAAAQBNAAAAAAEAXQAAAAABAF0AAAAAAQBdAAAAAAMAXQAAAAABAF0AAAAAAwBdAAAAAAMAXQAAAAACAF0AAAAAAQBdAAAAAAAAXQAAAAACAF0AAAAAAQBdAAAAAAMAXQAAAAAAAE0AAAAAAwBNAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAIAXQAAAAAAAF0AAAAAAwBdAAAAAAMAXQAAAAACAF0AAAAAAgBdAAAAAAAAXQAAAAACAB8AAAAAAQB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAIAegAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAMAXQAAAAAAAF0AAAAAAgBdAAAAAAIAXQAAAAABAF0AAAAAAgAfAAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAQB6AAAAAAAAegAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAEAHwAAAAADAH4AAAAAAAB6AAAAAAMAegAAAAACAHoAAAAAAAB6AAAAAAAAegAAAAADAHoAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAwAfAAAAAAIAfgAAAAAAAF0AAAAAAgBdAAAAAAEAXQAAAAADAH4AAAAAAAB+AAAAAAAAegAAAAACAHoAAAAAAgB6AAAAAAAAegAAAAABAHoAAAAAAAB6AAAAAAEAfgAAAAAAAB8AAAAAAgAfAAAAAAAAHwAAAAAAAF0AAAAAAQBdAAAAAAIAXQAAAAACAF0AAAAAAQB+AAAAAAAAegAAAAAAAHoAAAAAAQBAAAAAAAAAQAAAAAAAAEAAAAAAAAB6AAAAAAEAegAAAAABAH4AAAAAAAAfAAAAAAIAHwAAAAABAB8AAAAAAAB+AAAAAAAAXQAAAAABAA==
+          tiles: fgAAAAAAAH4AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB+AAAAAAAAHwAAAAACAB8AAAAAAgAfAAAAAAAAHwAAAAABAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAB8AAAAAAwAfAAAAAAMAHwAAAAADAB8AAAAAAABsAAAAAAAAbQAAAAAAAH4AAAAAAABtAAAAAAAAbQAAAAAAAB8AAAAAAwAfAAAAAAAAHwAAAAABAB8AAAAAAwB+AAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAABAB8AAAAAAgAfAAAAAAMAfgAAAAAAAG0AAAAAAABsAAAAAAAAbQAAAAAAAG0AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAAAfAAAAAAMAfgAAAAAAAAAAAAAAAAB9AAAAAAAAfgAAAAAAAB8AAAAAAgAfAAAAAAEAHwAAAAACAH4AAAAAAABtAAAAAAAAfgAAAAAAAG0AAAAAAABtAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAHwAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAA4AAAAAAAAOAAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAB8AAAAAAgB+AAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAABdAAAAAAAATQAAAAACAF0AAAAAAwBdAAAAAAEAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAABdAAAAAAAAXQAAAAADAE0AAAAAAgBdAAAAAAEAXQAAAAACAF0AAAAAAQBdAAAAAAIAXQAAAAABAF0AAAAAAQBdAAAAAAIAXQAAAAABAF0AAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAADAF0AAAAAAQBNAAAAAAEAXQAAAAABAF0AAAAAAQBdAAAAAAMAXQAAAAABAF0AAAAAAwBdAAAAAAMAXQAAAAACAF0AAAAAAQBdAAAAAAAAXQAAAAACAF0AAAAAAQBdAAAAAAMAXQAAAAAAAE0AAAAAAwBNAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAIAXQAAAAAAAF0AAAAAAwBdAAAAAAMAXQAAAAACAF0AAAAAAgBdAAAAAAAAXQAAAAACAB8AAAAAAQB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAIAegAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAMAXQAAAAAAAF0AAAAAAgBdAAAAAAIAXQAAAAABAF0AAAAAAgAfAAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAQB6AAAAAAAAegAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAEAHwAAAAADAH4AAAAAAAB6AAAAAAMAegAAAAACAHoAAAAAAAB6AAAAAAAAegAAAAADAHoAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAwAfAAAAAAIAfgAAAAAAAF0AAAAAAgBdAAAAAAEAXQAAAAADAH4AAAAAAAB+AAAAAAAAegAAAAACAHoAAAAAAgB6AAAAAAAAegAAAAABAHoAAAAAAAB6AAAAAAEAfgAAAAAAAB8AAAAAAgAfAAAAAAAAHwAAAAAAAF0AAAAAAQBdAAAAAAIAXQAAAAACAF0AAAAAAQB+AAAAAAAAegAAAAAAAHoAAAAAAQBAAAAAAAAAQAAAAAAAAEAAAAAAAAB6AAAAAAEAegAAAAABAH4AAAAAAAAfAAAAAAIAHwAAAAABAB8AAAAAAAB+AAAAAAAAXQAAAAABAA==
           version: 7
         0,-2:
           ind: 0,-2
@@ -109,7 +111,7 @@ entities:
           version: 7
         -1,-2:
           ind: -1,-2
-          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB+AAAAAAAAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAF0AAAAAAgB6AAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAfAAAAAAMAHwAAAAACAB8AAAAAAgAfAAAAAAEAHwAAAAABAB8AAAAAAwB+AAAAAAAAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAHwAAAAACAB8AAAAAAgAfAAAAAAMAHwAAAAAAAB8AAAAAAgAfAAAAAAIAfgAAAAAAAF0AAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAB8AAAAAAAAfAAAAAAIAHwAAAAACAB8AAAAAAwAfAAAAAAIAHwAAAAADAH4AAAAAAABdAAAAAAMAbQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAABAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAADAB8AAAAAAQB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAIAXQAAAAABAF0AAAAAAQBdAAAAAAMAXQAAAAACAF0AAAAAAABdAAAAAAMAXQAAAAABAF0AAAAAAwBdAAAAAAEAXQAAAAAAAF0AAAAAAQBdAAAAAAMATQAAAAAAAF0AAAAAAABdAAAAAAEAXQAAAAADAF0AAAAAAwBdAAAAAAEAXQAAAAAAAF0AAAAAAQBdAAAAAAMAXQAAAAACAF0AAAAAAgBdAAAAAAMAXQAAAAABAF0AAAAAAwBdAAAAAAIAXQAAAAACAE0AAAAAAwBdAAAAAAIAXQAAAAACAF0AAAAAAwBdAAAAAAMAXQAAAAADAF0AAAAAAwBdAAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAMAXQAAAAABAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAwBNAAAAAAIAXQAAAAADAE0AAAAAAwBNAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAQBdAAAAAAMAXQAAAAADAH4AAAAAAAAuAAAAAAAAfgAAAAAAAAIAAAAAAQB+AAAAAAAAHwAAAAABAH4AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAADAF0AAAAAAwB+AAAAAAAALgAAAAAAAH4AAAAAAAADAAAAAAMAfgAAAAAAAB8AAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAXQAAAAADAF0AAAAAAwBdAAAAAAMAfgAAAAAAAC4AAAAAAAB+AAAAAAAAAwAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAF0AAAAAAQBdAAAAAAMAXQAAAAACAH4AAAAAAABtAAAAAAAAfgAAAAAAAAMAAAAAAAB+AAAAAAAAHwAAAAADAB8AAAAAAAAfAAAAAAEAHwAAAAACAH4AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAACAF0AAAAAAgB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAQgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAXQAAAAAAAA==
+          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB+AAAAAAAAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAF0AAAAAAgB6AAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAfAAAAAAMAHwAAAAACAB8AAAAAAgAfAAAAAAEAHwAAAAABAB8AAAAAAwB+AAAAAAAAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAHwAAAAACAB8AAAAAAgAfAAAAAAMAHwAAAAAAAB8AAAAAAgAfAAAAAAIAfgAAAAAAAF0AAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAB8AAAAAAAAfAAAAAAIAHwAAAAACAB8AAAAAAwAfAAAAAAIAHwAAAAADAH4AAAAAAABdAAAAAAMAbQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAABAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAADAB8AAAAAAQB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAIAXQAAAAABAF0AAAAAAQBdAAAAAAMAXQAAAAACAF0AAAAAAABdAAAAAAMAXQAAAAABAF0AAAAAAwBdAAAAAAEAXQAAAAAAAF0AAAAAAQBdAAAAAAMATQAAAAAAAF0AAAAAAABdAAAAAAEAXQAAAAADAF0AAAAAAwBdAAAAAAEAXQAAAAAAAF0AAAAAAQBdAAAAAAMAXQAAAAACAF0AAAAAAgBdAAAAAAMAXQAAAAABAF0AAAAAAwBdAAAAAAIAXQAAAAACAE0AAAAAAwBdAAAAAAIAXQAAAAAAAF0AAAAAAwBdAAAAAAMAXQAAAAADAF0AAAAAAwBdAAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAMAXQAAAAABAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAwBNAAAAAAIAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAHQAAAAAAAB0AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH4AAAAAAABdAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAXQAAAAAAAGwAAAAAAAB0AAAAAAAAdAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAXQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAF0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAF0AAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAABdAAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAABdAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAXQAAAAAAAGwAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAXQAAAAAAAA==
           version: 7
         0,-3:
           ind: 0,-3
@@ -133,15 +135,15 @@ entities:
           version: 7
         -2,-2:
           ind: -2,-2
-          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB6AAAAAAMAegAAAAABAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAHoAAAAAAgB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAFsAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAB6AAAAAAEAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABbAAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAegAAAAABAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB6AAAAAAMAfgAAAAAAAH0AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAHoAAAAAAwB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAHoAAAAAAgB6AAAAAAIAegAAAAAAAHoAAAAAAgB8AAAAAAIAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAEAXQAAAAADAF0AAAAAAQBdAAAAAAEATQAAAAAAAF0AAAAAAwBdAAAAAAIAXQAAAAADAF0AAAAAAwBdAAAAAAAAXQAAAAACAF0AAAAAAwBdAAAAAAIAXQAAAAADAF0AAAAAAgBdAAAAAAIAXQAAAAACAF0AAAAAAgBdAAAAAAEAXQAAAAACAE0AAAAAAQBdAAAAAAMAXQAAAAAAAF0AAAAAAQBdAAAAAAEAXQAAAAABAF0AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAIAXQAAAAABAF0AAAAAAQBdAAAAAAIAXQAAAAABAF0AAAAAAgBNAAAAAAMAXQAAAAADAF0AAAAAAABdAAAAAAMAXQAAAAACAF0AAAAAAABdAAAAAAEAXQAAAAABAF0AAAAAAwBdAAAAAAEAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAH4AAAAAAAAfAAAAAAAAfgAAAAAAAE0AAAAAAAAfAAAAAAEAHwAAAAABAB8AAAAAAgAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAADAB8AAAAAAgAfAAAAAAMAHwAAAAACAH4AAAAAAABdAAAAAAEAHwAAAAABAE0AAAAAAgBNAAAAAAAALgAAAAAAAC4AAAAAAABOAAAAAAEALgAAAAAAAC4AAAAAAABNAAAAAAEATQAAAAABAB8AAAAAAwAfAAAAAAEAHwAAAAAAAB8AAAAAAAB+AAAAAAAAXQAAAAADAB8AAAAAAwBNAAAAAAIATQAAAAACAB8AAAAAAgAuAAAAAAAALgAAAAAAAC4AAAAAAAAfAAAAAAIATQAAAAADAE0AAAAAAgAfAAAAAAIAHwAAAAADAB8AAAAAAAAfAAAAAAAAfgAAAAAAAF0AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAEALgAAAAAAAE4AAAAAAAAuAAAAAAAAHwAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAgB+AAAAAAAAHwAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAABAF0AAAAAAgB+AAAAAAAAHwAAAAADAC4AAAAAAAAuAAAAAAAALgAAAAAAAB8AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAwBdAAAAAAMAXQAAAAACAF0AAAAAAgB+AAAAAAAAXQAAAAACAA==
+          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB6AAAAAAMAegAAAAABAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAHoAAAAAAgB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAFsAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAB6AAAAAAEAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABbAAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAegAAAAABAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB6AAAAAAMAfgAAAAAAAH0AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAHoAAAAAAwB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAHoAAAAAAgB6AAAAAAIAegAAAAAAAHoAAAAAAgB8AAAAAAIAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAEAXQAAAAADAF0AAAAAAQBdAAAAAAEAXQAAAAAAAF0AAAAAAwBdAAAAAAIAXQAAAAADAF0AAAAAAwBdAAAAAAAAXQAAAAACAF0AAAAAAwBdAAAAAAIAXQAAAAADAF0AAAAAAgBdAAAAAAIAXQAAAAACAF0AAAAAAgBdAAAAAAEAXQAAAAACAE0AAAAAAQBdAAAAAAMAXQAAAAAAAF0AAAAAAQBdAAAAAAEAXQAAAAABAF0AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAIAXQAAAAABAF0AAAAAAQBdAAAAAAIAXQAAAAABAF0AAAAAAgBNAAAAAAMAXQAAAAADAF0AAAAAAABdAAAAAAMAXQAAAAACAF0AAAAAAABdAAAAAAEAXQAAAAABAF0AAAAAAwBdAAAAAAEAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAAwAAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAHwAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAAAMAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAB8AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAGwAAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAADAAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABsAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAABsAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAAwAAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAbAAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAA==
           version: 7
         -2,-1:
           ind: -2,-1
-          tiles: XQAAAAABAF0AAAAAAwAfAAAAAAEALgAAAAAAAC4AAAAAAABOAAAAAAAALgAAAAAAAC4AAAAAAAAfAAAAAAIAXQAAAAACAF0AAAAAAwBdAAAAAAEAXQAAAAAAAF0AAAAAAwB+AAAAAAAAXQAAAAABAF0AAAAAAwBdAAAAAAMAfgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAIAXQAAAAAAAF0AAAAAAQBdAAAAAAAAfgAAAAAAAF0AAAAAAQBdAAAAAAEAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAIAXQAAAAABAB8AAAAAAQAfAAAAAAIAHwAAAAAAAH4AAAAAAABdAAAAAAAATQAAAAAAAE0AAAAAAgB+AAAAAAAAHwAAAAACAB8AAAAAAAAfAAAAAAEAHwAAAAABAB8AAAAAAQB+AAAAAAAATQAAAAAAAE0AAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAADAF0AAAAAAwBdAAAAAAIAfgAAAAAAAB8AAAAAAQAfAAAAAAMAHwAAAAAAAB8AAAAAAwAfAAAAAAMAfgAAAAAAAF0AAAAAAwBdAAAAAAAAHwAAAAAAAB8AAAAAAgAfAAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAIAXQAAAAABAB8AAAAAAQAfAAAAAAMAHwAAAAACAB8AAAAAAgAfAAAAAAMAHwAAAAAAAB8AAAAAAQBdAAAAAAAAXQAAAAACAH4AAAAAAAAfAAAAAAEAHwAAAAABAH4AAAAAAABdAAAAAAEAXQAAAAAAAF0AAAAAAwB+AAAAAAAAfgAAAAAAAB8AAAAAAgAfAAAAAAAAHwAAAAACAH4AAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAABdAAAAAAEAHwAAAAAAAB8AAAAAAwB+AAAAAAAAXQAAAAABAF0AAAAAAwBdAAAAAAMAXQAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAADAB8AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAQBdAAAAAAIAXQAAAAADAF0AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAIAXQAAAAACAB8AAAAAAgAfAAAAAAAAHwAAAAABAH4AAAAAAABdAAAAAAIAXQAAAAAAAF0AAAAAAgBdAAAAAAIAXQAAAAACAF0AAAAAAQBdAAAAAAMAXQAAAAADAF0AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAQB+AAAAAAAAHwAAAAADAB8AAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAwBdAAAAAAEAXQAAAAACAF0AAAAAAwBdAAAAAAMAXQAAAAADAF0AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAwBdAAAAAAAAXQAAAAABAB8AAAAAAwAfAAAAAAEAfgAAAAAAAF0AAAAAAwBdAAAAAAIAXQAAAAABAF0AAAAAAwBdAAAAAAEAXQAAAAADAF0AAAAAAwBdAAAAAAEAXQAAAAACAF0AAAAAAgBdAAAAAAAAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAABAF0AAAAAAgBdAAAAAAAAXQAAAAAAAF0AAAAAAwBdAAAAAAMAXQAAAAABAF0AAAAAAABdAAAAAAIAXQAAAAADAF0AAAAAAwB+AAAAAAAAHwAAAAAAAB8AAAAAAwB+AAAAAAAAXQAAAAAAAB8AAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAE0AAAAAAAAfAAAAAAMAHwAAAAACAH4AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAH4AAAAAAAAfAAAAAAMAHwAAAAABAB8AAAAAAgAfAAAAAAAAfgAAAAAAAF0AAAAAAQBdAAAAAAIAHwAAAAADAB8AAAAAAQB+AAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAAB+AAAAAAAAegAAAAACAHoAAAAAAwB6AAAAAAEAegAAAAADAH4AAAAAAABdAAAAAAMAXQAAAAADAA==
+          tiles: XQAAAAAAAGwAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAF0AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABsAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAGwAAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABsAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAGwAAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAbAAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAGwAAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAF0AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAfgAAAAAAAGwAAAAAAABdAAAAAAAAbAAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAA/AAAAAAAAfgAAAAAAAGwAAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAPwAAAAAAAD8AAAAAAAA/AAAAAAAAPwAAAAAAAH4AAAAAAABsAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAALgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAbAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAABsAAAAAAAAHwAAAAAAAC4AAAAAAAAuAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAbAAAAAAAAB8AAAAAAAAuAAAAAAAALgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAA==
           version: 7
         -2,0:
           ind: -2,0
-          tiles: HwAAAAAAAB8AAAAAAAB+AAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAAB+AAAAAAAAegAAAAACAHoAAAAAAAB6AAAAAAIAegAAAAAAAH4AAAAAAABdAAAAAAIAXQAAAAADAH4AAAAAAABtAAAAAAAAfgAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAfgAAAAAAAB8AAAAAAgAfAAAAAAIAHwAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAIAfgAAAAAAAG0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAABdAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAATQAAAAADAF0AAAAAAABdAAAAAAIAXQAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAAAAF0AAAAAAwBdAAAAAAEAXQAAAAABAF0AAAAAAABdAAAAAAIAXQAAAAABAF0AAAAAAgBdAAAAAAMATQAAAAACAF0AAAAAAgBdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAwBdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAMAXQAAAAADAE0AAAAAAgBdAAAAAAEAXQAAAAABAF0AAAAAAwBdAAAAAAAAXQAAAAACAF0AAAAAAABdAAAAAAIAXQAAAAABAF0AAAAAAABdAAAAAAMAXQAAAAAAAF0AAAAAAgBdAAAAAAIAXQAAAAABAF0AAAAAAwBNAAAAAAIAXQAAAAACAB8AAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAE0AAAAAAQBdAAAAAAAAHwAAAAABAH4AAAAAAAAfAAAAAAEAegAAAAABAHoAAAAAAgB6AAAAAAEAegAAAAACAHoAAAAAAAAfAAAAAAIAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH4AAAAAAABdAAAAAAEAEQAAAAAAAB8AAAAAAQB+AAAAAAAAHwAAAAADAHoAAAAAAgB6AAAAAAMAegAAAAABAHoAAAAAAQB6AAAAAAIAHwAAAAADAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAXQAAAAACABEAAAAAAABdAAAAAAIAfgAAAAAAAB8AAAAAAAB6AAAAAAIAegAAAAACAHoAAAAAAQB6AAAAAAIAegAAAAADAB8AAAAAAAB+AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfgAAAAAAAF0AAAAAAgARAAAAAAAAHwAAAAACAH4AAAAAAAAfAAAAAAMAegAAAAABAHoAAAAAAgB6AAAAAAAAegAAAAABAHoAAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAMAXQAAAAACAB8AAAAAAwB+AAAAAAAAHwAAAAABAHoAAAAAAQB6AAAAAAAAegAAAAACAHoAAAAAAgB6AAAAAAAAHwAAAAABAH4AAAAAAAAfAAAAAAEAHwAAAAABAB8AAAAAAgB+AAAAAAAAXQAAAAAAAA==
+          tiles: fgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAAfAAAAAAAALgAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAAKAAAAAAAAfgAAAAAAAH4AAAAAAAAKAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAACgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAIAXQAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAAAAF0AAAAAAwBdAAAAAAEAXQAAAAABAF0AAAAAAABdAAAAAAIAXQAAAAABAF0AAAAAAgBdAAAAAAMATQAAAAACAF0AAAAAAgBdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAwBdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAMAXQAAAAADAE0AAAAAAgBdAAAAAAEAXQAAAAABAF0AAAAAAwBdAAAAAAAAXQAAAAACAF0AAAAAAABdAAAAAAIAXQAAAAABAF0AAAAAAABdAAAAAAMAXQAAAAAAAF0AAAAAAgBdAAAAAAIAXQAAAAABAF0AAAAAAwBNAAAAAAIAXQAAAAACAB8AAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAE0AAAAAAQBdAAAAAAAAHwAAAAABAH4AAAAAAAAfAAAAAAEAegAAAAABAHoAAAAAAgB6AAAAAAEAegAAAAACAHoAAAAAAAAfAAAAAAIAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH4AAAAAAABdAAAAAAEAEQAAAAAAAB8AAAAAAQB+AAAAAAAAHwAAAAADAHoAAAAAAgB6AAAAAAMAegAAAAABAHoAAAAAAQB6AAAAAAIAHwAAAAADAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAXQAAAAACABEAAAAAAABdAAAAAAIAfgAAAAAAAB8AAAAAAAB6AAAAAAIAegAAAAACAHoAAAAAAQB6AAAAAAIAegAAAAADAB8AAAAAAAB+AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfgAAAAAAAF0AAAAAAgARAAAAAAAAHwAAAAACAH4AAAAAAAAfAAAAAAMAegAAAAABAHoAAAAAAgB6AAAAAAAAegAAAAABAHoAAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAMAXQAAAAACAB8AAAAAAwB+AAAAAAAAHwAAAAABAHoAAAAAAQB6AAAAAAAAegAAAAACAHoAAAAAAgB6AAAAAAAAHwAAAAABAH4AAAAAAAAfAAAAAAEAHwAAAAABAB8AAAAAAgB+AAAAAAAAXQAAAAAAAA==
           version: 7
         1,-3:
           ind: 1,-3
@@ -149,15 +151,15 @@ entities:
           version: 7
         -3,0:
           ind: -3,0
-          tiles: HwAAAAACAB8AAAAAAQAfAAAAAAAAHwAAAAABAH4AAAAAAAB5AAAAAAAAeQAAAAAAAH4AAAAAAABNAAAAAAMAXQAAAAADAF0AAAAAAwBdAAAAAAMAfgAAAAAAAB8AAAAAAQAfAAAAAAIAHwAAAAADAB8AAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAEAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAAAAH4AAAAAAAAfAAAAAAMAHwAAAAACAB8AAAAAAAAfAAAAAAIAHwAAAAABAH4AAAAAAABdAAAAAAEAXQAAAAADAF0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAABAB8AAAAAAgAfAAAAAAIAHwAAAAACAB8AAAAAAgAfAAAAAAAAHwAAAAACAB8AAAAAAQB+AAAAAAAAXQAAAAADAF0AAAAAAgBdAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbgAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAgAfAAAAAAAAHwAAAAACAB8AAAAAAAAfAAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAIAXQAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAAyAAAAAAMAMgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAADAB8AAAAAAwAfAAAAAAAAHwAAAAACAH4AAAAAAABdAAAAAAAAXQAAAAADAF0AAAAAAwBtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAwBdAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAAAAAAAAAAAfgAAAAAAAB8AAAAAAQB6AAAAAAMAegAAAAAAAH4AAAAAAAB6AAAAAAAAfgAAAAAAAF0AAAAAAQBdAAAAAAEAXQAAAAABAE0AAAAAAwBdAAAAAAEAXQAAAAADAF0AAAAAAAB9AAAAAAAAAAAAAAAAAH4AAAAAAAAfAAAAAAAAegAAAAAAAHoAAAAAAgAfAAAAAAAAegAAAAADAH4AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAgBNAAAAAAIAXQAAAAACAF0AAAAAAgBdAAAAAAMAfQAAAAAAAAAAAAAAAAB+AAAAAAAAHwAAAAADAHoAAAAAAwB6AAAAAAMAfgAAAAAAAHoAAAAAAgB+AAAAAAAAXQAAAAABAF0AAAAAAABdAAAAAAAATQAAAAADAF0AAAAAAwBdAAAAAAMAXQAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAFIAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAgAfAAAAAAAAHwAAAAADAB8AAAAAAwAfAAAAAAIAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAACAB8AAAAAAgBwAAAAAAMAcAAAAAACAHAAAAAAAwB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAEAKAAAAAAAAB8AAAAAAQAfAAAAAAMAHwAAAAABAH4AAAAAAAAfAAAAAAIAHwAAAAADAB8AAAAAAgAfAAAAAAAAcAAAAAABAHAAAAAAAgBwAAAAAAIAfgAAAAAAAF0AAAAAAgARAAAAAAAAXQAAAAACACgAAAAAAQAfAAAAAAAAHwAAAAACAB8AAAAAAgAfAAAAAAIAcAAAAAABAHAAAAAAAABwAAAAAAAAcAAAAAABAHAAAAAAAgBwAAAAAAMAcAAAAAABAB8AAAAAAQBdAAAAAAEAEQAAAAAAABEAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAMAfgAAAAAAAHAAAAAAAgBwAAAAAAIAcAAAAAADAHAAAAAAAgBwAAAAAAIAcAAAAAADAHAAAAAAAAB+AAAAAAAAXQAAAAAAABEAAAAAAABdAAAAAAAAaAAAAAACAF0AAAAAAQBdAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAMAXQAAAAAAAA==
+          tiles: HwAAAAACAB8AAAAAAQAfAAAAAAAAHwAAAAABAH4AAAAAAAB5AAAAAAAAeQAAAAAAAH4AAAAAAABNAAAAAAMAXQAAAAADAF0AAAAAAwBdAAAAAAMAbAAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAB8AAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAEAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAAAAH4AAAAAAAAfAAAAAAMAHwAAAAACAB8AAAAAAAAfAAAAAAIAHwAAAAABAH4AAAAAAABdAAAAAAEAXQAAAAADAF0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABuAAAAAAAAHwAAAAABAB8AAAAAAgAfAAAAAAIAHwAAAAACAB8AAAAAAgAfAAAAAAAAHwAAAAACAB8AAAAAAQB+AAAAAAAAXQAAAAADAF0AAAAAAgBdAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbgAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAgAfAAAAAAAAHwAAAAACAB8AAAAAAAAfAAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAIAXQAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAAyAAAAAAMAMgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAADAB8AAAAAAwAfAAAAAAAAHwAAAAACAH4AAAAAAABdAAAAAAAAXQAAAAADAF0AAAAAAwBsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAwBdAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAAAAAAAAAAAfgAAAAAAAB8AAAAAAQB6AAAAAAMAegAAAAAAAH4AAAAAAAB6AAAAAAAAfgAAAAAAAF0AAAAAAQBdAAAAAAEAXQAAAAABAE0AAAAAAwBdAAAAAAEAXQAAAAADAF0AAAAAAAB9AAAAAAAAAAAAAAAAAH4AAAAAAAAfAAAAAAAAegAAAAAAAHoAAAAAAgAfAAAAAAAAegAAAAADAH4AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAgBNAAAAAAIAXQAAAAACAF0AAAAAAgBdAAAAAAMAfQAAAAAAAAAAAAAAAAB+AAAAAAAAHwAAAAADAHoAAAAAAwB6AAAAAAMAfgAAAAAAAHoAAAAAAgB+AAAAAAAAXQAAAAABAF0AAAAAAABdAAAAAAAATQAAAAADAF0AAAAAAwBdAAAAAAMAXQAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAFIAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAgAfAAAAAAAAHwAAAAADAB8AAAAAAwAfAAAAAAIAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAACAB8AAAAAAgBwAAAAAAMAcAAAAAACAHAAAAAAAwB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAEAKAAAAAAAAB8AAAAAAQAfAAAAAAMAHwAAAAABAH4AAAAAAAAfAAAAAAIAHwAAAAADAB8AAAAAAgAfAAAAAAAAcAAAAAABAHAAAAAAAgBwAAAAAAIAfgAAAAAAAF0AAAAAAgARAAAAAAAAXQAAAAACACgAAAAAAQAfAAAAAAAAHwAAAAACAB8AAAAAAgAfAAAAAAIAcAAAAAABAHAAAAAAAABwAAAAAAAAcAAAAAABAHAAAAAAAgBwAAAAAAMAcAAAAAABAB8AAAAAAQBdAAAAAAEAEQAAAAAAABEAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAMAfgAAAAAAAHAAAAAAAgBwAAAAAAIAcAAAAAADAHAAAAAAAgBwAAAAAAIAcAAAAAADAHAAAAAAAAB+AAAAAAAAXQAAAAAAABEAAAAAAABdAAAAAAAAaAAAAAACAF0AAAAAAQBdAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAMAXQAAAAAAAA==
           version: 7
         -3,-2:
           ind: -3,-2
-          tiles: ZAAAAAAAAH4AAAAAAABkAAAAAAAAZAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABkAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAZAAAAAAAAGQAAAAAAABkAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAIAXQAAAAACAF0AAAAAAABdAAAAAAEAXQAAAAAAAF0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAG0AAAAAAABdAAAAAAEAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAwBdAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAgBdAAAAAAEAXQAAAAADAF0AAAAAAgBdAAAAAAAAXQAAAAABAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAwAfAAAAAAIAHwAAAAADAB8AAAAAAgAfAAAAAAMAfgAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAACAB8AAAAAAgAfAAAAAAMAHwAAAAACAB8AAAAAAgAfAAAAAAEAHwAAAAAAAB8AAAAAAgBdAAAAAAEAXQAAAAADAF0AAAAAAAB+AAAAAAAAHwAAAAADAB8AAAAAAgAfAAAAAAAAfgAAAAAAAB8AAAAAAQAfAAAAAAIAHwAAAAAAAB8AAAAAAQAfAAAAAAIAHwAAAAABAB8AAAAAAAB+AAAAAAAAXQAAAAADAF0AAAAAAwBdAAAAAAEAHwAAAAAAAB8AAAAAAAAfAAAAAAIAHwAAAAADAH4AAAAAAAB6AAAAAAAAegAAAAACAHoAAAAAAAB6AAAAAAIAegAAAAABAHoAAAAAAgB6AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAMAXQAAAAABAH4AAAAAAAAfAAAAAAMAHwAAAAABAB8AAAAAAQB+AAAAAAAAegAAAAACAHoAAAAAAQB6AAAAAAAAegAAAAACAHoAAAAAAQB6AAAAAAIAegAAAAAAAH4AAAAAAABNAAAAAAIATQAAAAABAE0AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAgB+AAAAAAAAHwAAAAABAHoAAAAAAAB6AAAAAAMAegAAAAACAHoAAAAAAAB6AAAAAAEAegAAAAADAHoAAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAABdAAAAAAEAfgAAAAAAAF0AAAAAAwBdAAAAAAMAXQAAAAABAA==
+          tiles: ZAAAAAAAAH4AAAAAAABkAAAAAAAAZAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABkAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAZAAAAAAAAGQAAAAAAABkAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAIAXQAAAAACAF0AAAAAAABdAAAAAAEAXQAAAAAAAF0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAG0AAAAAAABdAAAAAAEAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAwBdAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAgBdAAAAAAEAXQAAAAADAF0AAAAAAgBdAAAAAAAAXQAAAAABAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAwAfAAAAAAIAHwAAAAADAB8AAAAAAgAfAAAAAAMAfgAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAACAB8AAAAAAgAfAAAAAAMAHwAAAAACAB8AAAAAAgAfAAAAAAEAHwAAAAAAAB8AAAAAAgBdAAAAAAEAXQAAAAADAF0AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAQAfAAAAAAIAHwAAAAAAAB8AAAAAAQAfAAAAAAIAHwAAAAABAB8AAAAAAAB+AAAAAAAAXQAAAAADAF0AAAAAAwBdAAAAAAEAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAACAHoAAAAAAAB6AAAAAAIAegAAAAABAHoAAAAAAgB6AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAMAXQAAAAABAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAegAAAAACAHoAAAAAAQB6AAAAAAAAegAAAAACAHoAAAAAAQB6AAAAAAIAegAAAAAAAH4AAAAAAABNAAAAAAIATQAAAAABAE0AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAAB+AAAAAAAAHwAAAAABAHoAAAAAAAB6AAAAAAMAegAAAAACAHoAAAAAAAB6AAAAAAEAegAAAAADAHoAAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAABdAAAAAAEAfgAAAAAAAEAAAAAAAABAAAAAAAAAfgAAAAAAAA==
           version: 7
         -3,-1:
           ind: -3,-1
-          tiles: fgAAAAAAAHwAAAAAAwB8AAAAAAMAegAAAAAAAHoAAAAAAwB6AAAAAAIAfAAAAAADAHwAAAAAAgB+AAAAAAAAXQAAAAADAF0AAAAAAwBdAAAAAAMAfgAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAACAH4AAAAAAABdAAAAAAIAXQAAAAAAAF0AAAAAAwB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAABdAAAAAAMAXQAAAAACAF0AAAAAAQB+AAAAAAAAHwAAAAABAB8AAAAAAwAfAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAXQAAAAAAAF0AAAAAAgBdAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAAAAH4AAAAAAAAfAAAAAAEAHwAAAAABAB8AAAAAAABsAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAF0AAAAAAwBdAAAAAAEAXQAAAAABAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAAHwAAAAABAB8AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAMAHwAAAAADAB8AAAAAAQBdAAAAAAAAXQAAAAADAF0AAAAAAwB+AAAAAAAAXQAAAAACAF0AAAAAAgBdAAAAAAEAfgAAAAAAAB8AAAAAAQAfAAAAAAEAXQAAAAADAB8AAAAAAAB+AAAAAAAAHwAAAAABAB8AAAAAAQAfAAAAAAEAHwAAAAACAB8AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAMAfgAAAAAAAB8AAAAAAgAfAAAAAAMAHwAAAAABAB8AAAAAAgAfAAAAAAMAfgAAAAAAAF0AAAAAAQBdAAAAAAMAXQAAAAABAF0AAAAAAwB+AAAAAAAAHwAAAAACAB8AAAAAAAAfAAAAAAIAHwAAAAABAH4AAAAAAAAfAAAAAAAAHwAAAAABAB8AAAAAAAAfAAAAAAIAHwAAAAACAH4AAAAAAABdAAAAAAEAXQAAAAABAF0AAAAAAgBdAAAAAAEAfgAAAAAAAB8AAAAAAQAfAAAAAAAAfgAAAAAAAB8AAAAAAgAfAAAAAAMAHwAAAAADAB8AAAAAAAAfAAAAAAEAHwAAAAAAAB8AAAAAAwB+AAAAAAAAXQAAAAACAF0AAAAAAABdAAAAAAIAXQAAAAAAAH4AAAAAAAAfAAAAAAEAHwAAAAADAF0AAAAAAQAfAAAAAAEAfgAAAAAAAB8AAAAAAQAfAAAAAAMAHwAAAAADAB8AAAAAAAAfAAAAAAAAHwAAAAACAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAH4AAAAAAAAfAAAAAAEAHwAAAAADAB8AAAAAAwAfAAAAAAEAHwAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAADAF0AAAAAAABdAAAAAAMAfgAAAAAAAEAAAAAAAABAAAAAAAAAHwAAAAAAAB8AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAAAXQAAAAADAH4AAAAAAABAAAAAAAAAQAAAAAAAAH4AAAAAAAAfAAAAAAMAHwAAAAADAB8AAAAAAAAfAAAAAAEAfgAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAE0AAAAAAABdAAAAAAIAXQAAAAADAF0AAAAAAQB+AAAAAAAAHwAAAAABAB8AAAAAAAAfAAAAAAEAHwAAAAACAB8AAAAAAgAfAAAAAAEAHwAAAAACAB8AAAAAAwAoAAAAAAIAKAAAAAABAB8AAAAAAwBNAAAAAAEAXQAAAAACAF0AAAAAAQBdAAAAAAAAfgAAAAAAAB8AAAAAAwAfAAAAAAMAHwAAAAABAA==
+          tiles: fgAAAAAAAHwAAAAAAwB8AAAAAAMAegAAAAAAAHoAAAAAAwB6AAAAAAIAfAAAAAADAHwAAAAAAgB+AAAAAAAAXQAAAAADAF0AAAAAAwBdAAAAAAMAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAACAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAABdAAAAAAMAXQAAAAACAF0AAAAAAQB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAXQAAAAAAAF0AAAAAAgBdAAAAAAMAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABsAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAF0AAAAAAwBdAAAAAAEAXQAAAAABAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAMAHwAAAAADAB8AAAAAAQBdAAAAAAAAXQAAAAADAF0AAAAAAwB+AAAAAAAAXQAAAAACAF0AAAAAAgBdAAAAAAEAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAB8AAAAAAAB+AAAAAAAAHwAAAAABAB8AAAAAAQAfAAAAAAEAHwAAAAACAB8AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAADAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAAfAAAAAAMAfgAAAAAAAB8AAAAAAgAfAAAAAAMAHwAAAAABAB8AAAAAAgAfAAAAAAMAfgAAAAAAAF0AAAAAAQBdAAAAAAMAXQAAAAABAF0AAAAAAwB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAHwAAAAABAH4AAAAAAAAfAAAAAAAAHwAAAAABAB8AAAAAAAAfAAAAAAIAHwAAAAACAH4AAAAAAABdAAAAAAEAXQAAAAABAF0AAAAAAgBdAAAAAAEAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAB8AAAAAAgAfAAAAAAMAHwAAAAADAB8AAAAAAAAfAAAAAAEAHwAAAAAAAB8AAAAAAwB+AAAAAAAAXQAAAAACAF0AAAAAAABdAAAAAAIAXQAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAAfAAAAAAEAfgAAAAAAAB8AAAAAAQAfAAAAAAMAHwAAAAADAB8AAAAAAAAfAAAAAAAAHwAAAAACAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAwB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAHwAAAAAAAH4AAAAAAAAfAAAAAAEAHwAAAAADAB8AAAAAAwAfAAAAAAEAHwAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAADAF0AAAAAAABdAAAAAAMAbAAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAB8AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAAAXQAAAAADAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAAfAAAAAAMAHwAAAAADAB8AAAAAAAAfAAAAAAEAfgAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAE0AAAAAAABdAAAAAAIAXQAAAAADAF0AAAAAAQBsAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAHwAAAAACAB8AAAAAAgAfAAAAAAEAHwAAAAACAB8AAAAAAwAoAAAAAAIAKAAAAAABAB8AAAAAAwBNAAAAAAEAXQAAAAACAF0AAAAAAQBdAAAAAAAAbAAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAA==
           version: 7
         2,-3:
           ind: 2,-3
@@ -552,10 +554,6 @@ entities:
             93: 15,-17
             94: 13,-17
             95: 17,-9
-            98: -37,0
-            100: -17,-1
-            101: -17,-2
-            102: -15,-12
             103: -1,-24
             104: 0,-28
             106: 19,-30
@@ -574,9 +572,7 @@ entities:
             137: -50,-30
             152: -38,-13
             153: -38,-14
-            154: -38,-18
             155: -39,-19
-            283: -23,-12
             359: 11,-21
             360: 12,-21
             374: 16,-9
@@ -623,19 +619,14 @@ entities:
             608: 36,5
             675: -22,25
             676: -17,18
-            677: -37,4
-            683: -16,-5
             691: -16,7
             693: -16,4
             694: -15,9
-            695: -16,0
             828: -9,-25
             829: -8,-25
             830: -8,-25
             835: -4,-24
             836: -1,-25
-            895: -6,-23
-            896: -25,-23
             898: -37,-24
             1068: -10,-55
             1069: -14,-56
@@ -676,11 +667,6 @@ entities:
             1630: -39,8
             1631: -39,7
             1632: -39,-1
-            1641: -8,-14
-            1642: -9,-13
-            1657: -9,-16
-            1658: -8,-16
-            1659: -8,-16
             1981: -39,-12
             1983: -40,-7
             1986: -39,-9
@@ -831,16 +817,6 @@ entities:
             4454: 48,24
             4455: 47,25
             4456: 46,25
-            4632: -28,-20
-            4634: -27,-20
-            4636: -30,-15
-            4637: -29,-16
-            4638: -24,-15
-            4639: -23,-8
-            4640: -23,-7
-            4641: -24,-5
-            4642: -31,-7
-            4643: -19,-20
             4660: 16,-15
             4661: 17,-14
             4662: 17,-13
@@ -899,10 +875,10 @@ entities:
           decals:
             722: -30,36
             1270: -56,1
-            1663: -9,-21
             4360: 48,20
             5424: -8,39
             5427: -7,39
+            6819: -18,-16
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -935,6 +911,13 @@ entities:
             3981: -55,14
             4479: 34,25
             4480: 54,25
+            6820: -20,-18
+        - node:
+            angle: 4.71238898038469 rad
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            6821: -21,-15
         - node:
             angle: -1.5707963267948966 rad
             color: '#00FFFFFF'
@@ -1021,6 +1004,13 @@ entities:
           decals:
             3292: -20,41
             3295: -13,39
+        - node:
+            angle: -6.283185307179586 rad
+            color: '#FFFFFFFF'
+            id: Bot
+          decals:
+            5802: -16,-2
+            5803: -16,-3
         - node:
             color: '#FFFFFFFF'
             id: Bot
@@ -1126,15 +1116,7 @@ entities:
             4870: -31,20
             4871: -31,21
             5045: -40,-8
-            5065: -14,-2
-            5094: -19,5
-            5095: -20,5
-            5096: -25,5
-            5227: -25,-12
             5352: -14,11
-            5388: -25,-13
-            5389: -29,-12
-            5390: -29,-13
             5393: 2,29
             5394: 2,28
             5428: -8,38
@@ -1162,6 +1144,17 @@ entities:
             5687: 9,34
             5688: 9,35
             5711: -73,17
+            6265: -14,-21
+            6266: -13,-21
+            6473: -15,5
+            6484: -16,2
+            6485: -16,1
+            6489: -28,4
+            6490: -29,4
+            6610: -18,-17
+            6611: -20,-17
+            6612: -22,-15
+            6786: -27,-9
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -1199,6 +1192,11 @@ entities:
             id: BotGreyscale
           decals:
             5645: 7,35
+        - node:
+            color: '#8BC9DAFF'
+            id: BotGreyscale
+          decals:
+            7199: -30,-10
         - node:
             color: '#FFFFFFFF'
             id: BotGreyscale
@@ -1225,10 +1223,13 @@ entities:
             3673: 50,-11
             3841: 4,-47
             3897: 5,-47
-            5047: -30,-21
-            5077: -25,-2
-            5384: -25,-1
-            5385: -25,0
+            6779: -30,-7
+            6780: -29,-7
+            6781: -28,-7
+            6815: -20,1
+            6816: -19,1
+            7206: -31,-10
+            7208: -31,-7
         - node:
             angle: 1.5707963267948966 rad
             color: '#00FFFFFF'
@@ -1302,19 +1303,11 @@ entities:
             2748: 4,-36
             3205: 6,-37
             3300: -15,46
-            5048: -24,-21
         - node:
             color: '#FF8FC9FF'
             id: BotRightGreyscale
           decals:
             2052: -45,7
-        - node:
-            color: '#FFFFFFFF'
-            id: BotRightGreyscale
-          decals:
-            5068: -29,0
-            5379: -29,-1
-            5382: -29,-2
         - node:
             color: '#FFFFFFFF'
             id: Box
@@ -1329,10 +1322,6 @@ entities:
             4877: 1,23
             4879: -1,23
             4880: 0,23
-            5079: -28,-1
-            5383: -26,-1
-            5391: -24,-7
-            5392: -30,-7
         - node:
             angle: 1.5707963267948966 rad
             color: '#00FFFFFF'
@@ -1358,11 +1347,6 @@ entities:
             5633: 4,46
             5634: -4,46
             5635: -7,49
-        - node:
-            color: '#DE3A3A96'
-            id: BoxGreyscale
-          decals:
-            1661: -9,-21
         - node:
             color: '#FFFFFFFF'
             id: BoxGreyscale
@@ -1373,16 +1357,6 @@ entities:
             5589: 4,35
             5590: 4,34
             5591: 4,33
-        - node:
-            color: '#DE3A3A96'
-            id: BrickCornerOverlaySW
-          decals:
-            5386: -29,-13
-        - node:
-            color: '#DE3A3A96'
-            id: BrickLineOverlayW
-          decals:
-            5387: -29,-12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkBox
@@ -1715,13 +1689,6 @@ entities:
             3969: -56,14
             3970: -54,14
             3971: -53,14
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineN
-          decals:
-            1643: -8,-18
-            1644: -9,-18
-            1650: -6,-18
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineN
@@ -1761,13 +1728,6 @@ entities:
             2010: -45,-11
             3964: -53,11
             3965: -54,11
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineS
-          decals:
-            1645: -6,-19
-            1646: -7,-19
-            1647: -8,-19
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineS
@@ -1873,15 +1833,9 @@ entities:
           decals:
             2719: 8,-28
             2740: 5,-39
-            5005: -34,-10
             5700: -71,18
             5720: -95,18
             5732: -76,18
-        - node:
-            color: '#43990996'
-            id: BrickTileWhiteCornerNe
-          decals:
-            5000: -34,-6
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteCornerNe
@@ -1895,18 +1849,6 @@ entities:
             id: BrickTileWhiteCornerNe
           decals:
             2042: -41,-20
-        - node:
-            color: '#8C347F96'
-            id: BrickTileWhiteCornerNe
-          decals:
-            5017: -19,-10
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteCornerNe
-          decals:
-            5211: -26,-9
-            5217: -25,-11
-            5244: -22,-4
         - node:
             color: '#EFD54193'
             id: BrickTileWhiteCornerNe
@@ -1923,26 +1865,15 @@ entities:
             id: BrickTileWhiteCornerNe
           decals:
             1827: -15,29
-        - node:
-            color: '#EFE54193'
-            id: BrickTileWhiteCornerNe
-          decals:
-            5010: -19,-6
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteCornerNw
           decals:
             2720: 3,-28
             2739: 3,-39
-            5006: -35,-10
             5697: -75,18
             5723: -101,18
             5730: -94,18
-        - node:
-            color: '#43990996'
-            id: BrickTileWhiteCornerNw
-          decals:
-            4999: -35,-6
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteCornerNw
@@ -1956,23 +1887,11 @@ entities:
             id: BrickTileWhiteCornerNw
           decals:
             2043: -47,-20
-        - node:
-            color: '#8C347F96'
-            id: BrickTileWhiteCornerNw
-          decals:
-            5018: -20,-10
         - node:
             color: '#D381C996'
             id: BrickTileWhiteCornerNw
           decals:
             1229: -47,16
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteCornerNw
-          decals:
-            5210: -28,-9
-            5218: -29,-11
-            5253: -32,-4
         - node:
             color: '#EFCC4196'
             id: BrickTileWhiteCornerNw
@@ -1989,11 +1908,6 @@ entities:
           decals:
             1791: -23,32
             1811: -31,32
-        - node:
-            color: '#EFE54193'
-            id: BrickTileWhiteCornerNw
-          decals:
-            5009: -20,-6
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerNw
@@ -2007,15 +1921,9 @@ entities:
             2726: 5,-33
             2732: 8,-30
             2736: 5,-40
-            5008: -34,-12
             5699: -71,16
             5721: -95,16
             5733: -76,16
-        - node:
-            color: '#43990996'
-            id: BrickTileWhiteCornerSe
-          decals:
-            4998: -34,-8
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteCornerSe
@@ -2028,17 +1936,6 @@ entities:
             id: BrickTileWhiteCornerSe
           decals:
             2044: -41,-22
-        - node:
-            color: '#8C347F96'
-            id: BrickTileWhiteCornerSe
-          decals:
-            5020: -19,-12
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteCornerSe
-          decals:
-            5282: -31,-17
-            5381: -25,-13
         - node:
             color: '#EFD54193'
             id: BrickTileWhiteCornerSe
@@ -2049,11 +1946,6 @@ entities:
             id: BrickTileWhiteCornerSe
           decals:
             1788: -15,27
-        - node:
-            color: '#EFE54193'
-            id: BrickTileWhiteCornerSe
-          decals:
-            5012: -19,-8
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerSe
@@ -2065,15 +1957,9 @@ entities:
           decals:
             2724: 3,-33
             2738: 3,-40
-            5007: -35,-12
             5698: -75,16
             5722: -101,16
             5731: -94,16
-        - node:
-            color: '#43990996'
-            id: BrickTileWhiteCornerSw
-          decals:
-            4997: -35,-8
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteCornerSw
@@ -2087,16 +1973,6 @@ entities:
             id: BrickTileWhiteCornerSw
           decals:
             2045: -47,-22
-        - node:
-            color: '#8C347F96'
-            id: BrickTileWhiteCornerSw
-          decals:
-            5019: -20,-12
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteCornerSw
-          decals:
-            5275: -23,-17
         - node:
             color: '#EFCC4196'
             id: BrickTileWhiteCornerSw
@@ -2114,22 +1990,12 @@ entities:
           decals:
             1793: -23,28
             1797: -19,27
-        - node:
-            color: '#EFE54193'
-            id: BrickTileWhiteCornerSw
-          decals:
-            5011: -20,-8
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerSw
           decals:
             816: 19,11
             3365: -4,-11
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteInnerNe
-          decals:
-            5216: -26,-11
         - node:
             zIndex: 5
             color: '#EFCC4193'
@@ -2146,11 +2012,6 @@ entities:
             id: BrickTileWhiteInnerNe
           decals:
             1833: -21,29
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteInnerNw
-          decals:
-            5215: -28,-11
         - node:
             color: '#EFCC4196'
             id: BrickTileWhiteInnerNw
@@ -2199,12 +2060,6 @@ entities:
             2727: 5,-32
             2728: 5,-31
             2733: 8,-29
-            5004: -34,-11
-        - node:
-            color: '#43990996'
-            id: BrickTileWhiteLineE
-          decals:
-            5001: -34,-7
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineE
@@ -2226,27 +2081,6 @@ entities:
             3663: 49,-13
             3664: 49,-12
             3665: 49,-11
-        - node:
-            color: '#8C347F96'
-            id: BrickTileWhiteLineE
-          decals:
-            5015: -19,-11
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteLineE
-          decals:
-            5214: -26,-10
-            5223: -25,-12
-            5236: -22,-12
-            5237: -22,-11
-            5238: -22,-10
-            5239: -22,-9
-            5240: -22,-8
-            5241: -22,-7
-            5242: -22,-6
-            5243: -22,-5
-            5280: -31,-14
-            5281: -31,-15
         - node:
             color: '#EFCC4193'
             id: BrickTileWhiteLineE
@@ -2275,11 +2109,6 @@ entities:
             id: BrickTileWhiteLineE
           decals:
             1834: -21,30
-        - node:
-            color: '#EFE54193'
-            id: BrickTileWhiteLineE
-          decals:
-            5014: -19,-7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineE
@@ -2325,9 +2154,6 @@ entities:
             id: BrickTileWhiteLineN
           decals:
             3666: 48,-10
-            5305: -21,-15
-            5306: -20,-15
-            5307: -19,-15
         - node:
             color: '#79150096'
             id: BrickTileWhiteLineN
@@ -2341,19 +2167,6 @@ entities:
             id: BrickTileWhiteLineN
           decals:
             1230: -46,16
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteLineN
-          decals:
-            5212: -27,-9
-            5245: -23,-4
-            5246: -24,-4
-            5247: -25,-4
-            5248: -26,-4
-            5249: -28,-4
-            5250: -29,-4
-            5251: -30,-4
-            5252: -31,-4
         - node:
             color: '#EFB3414A'
             id: BrickTileWhiteLineN
@@ -2459,17 +2272,6 @@ entities:
             id: BrickTileWhiteLineS
           decals:
             808: -44,6
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteLineS
-          decals:
-            5221: -28,-13
-            5222: -26,-13
-            5273: -20,-17
-            5274: -22,-17
-            5283: -32,-17
-            5284: -33,-17
-            5285: -35,-17
         - node:
             zIndex: 5
             color: '#EFCC4193'
@@ -2524,12 +2326,6 @@ entities:
             2721: 3,-29
             2722: 3,-31
             2723: 3,-32
-            5003: -35,-11
-        - node:
-            color: '#43990996'
-            id: BrickTileWhiteLineW
-          decals:
-            5002: -35,-7
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineW
@@ -2548,31 +2344,11 @@ entities:
             3667: 48,-12
             3668: 48,-13
             3669: 48,-14
-        - node:
-            color: '#8C347F96'
-            id: BrickTileWhiteLineW
-          decals:
-            5016: -20,-11
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineW
           decals:
             1228: -47,15
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileWhiteLineW
-          decals:
-            5213: -28,-10
-            5254: -32,-5
-            5255: -32,-6
-            5256: -32,-7
-            5257: -32,-8
-            5258: -32,-9
-            5259: -32,-10
-            5260: -32,-11
-            5261: -32,-12
-            5276: -23,-15
-            5277: -23,-14
         - node:
             color: '#EFCC4196'
             id: BrickTileWhiteLineW
@@ -2595,16 +2371,22 @@ entities:
             id: BrickTileWhiteLineW
           decals:
             1792: -23,29
-        - node:
-            color: '#EFE54193'
-            id: BrickTileWhiteLineW
-          decals:
-            5013: -20,-7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineW
           decals:
             813: 19,13
+        - node:
+            color: '#FFFFFFFF'
+            id: BushDThree
+          decals:
+            6896: -20.994438,-18.880762
+        - node:
+            color: '#FFFFFFFF'
+            id: BushDTwo
+          decals:
+            6895: -21.231285,-21.141333
+            7145: -20.878605,-18.560427
         - node:
             color: '#FFFFFFFF'
             id: Bushb1
@@ -2625,12 +2407,19 @@ entities:
             id: Bushe1
           decals:
             4572: 44.001743,21.990236
+            6892: -20.876942,-20.984974
         - node:
             color: '#FFFFFFFF'
             id: Bushe2
           decals:
             958: -4.964998,-66.74588
             1546: -48.067986,5.0444627
+            6891: -21.241707,-20.818192
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushe3
+          decals:
+            6890: -20.876942,-19.431812
         - node:
             color: '#FFFFFFFF'
             id: Bushe4
@@ -2639,6 +2428,7 @@ entities:
             959: 5.097502,-68.605255
             1547: -46.83361,5.0444627
             4571: 49.970493,21.974611
+            6889: -21.20002,-19.108671
         - node:
             color: '#FFFFFFFF'
             id: Bushf1
@@ -2654,6 +2444,17 @@ entities:
             id: Bushg1
           decals:
             4574: 45.04862,21.958986
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushg2
+          decals:
+            6894: -20.929052,-20.328268
+            7143: -21.13915,-18.518732
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushh3
+          decals:
+            6893: -21.13749,-19.890465
         - node:
             color: '#FFFFFFFF'
             id: Bushi1
@@ -2699,18 +2500,12 @@ entities:
           decals:
             485: -6.033051,-6.444069
             4573: 50.01737,22.037111
+            7144: -21.034933,-17.90372
         - node:
             color: '#FFFFFFFF'
             id: Caution
           decals:
-            1662: -9,-21
             3839: -26,32
-            5081: -27,-2
-        - node:
-            color: '#DE3A3A96'
-            id: CautionGreyscale
-          decals:
-            1664: -7,-18
         - node:
             color: '#D4D4D428'
             id: CheckerNESW
@@ -2842,10 +2637,6 @@ entities:
             color: '#79150096'
             id: CheckerNWSE
           decals:
-            1651: -9,-16
-            1652: -8,-16
-            1653: -7,-16
-            1654: -6,-16
             4837: 32,29
             4838: 32,30
             4839: 32,31
@@ -2944,14 +2735,21 @@ entities:
           decals:
             1824: -16,30
             1825: -17,30
-            5097: -23,-20
-            5098: -24,-20
-            5099: -24,-19
-            5100: -23,-19
-            5101: -31,-20
-            5102: -30,-20
-            5103: -30,-19
-            5104: -31,-19
+            6975: -35,0
+            6976: -35,-1
+            6977: -35,-2
+            6978: -34,-2
+            6979: -34,-1
+            6980: -34,0
+            6981: -33,0
+            6982: -33,-1
+            6983: -33,-2
+            6984: -27,-19
+            6985: -27,-18
+            6986: -27,-17
+            6987: -29,-16
+            6988: -28,-16
+            6989: -27,-16
         - node:
             color: '#EFB34196'
             id: CheckerNWSE
@@ -2990,22 +2788,11 @@ entities:
             2761: -58,26
             2762: -59,26
             2763: -60,27
-        - node:
-            color: '#9FED5896'
-            id: Delivery
-          decals:
-            5038: -30,-8
         - node:
             color: '#DE3A3A96'
             id: Delivery
           decals:
             3674: 51,-21
-            5027: -29,-19
-            5028: -29,-18
-            5029: -29,-17
-            5030: -25,-19
-            5031: -25,-18
-            5032: -25,-17
         - node:
             color: '#FFFFFFFF'
             id: Delivery
@@ -3083,25 +2870,6 @@ entities:
             4575: 46,0
             4576: 46,1
             4873: -31,18
-            4984: -17,6
-            4985: -16,6
-            4986: -15,6
-            4991: -17,-22
-            4992: -16,-22
-            4993: -15,-22
-            5040: -24,-8
-            5107: -20,-21
-            5108: -20,-20
-            5109: -20,-19
-            5110: -35,-20
-            5111: -34,-20
-            5112: -34,-19
-            5125: -36,-20
-            5126: -34,-18
-            5127: -21,-18
-            5128: -19,-18
-            5129: -19,-22
-            5130: -21,-22
             5675: -4,31
             5676: -9,31
             5677: -6,33
@@ -3129,12 +2897,6 @@ entities:
           decals:
             3460: 31,-20
             3461: 31,-18
-            5039: -30,-9
-        - node:
-            color: '#C74EBDD6'
-            id: DeliveryGreyscale
-          decals:
-            5042: -24,-9
         - node:
             color: '#D381C941'
             id: DeliveryGreyscale
@@ -3146,6 +2908,16 @@ entities:
             id: DeliveryGreyscale
           decals:
             1237: -56,1
+        - node:
+            color: '#DE3A3A96'
+            id: DeliveryGreyscale
+          decals:
+            6762: -22,-2
+            6763: -22,-1
+            6764: -22,0
+            6765: -22,1
+            6817: -19,-1
+            6818: -19,-2
         - node:
             color: '#FFFFFFFF'
             id: DeliveryGreyscale
@@ -3163,6 +2935,31 @@ entities:
           decals:
             3188: -61,17
             3189: -70,17
+        - node:
+            cleanable: True
+            color: '#DE3A3A96'
+            id: Dirt
+          decals:
+            5831: -21,3
+            5833: -20,5
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: Dirt
+          decals:
+            5810: -19,5
+            5812: -20,3
+            5815: -20,4
+            5825: -21,5
+            5829: -22,3
+            5834: -16,5
+            5835: -15,2
+            5836: -18,-6
+            5837: -20,-7
+            5838: -17,-4
+            5839: -17,-1
+            7073: -21,4
+            7110: -22,4
         - node:
             cleanable: True
             zIndex: 1
@@ -3337,32 +3134,45 @@ entities:
             3496: 22,-41
             3497: 28,-42
             3498: 28,-41
-            3815: -12,-17
-            3816: -11,-16
-            3817: -11,-13
-            3818: -10,-15
-            3819: -11,-15
-            3820: -10,-16
-            3821: -10,-15
-            3822: -9,-15
-            3823: -10,-13
-            3824: -11,-18
-            3825: -11,-19
-            3826: -11,-20
-            3827: -11,-20
-            3828: -11,-21
-            3829: -13,-19
-            3830: -13,-20
-            3831: -12,-14
-            3853: -13,-17
-            3857: -12,-15
-            3858: -13,-16
-            3859: -11,-14
-            3860: -13,-14
-            3861: -13,-15
-            3862: -9,-12
-            3863: -11,-12
-            3864: -10,-12
+        - node:
+            color: '#FFFFFFFF'
+            id: DirtHeavy
+          decals:
+            6330: -14,-10
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavy
+          decals:
+            5824: -21,5
+            5826: -20,5
+            5899: -16,2
+            5900: -17,2
+            5901: -17,-1
+            5902: -17,-4
+            5903: -17,-6
+            5904: -18,-7
+            5905: -21,-7
+            5909: -24,-11
+            5912: -25,-17
+            6991: -35,-10
+            6995: -34,0
+            6996: -25,1
+            7077: -21,4
+            7078: -20,4
+            7079: -20,3
+            7080: -21,3
+            7081: -22,3
+            7090: -22,3
+            7091: -21,3
+            7092: -19,5
+            7093: -20,5
+            7094: -21,5
+            7095: -20,3
+            7097: -22,4
+            7113: -19,3
+            7114: -22,5
+            7118: -19,4
         - node:
             cleanable: True
             zIndex: 1
@@ -3379,7 +3189,6 @@ entities:
             115: -16,-42
             116: -16,-40
             133: -51,-30
-            149: -39,-14
             455: -59,19
             456: -60,22
             457: -60,23
@@ -3389,7 +3198,6 @@ entities:
             831: -5,-25
             832: -4,-25
             1628: -39,9
-            1660: -7,-16
             2214: -1,13
             2290: 52,-38
             2291: 52,-38
@@ -3415,9 +3223,12 @@ entities:
             3279: -59,20
             3280: -59,22
             3281: -59,22
-            3811: -12,-16
-            3813: -12,-15
-            3854: -13,-16
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavyMonotile
+          decals:
+            7089: -22,3
         - node:
             cleanable: True
             zIndex: 1
@@ -3429,8 +3240,93 @@ entities:
             3492: -2,14
             3493: 2,14
             3494: 8,14
-            3855: -11,-17
-            3856: -11,-14
+        - node:
+            color: '#FFFFFFFF'
+            id: DirtLight
+          decals:
+            6331: -14,-11
+            6332: -14,-12
+            6333: -14,-17
+            6334: -12,-20
+            6335: -12,-17
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtLight
+          decals:
+            5847: -18,-17
+            5848: -18,-19
+            5849: -16,-20
+            5850: -16,-17
+            5851: -15,-15
+            5852: -15,-18
+            5853: -13,-20
+            5854: -12,-19
+            5855: -11,-17
+            5856: -14,-15
+            5857: -13,-14
+            5858: -14,-13
+            5859: -13,-11
+            5860: -15,-14
+            5861: -11,-15
+            5863: -9,-21
+            5864: -9,-17
+            5865: -25,-20
+            5879: -28,-8
+            5898: -34,-9
+            5913: -25,-21
+            5919: -39,-23
+            5920: -31,-25
+            5922: -26,-25
+            5924: -22,-25
+            5925: -16,-24
+            5926: -13,-25
+            5965: -18,-11
+            7004: -34,-15
+            7005: -35,-14
+            7007: -28,-12
+            7011: -25,-12
+            7012: -23,-18
+            7013: -23,-19
+            7014: -24,-23
+            7015: -29,-23
+            7016: -37,-19
+            7018: -39,-15
+            7019: -37,-11
+            7020: -39,-9
+            7021: -37,-3
+            7022: -39,1
+            7023: -38,-1
+            7025: -34,-3
+            7027: -30,-5
+            7028: -35,-7
+            7029: -35,-9
+            7030: -35,-13
+            7032: -32,-16
+            7034: -25,-14
+            7083: -20,4
+            7084: -21,4
+            7087: -21,3
+            7088: -22,3
+            7102: -22,4
+            7115: -22,5
+            7116: -19,3
+            7117: -19,4
+            7119: -13,2
+            7120: -15,4
+            7121: -19,0
+            7122: -25,2
+            7123: -35,-1
+            7124: -33,-1
+            7125: -37,-4
+            7126: -35,-4
+            7127: -29,-5
+            7135: -24,-5
+            7141: -25,-16
+            7172: -32,-12
+            7173: -27,-14
+            7174: -31,-14
+            7230: -21,-4
         - node:
             cleanable: True
             zIndex: 1
@@ -3440,6 +3336,22 @@ entities:
             31: 50,-33
             38: 3,-2
             41: 11,-4
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtMedium
+          decals:
+            5927: -19,-24
+            5938: -25,-9
+            5939: -17,-10
+            5940: -17,-11
+            5942: -18,-21
+            5943: -22,-20
+            5944: -19,-21
+            7024: -37,2
+            7033: -33,-15
+            7136: -27,-5
+            7137: -28,-5
         - node:
             cleanable: True
             zIndex: 1
@@ -3462,7 +3374,6 @@ entities:
             117: -16,-42
             118: -12,-43
             134: -50,-33
-            150: -39,-15
             151: -39,-16
             406: -23,30
             407: -22,29
@@ -3474,7 +3385,6 @@ entities:
             510: -39,11
             582: 50,2
             584: 49,0
-            690: -16,6
             833: -3,-25
             834: -6,-25
             1985: -40,-8
@@ -3672,14 +3582,6 @@ entities:
             2382: 40,-8
             2383: 40,-7
             2384: 40,-6
-        - node:
-            color: '#DE3A3A96'
-            id: FullTileOverlayGreyscale
-          decals:
-            5232: -33,-10
-            5233: -33,-6
-            5234: -21,-6
-            5235: -21,-10
         - node:
             color: '#EFCC4196'
             id: FullTileOverlayGreyscale
@@ -3803,6 +3705,7 @@ entities:
             4561: 43,22
             4562: 44,22
             4563: 50,22
+            7142: -21.097464,-18.028807
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale
@@ -3856,6 +3759,23 @@ entities:
             1633: -43,0
             1634: -42,0
             3728: -34,9
+        - node:
+            color: '#DE3A3A96'
+            id: HalfTileOverlayGreyscale
+          decals:
+            6673: -29,-12
+            6674: -28,-12
+            6675: -27,-12
+            7150: -31,-3
+            7151: -30,-3
+            7152: -29,-3
+            7153: -28,-3
+            7154: -27,-3
+            7155: -26,-3
+            7156: -25,-3
+            7157: -24,-3
+            7163: -31,-12
+            7164: -32,-12
         - node:
             color: '#EFCC4196'
             id: HalfTileOverlayGreyscale
@@ -3921,7 +3841,9 @@ entities:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale180
           decals:
-            5123: -34,-21
+            6672: -27,-14
+            7146: -28,-14
+            7147: -29,-14
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale180
@@ -4011,7 +3933,9 @@ entities:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale270
           decals:
-            5117: -21,-20
+            6944: -25,-14
+            6945: -25,-13
+            6946: -25,-12
         - node:
             color: '#EFCC4196'
             id: HalfTileOverlayGreyscale270
@@ -4092,8 +4016,18 @@ entities:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale90
           decals:
-            5118: -19,-20
-            5124: -33,-20
+            6930: -37,-4
+            6943: -23,-13
+            7159: -33,-11
+            7209: -33,-10
+            7210: -33,-9
+            7211: -33,-8
+            7212: -33,-7
+        - node:
+            color: '#EFB34196'
+            id: HalfTileOverlayGreyscale90
+          decals:
+            5792: -15,3
         - node:
             color: '#EFCC4196'
             id: HalfTileOverlayGreyscale90
@@ -4102,11 +4036,6 @@ entities:
             2178: 6,20
             2187: 7,13
             2188: 7,14
-        - node:
-            color: '#EFCF4193'
-            id: HalfTileOverlayGreyscale90
-          decals:
-            3890: -15,3
         - node:
             color: '#EFDF412E'
             id: HalfTileOverlayGreyscale90
@@ -4147,6 +4076,18 @@ entities:
             id: LoadingAreaGreyscale
           decals:
             1950: -42,-5
+        - node:
+            angle: 7.853981633974483 rad
+            color: '#EFB34196'
+            id: MarkupSquareQuater
+          decals:
+            5789: -15,2
+        - node:
+            angle: 12.566370614359172 rad
+            color: '#EFB34196'
+            id: MarkupSquareQuater
+          decals:
+            5788: -15,4
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkCornerNe
@@ -4396,10 +4337,6 @@ entities:
             1434: -26,25
             1435: -25,25
             1436: -24,25
-            1461: -23,-23
-            1462: -24,-23
-            1463: -25,-23
-            1464: -26,-23
             1487: 36,10
             1488: 36,11
             1489: 37,11
@@ -4413,14 +4350,10 @@ entities:
             2308: -28,9
             2309: -29,9
             2310: -30,9
-            2311: -17,5
-            2312: -17,4
-            2313: -17,3
             2317: -17,9
             2567: 15,12
             2568: 15,11
             2569: 15,9
-            2575: -17,-23
             2600: 15,23
             2601: 15,24
             2602: 15,25
@@ -4538,19 +4471,34 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale
           decals:
-            5056: -18,-2
-            5057: -18,-1
-            5058: -18,0
-            5131: -26,-23
-            5132: -25,-23
-            5133: -24,-23
-            5134: -23,-23
-            5135: -22,-23
-            5152: -21,-23
-            5153: -20,-23
-            5154: -19,-23
-            5155: -18,-23
-            5156: -17,-23
+            6424: -33,-22
+            6425: -34,-22
+            6426: -35,-22
+            6427: -36,-22
+            6554: -25,-22
+            6555: -25,-21
+            6556: -25,-20
+            6557: -25,-19
+            6558: -25,-18
+            6559: -25,-17
+            6561: -25,-15
+            6576: -22,-23
+            6577: -21,-23
+            6578: -20,-23
+            6581: -17,-23
+            6582: -19,-23
+            6583: -18,-23
+            6584: -16,-23
+            6585: -15,-23
+            6586: -14,-23
+            6587: -13,-23
+            6588: -12,-23
+            6589: -11,-23
+            6590: -10,-23
+            6593: -8,-23
+            6594: -9,-23
+            6881: -30,-16
+            7140: -25,-16
         - node:
             color: '#EFCC4196'
             id: QuarterTileOverlayGreyscale
@@ -4560,14 +4508,6 @@ entities:
             2207: -2,11
             2208: -3,11
             2209: -4,11
-        - node:
-            color: '#FA750096'
-            id: QuarterTileOverlayGreyscale
-          decals:
-            3845: -13,-17
-            3846: -13,-16
-            3847: -13,-15
-            3848: -13,-14
         - node:
             color: '#FF994193'
             id: QuarterTileOverlayGreyscale
@@ -4685,14 +4625,6 @@ entities:
             1448: -32,7
             1449: -33,7
             1450: -34,7
-            1495: -15,-2
-            1497: -15,-4
-            1498: -15,-5
-            1499: -15,-6
-            1500: -15,-7
-            1501: -15,-8
-            1502: -15,-9
-            1503: -15,5
             1505: -15,7
             1507: 10,7
             1508: 9,7
@@ -4710,7 +4642,6 @@ entities:
             1614: -3,9
             1615: -2,9
             1616: -1,9
-            2082: -28,-25
             2083: -29,-25
             2596: -28,23
             2597: -29,23
@@ -4797,19 +4728,18 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale180
           decals:
-            5173: -37,-17
-            5174: -37,-16
-            5175: -37,-15
-            5176: -37,-14
-            5177: -37,-13
-            5178: -37,-12
-            5179: -37,-11
-            5180: -37,-10
-            5181: -37,-9
-            5182: -37,-8
-            5183: -37,-7
-            5184: -37,-6
-            5185: -37,-5
+            6520: -37,2
+            6522: -37,1
+            6523: -37,3
+            6524: -37,4
+            6887: -29,-21
+            6888: -28,-21
+            6947: -23,-12
+            6948: -37,0
+            6949: -37,-1
+            6950: -37,-2
+            6951: -37,-3
+            7170: -33,-6
         - node:
             color: '#EFB3414A'
             id: QuarterTileOverlayGreyscale180
@@ -4826,11 +4756,6 @@ entities:
             2549: 17,19
             2550: 17,20
             2551: 17,21
-        - node:
-            color: '#EFCF4193'
-            id: QuarterTileOverlayGreyscale180
-          decals:
-            3891: -15,4
         - node:
             color: '#FFEF9292'
             id: QuarterTileOverlayGreyscale180
@@ -4973,10 +4898,6 @@ entities:
             1626: 8,7
             2078: -39,-17
             2079: -39,-16
-            2080: -39,-15
-            2081: -39,-14
-            2084: -26,-25
-            2085: -25,-25
             2086: -24,-25
             2087: -23,-25
             2088: -22,-25
@@ -4987,7 +4908,6 @@ entities:
             2093: -17,-25
             2094: -16,-25
             2095: -15,-25
-            2318: -17,7
             2559: 15,14
             2560: 15,15
             2561: 15,16
@@ -5064,23 +4984,11 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale270
           decals:
-            5190: -17,-21
-            5191: -17,-20
-            5192: -17,-19
-            5193: -17,-18
-            5194: -17,-17
-            5195: -17,-16
-            5196: -17,-15
-            5199: -17,-14
-            5200: -17,-13
-            5201: -17,-12
-            5202: -17,-11
-            5203: -17,-10
-            5204: -17,-9
-            5205: -17,-8
-            5206: -17,-7
-            5207: -17,-6
-            5208: -17,-5
+            6882: -30,-17
+            6883: -30,-18
+            6884: -30,-19
+            6885: -30,-20
+            6886: -30,-21
         - node:
             color: '#EFB3414A'
             id: QuarterTileOverlayGreyscale270
@@ -5232,7 +5140,6 @@ entities:
             1375: -3,-23
             1376: -4,-23
             1377: -5,-23
-            1378: -6,-23
             1383: 5,10
             1384: 6,10
             1385: 7,10
@@ -5256,8 +5163,6 @@ entities:
             1427: -34,25
             1428: -33,25
             1473: 30,-23
-            1491: -15,1
-            1492: -15,0
             1838: -15,21
             1839: -15,20
             1840: -15,19
@@ -5269,14 +5174,6 @@ entities:
             1846: -15,13
             1847: -15,12
             1848: -15,11
-            2064: -28,-23
-            2065: -29,-23
-            2066: -30,-23
-            2067: -31,-23
-            2068: -32,-23
-            2072: -36,-23
-            2073: -37,-23
-            2074: -37,-22
             2304: -21,9
             2305: -22,9
             2306: -23,9
@@ -5287,14 +5184,6 @@ entities:
             2557: 17,12
             2558: 17,11
             2570: 17,9
-            2578: -15,-23
-            2583: -15,-17
-            2584: -15,-16
-            2585: -15,-15
-            2586: -15,-14
-            2587: -15,-13
-            2588: -15,-12
-            2589: -15,-11
             2632: 1,-28
             2633: 1,-29
             2634: 1,-30
@@ -5349,9 +5238,6 @@ entities:
             4979: 20,-23
             4980: 19,-23
             4981: 18,-23
-            5062: -14,-2
-            5063: -14,-1
-            5064: -14,0
         - node:
             color: '#D4D4D437'
             id: QuarterTileOverlayGreyscale90
@@ -5396,23 +5282,38 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1635: -8,-15
-            1636: -8,-14
-            1637: -8,-13
-            5136: -28,-23
-            5137: -29,-23
-            5138: -30,-23
-            5139: -31,-23
-            5140: -32,-23
-            5141: -33,-23
-            5142: -34,-23
-            5143: -36,-23
-            5144: -35,-23
-            5145: -37,-23
-            5146: -37,-22
-            5149: -37,-19
-            5150: -37,-20
-            5151: -37,-21
+            6530: -37,-6
+            6531: -37,-7
+            6532: -37,-8
+            6538: -37,-9
+            6539: -37,-10
+            6540: -37,-11
+            6541: -37,-12
+            6545: -34,-23
+            6546: -33,-23
+            6547: -32,-23
+            6548: -30,-23
+            6549: -31,-23
+            6550: -29,-23
+            6551: -28,-23
+            6552: -27,-23
+            6553: -26,-23
+            6569: -23,-16
+            6570: -23,-17
+            6571: -23,-18
+            6572: -23,-19
+            6573: -23,-20
+            6574: -23,-21
+            6575: -23,-22
+            6596: -35,-23
+            6597: -36,-23
+            6873: -27,-21
+            6874: -27,-20
+            6924: -23,-14
+            6925: -23,-15
+            6932: -37,-5
+            7158: -32,-3
+            7165: -33,-12
         - node:
             color: '#EFB34160'
             id: QuarterTileOverlayGreyscale90
@@ -5435,24 +5336,11 @@ entities:
             2260: -18,25
             2261: -19,25
             2262: -20,25
-        - node:
-            color: '#EFCF4193'
-            id: QuarterTileOverlayGreyscale90
-          decals:
-            3892: -15,2
         - node:
             color: '#EFD24193'
             id: QuarterTileOverlayGreyscale90
           decals:
             3840: 3,11
-        - node:
-            color: '#FA750096'
-            id: QuarterTileOverlayGreyscale90
-          decals:
-            3849: -11,-12
-            3850: -10,-12
-            3851: -9,-12
-            3852: -8,-12
         - node:
             color: '#FFFFFFFF'
             id: Remains
@@ -5564,12 +5452,6 @@ entities:
           decals:
             296: -43,14
             1974: -43,-10
-        - node:
-            color: '#DE3A3A96'
-            id: ThreeQuarterTileOverlayGreyscale
-          decals:
-            5116: -21,-19
-            5119: -35,-19
         - node:
             color: '#EFCC4196'
             id: ThreeQuarterTileOverlayGreyscale
@@ -5603,12 +5485,6 @@ entities:
           decals:
             1955: -37,11
             1973: -41,-11
-        - node:
-            color: '#DE3A3A96'
-            id: ThreeQuarterTileOverlayGreyscale180
-          decals:
-            5113: -19,-21
-            5120: -33,-21
         - node:
             color: '#EFCC4196'
             id: ThreeQuarterTileOverlayGreyscale180
@@ -5639,12 +5515,6 @@ entities:
             294: -39,11
             295: -43,13
             1978: -43,-11
-        - node:
-            color: '#DE3A3A96'
-            id: ThreeQuarterTileOverlayGreyscale270
-          decals:
-            5114: -21,-21
-            5122: -35,-21
         - node:
             color: '#EFCC4196'
             id: ThreeQuarterTileOverlayGreyscale270
@@ -5684,12 +5554,6 @@ entities:
           decals:
             1954: -37,14
             1977: -41,-10
-        - node:
-            color: '#DE3A3A96'
-            id: ThreeQuarterTileOverlayGreyscale90
-          decals:
-            5115: -19,-19
-            5121: -33,-19
         - node:
             color: '#EFCC4196'
             id: ThreeQuarterTileOverlayGreyscale90
@@ -5731,7 +5595,6 @@ entities:
             3176: 5,-64
             3177: 39,-47
             3302: -17,48
-            5071: -25,1
         - node:
             color: '#FFFFFFFF'
             id: WarnCorner
@@ -5791,10 +5654,12 @@ entities:
             861: -12,2
             3342: -19,40
             3881: -114,30
-            3895: -15,2
             5408: 3,37
             5418: 7,40
             5446: -2,36
+            5794: -15,2
+            7225: -19,-18
+            7226: -23,-16
         - node:
             zIndex: 5
             color: '#FFFFFFFF'
@@ -5812,6 +5677,8 @@ entities:
             5407: -3,37
             5417: -7,40
             5445: 2,36
+            7205: -31,-10
+            7224: -17,-18
         - node:
             zIndex: 5
             color: '#FFFFFFFF'
@@ -5824,9 +5691,11 @@ entities:
           decals:
             1050: -2,-78
             3340: -19,42
-            3894: -15,4
             5481: -2,41
             5503: 4,38
+            5791: -15,4
+            7223: -21,-16
+            7227: -23,-14
         - node:
             zIndex: 5
             color: '#FFFFFFFF'
@@ -5843,23 +5712,26 @@ entities:
             3329: -27,40
             3339: -15,42
             3963: -54,6
-            5075: -25,-2
             5423: 9,38
             5482: 2,41
+            7204: -31,-7
+            7222: -19,-16
         - node:
             zIndex: 5
             color: '#FFFFFFFF'
             id: WarnCornerSmallSW
           decals:
             4919: 2,24
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnEndW
+          decals:
+            6784: -27,-7
         - node:
             color: '#52B4E996'
             id: WarnFullGreyscale
           decals:
             3449: 42,-19
-            5299: -21,-14
-            5300: -19,-14
-            5301: -20,-14
         - node:
             color: '#D381C996'
             id: WarnFullGreyscale
@@ -5867,11 +5739,6 @@ entities:
             1999: -58,0
             3977: -56,10
             3978: -55,10
-        - node:
-            color: '#DE3A3A96'
-            id: WarnFullGreyscale
-          decals:
-            5230: -27,-14
         - node:
             color: '#FFFFFFFF'
             id: WarnFullGreyscale
@@ -5887,8 +5754,6 @@ entities:
             3258: -32,31
             3259: -22,33
             3260: -12,33
-            5293: -30,-16
-            5294: -24,-16
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
@@ -5900,7 +5765,6 @@ entities:
             862: -12,3
             863: -12,4
             864: -12,5
-            1748: -37,-18
             1759: -15,22
             1763: 17,6
             1773: 17,22
@@ -5919,12 +5783,9 @@ entities:
             3151: 56,12
             3152: 56,11
             3338: -19,41
-            3893: -15,3
             4099: 17,-22
             4214: -16,33
             4886: -2,23
-            5267: -31,-13
-            5268: -22,-13
             5409: 3,41
             5410: 3,40
             5411: 3,39
@@ -5935,6 +5796,12 @@ entities:
             5444: -2,37
             5579: 9,26
             5580: 9,27
+            5793: -15,3
+            6785: -27,-7
+            6794: -23,-22
+            6795: -37,-16
+            6926: -23,-15
+            7213: -33,-6
         - node:
             color: '#52B4E996'
             id: WarnLineGreyscaleE
@@ -5954,6 +5821,12 @@ entities:
             1929: -48,-6
             1931: -45,-1
             1949: -42,-6
+        - node:
+            color: '#D4D4D428'
+            id: WarnLineGreyscaleE
+          decals:
+            6637: -27,-12
+            6638: -27,-14
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleE
@@ -5968,11 +5841,6 @@ entities:
             3541: -5,-54
             3889: -25,30
             3939: 41,-32
-            5105: -30,-20
-            5262: -33,-10
-            5263: -33,-6
-            5289: -31,-16
-            5292: -25,-16
             5727: -95,17
             5729: -71,17
         - node:
@@ -5997,11 +5865,10 @@ entities:
             1995: -41,12
             1996: -42,12
         - node:
-            color: '#DE3A3A96'
+            color: '#D4D4D428'
             id: WarnLineGreyscaleN
           decals:
-            5231: -27,-15
-            5311: -27,-4
+            6644: -35,-17
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleN
@@ -6025,9 +5892,6 @@ entities:
             3526: -1,-76
             4148: 53,2
             4149: 54,2
-            4987: -17,5
-            4988: -16,5
-            4989: -15,5
             5724: -100,18
         - node:
             color: '#334E6DC8'
@@ -6061,10 +5925,10 @@ entities:
             3974: -56,11
             3975: -55,11
         - node:
-            color: '#DE3A3A96'
+            color: '#D4D4D428'
             id: WarnLineGreyscaleS
           decals:
-            5229: -27,-13
+            6649: -25,-1
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleS
@@ -6105,12 +5969,6 @@ entities:
             4252: 54,27
             4253: 55,27
             4651: -11,27
-            4995: -16,-21
-            4996: -15,-21
-            5209: -17,-21
-            5286: -34,-17
-            5287: -21,-17
-            5288: -19,-17
             5725: -100,16
         - node:
             color: '#52B4E996'
@@ -6133,6 +5991,11 @@ entities:
             id: WarnLineGreyscaleW
           decals:
             1930: -46,-6
+        - node:
+            color: '#D4D4D428'
+            id: WarnLineGreyscaleW
+          decals:
+            6630: -29,-12
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleW
@@ -6154,11 +6017,6 @@ entities:
             4245: 19,23
             4246: 19,24
             4292: 19,25
-            5106: -24,-20
-            5264: -21,-10
-            5265: -21,-6
-            5290: -23,-16
-            5291: -29,-16
             5726: -101,17
             5728: -75,17
         - node:
@@ -6174,7 +6032,6 @@ entities:
             1046: 0,-78
             1047: 1,-78
             1048: -1,-78
-            1746: -27,-25
             1749: -40,-2
             1753: -36,7
             1768: 35,7
@@ -6203,9 +6060,6 @@ entities:
             4882: 0,24
             4883: 1,24
             4983: 18,-25
-            5072: -28,-2
-            5073: -27,-2
-            5074: -26,-2
             5090: -18,7
             5419: 6,38
             5420: 7,38
@@ -6217,11 +6071,8 @@ entities:
             5576: 6,25
             5577: 7,25
             5578: 8,25
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineS
-          decals:
-            1655: -9,-16
+            6791: -27,-25
+            6824: -20,-16
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
@@ -6237,7 +6088,6 @@ entities:
             1051: -20,-56
             1052: -20,-55
             1053: -20,-54
-            1747: -39,-18
             1760: -17,22
             1762: 15,6
             1771: 15,22
@@ -6259,8 +6109,6 @@ entities:
             4098: 15,-22
             4212: -18,33
             4887: 2,23
-            5266: -32,-13
-            5269: -23,-13
             5403: -3,41
             5404: -3,40
             5405: -3,39
@@ -6271,11 +6119,10 @@ entities:
             5453: 2,40
             5574: 5,26
             5575: 5,27
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineW
-          decals:
-            1649: -7,-18
+            6793: -25,-22
+            6921: -35,-6
+            7200: -31,-9
+            7201: -31,-8
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
@@ -6305,7 +6152,6 @@ entities:
             1777: 2,-23
             1778: -2,-23
             1890: -42,-2
-            2063: -27,-23
             2734: 4,-39
             2741: 5,-39
             2742: 3,-39
@@ -6341,9 +6187,6 @@ entities:
             4890: 1,24
             4982: 18,-23
             5089: -18,9
-            5308: -35,-15
-            5309: -34,-15
-            5310: -33,-15
             5413: -9,40
             5414: -8,40
             5415: 8,40
@@ -6365,6 +6208,14 @@ entities:
             5581: 6,28
             5582: 7,28
             5583: 8,28
+            6792: -27,-23
+            6825: -18,-18
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: WarnLineW
+          decals:
+            5776: -39,-16
         - node:
             angle: -3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -6549,10 +6400,6 @@ entities:
             3577: -15,-53
             3581: -13,-51
             3582: -14,-51
-            5052: -23,-2
-            5053: -22,-2
-            5054: -21,-2
-            5055: -20,-2
             5363: -11,14
             5364: -10,14
             5365: -9,14
@@ -6584,9 +6431,6 @@ entities:
             3703: 19,-27
             3704: 20,-27
             3705: 21,-27
-            5049: -23,1
-            5050: -22,1
-            5051: -21,1
             5366: -11,20
             5367: -10,20
             5368: -9,20
@@ -6645,17 +6489,18 @@ entities:
             2474: 51.849873,-9.726813
             2475: 52.084248,-9.383063
             2476: 51.849873,-9.070563
-        - node:
-            color: '#DE3A3A96'
-            id: clown
-          decals:
-            1648: -9,-13
         - node:
             cleanable: True
             color: '#F38BAAFF'
             id: clown
           decals:
             2695: 29.974606,-11.088503
+        - node:
+            cleanable: True
+            color: '#FF000054'
+            id: e
+          decals:
+            6487: -7.964929,-21.021265
         - node:
             cleanable: True
             color: '#79150096'
@@ -6730,12 +6575,31 @@ entities:
             id: matt
           decals:
             1656: -30,-36
+        - node:
+            cleanable: True
+            color: '#FF000054'
+            id: s
+          decals:
+            6486: -7.691646,-21.025898
         - node:
             cleanable: True
             color: '#FED83DFF'
             id: shop
           decals:
             2692: -66.02228,7.9843655
+        - node:
+            cleanable: True
+            angle: -6.283185307179586 rad
+            color: '#571212FF'
+            id: splatter
+          decals:
+            5798: -20,3
+        - node:
+            cleanable: True
+            color: '#79150096'
+            id: splatter
+          decals:
+            5823: -21,5
         - node:
             cleanable: True
             color: '#DE3A3A18'
@@ -6748,6 +6612,12 @@ entities:
             id: stickman
           decals:
             2698: 9.979055,-45.00161
+        - node:
+            cleanable: True
+            color: '#FF000054'
+            id: y
+          decals:
+            6488: -8.215054,-20.979568
     - type: GridAtmosphere
       version: 2
       data:
@@ -6758,6 +6628,7 @@ entities:
             0: 13107
           -1,-4:
             0: 34952
+            1: 544
           0,-3:
             0: 7103
           -1,-3:
@@ -6823,51 +6694,47 @@ entities:
             0: 13107
             1: 32768
           -4,-4:
-            0: 16383
+            0: 65535
           -4,-5:
-            0: 64447
-          -5,-4:
-            0: 35771
+            0: 65535
           -4,-3:
-            0: 15295
-          -5,-3:
-            0: 35771
+            0: 32767
           -4,-2:
-            0: 13107
-            1: 34952
+            0: 864
+            1: 2176
           -5,-2:
-            0: 35771
+            0: 36848
           -4,-1:
-            0: 30515
-            1: 8
+            0: 4369
+            1: 16388
           -5,-1:
-            0: 56715
+            0: 48059
           -4,0:
-            0: 64311
+            0: 64273
+            1: 4
           -3,-4:
-            0: 61439
-          -3,-3:
-            0: 494
-          -3,-1:
-            1: 35
-            0: 8
+            0: 65527
           -3,-5:
-            0: 65194
+            0: 63359
+          -3,-3:
+            1: 736
           -3,-2:
             1: 8736
             0: 34816
-          -2,-4:
-            0: 13143
-            1: 1024
-          -2,-3:
-            0: 17
+          -3,-1:
+            1: 34
+            0: 8
           -2,-2:
             0: 65532
           -2,-1:
             0: 191
             1: 24576
           -2,-5:
-            0: 14192
+            0: 13059
+          -2,-4:
+            1: 96
+          -2,-3:
+            1: 1088
           -2,0:
             1: 33860
             0: 4352
@@ -6922,11 +6789,11 @@ entities:
           3,4:
             0: 48056
           -5,0:
-            0: 64141
+            0: 63679
           -4,1:
-            0: 62395
+            0: 61883
           -5,1:
-            0: 63675
+            0: 61631
           -4,2:
             0: 29695
           -5,2:
@@ -7021,11 +6888,11 @@ entities:
           -5,-7:
             0: 61681
           -4,-6:
-            0: 46079
+            0: 61695
           -5,-6:
-            0: 47871
+            0: 61695
           -5,-5:
-            0: 47803
+            0: 24575
           -4,-9:
             0: 19921
           -3,-8:
@@ -7033,14 +6900,13 @@ entities:
           -3,-7:
             0: 62719
           -3,-6:
-            0: 59647
+            0: 28927
           -2,-8:
             0: 61695
           -2,-7:
             0: 61695
           -2,-6:
-            0: 255
-            1: 57344
+            0: 12543
           -1,-9:
             0: 34952
             1: 547
@@ -7255,77 +7121,81 @@ entities:
             1: 17
             0: 62668
           -8,-6:
-            0: 61695
+            0: 53503
           -9,-7:
             0: 61440
           -9,-6:
             0: 57599
           -8,-5:
-            0: 47359
+            0: 56797
           -9,-5:
-            0: 58607
+            0: 26350
           -8,-4:
-            0: 46015
+            0: 49055
           -7,-7:
             0: 63726
           -7,-6:
-            0: 61695
+            0: 63743
           -7,-5:
-            0: 65535
+            0: 48127
           -7,-9:
             0: 65160
             1: 2
           -7,-8:
             0: 61152
           -7,-4:
-            0: 62207
+            0: 49083
           -6,-8:
             0: 48057
           -6,-7:
             0: 61627
           -6,-6:
-            0: 63743
+            0: 46079
           -6,-5:
-            0: 59647
+            0: 15291
           -6,-9:
             0: 65280
             1: 6
           -6,-4:
-            0: 28399
+            0: 64507
+          -5,-4:
+            0: 30583
           -9,-4:
-            0: 3822
+            0: 61154
           -8,-3:
-            0: 29691
+            0: 65039
           -9,-3:
-            0: 3694
+            0: 61166
           -8,-2:
-            0: 65527
+            0: 61679
           -9,-2:
-            0: 3694
+            0: 61166
           -8,-1:
-            0: 47903
+            0: 58111
           -9,-1:
-            0: 61038
+            0: 65519
           -8,0:
-            0: 9131
+            0: 3822
           -7,-3:
-            0: 30719
+            0: 15247
           -7,-2:
-            0: 65520
+            0: 61627
           -7,-1:
-            0: 65327
+            0: 55551
           -7,0:
-            0: 255
+            0: 52701
           -6,-3:
-            0: 32382
+            0: 39739
           -6,-2:
-            0: 32639
+            0: 20979
           -6,-1:
-            0: 60999
+            0: 56543
           -6,0:
-            0: 57582
+            0: 53725
+          -5,-3:
+            0: 30503
           -9,0:
-            0: 60942
+            0: 60943
           -8,1:
             0: 61694
           -9,1:
@@ -7339,7 +7209,7 @@ entities:
           -9,3:
             0: 61182
           -7,1:
-            0: 62143
+            0: 62201
           -7,2:
             0: 65279
           -7,3:
@@ -7349,7 +7219,7 @@ entities:
           -7,4:
             0: 65535
           -6,1:
-            0: 61695
+            0: 61692
           -6,2:
             0: 12543
             1: 32768
@@ -9800,8 +9670,8 @@ entities:
           id: docking43669
           localAnchorB: -47.5,-40
           localAnchorA: 0.5,0
-          damping: 1560.8385
-          stiffness: 14010.056
+          damping: 1560.8187
+          stiffness: 14009.876
     - type: ImplicitRoof
 - proto: AcousticGuitarInstrument
   entities:
@@ -9817,42 +9687,8 @@ entities:
     - type: Transform
       pos: 31.477634,-79.4623
       parent: 60
-  - uid: 14226
-    components:
-    - type: Transform
-      pos: -23.517168,-10.499137
-      parent: 60
 - proto: AirAlarm
   entities:
-  - uid: 12
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -35.5,-15.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 21615
-      - 1771
-      - 1787
-      - 5952
-      - 2772
-      - 21614
-      - 6018
-      - 8388
-  - uid: 57
-    components:
-    - type: Transform
-      pos: -10.5,-21.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 21505
-      - 1511
-      - 516
-      - 904
-      - 928
-      - 21495
   - uid: 105
     components:
     - type: Transform
@@ -9864,42 +9700,21 @@ entities:
       - 109
       - 8416
       - 9157
-  - uid: 148
+  - uid: 982
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-17.5
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-18.5
       parent: 60
     - type: DeviceList
       devices:
-      - 1976
-      - 1966
-      - 1974
-      - 1659
-      - 777
-  - uid: 178
+      - 6308
+      - 1721
+  - uid: 1143
     components:
     - type: Transform
-      pos: -29.5,-2.5
+      pos: -12.5,-21.5
       parent: 60
-    - type: DeviceList
-      devices:
-      - 1975
-      - 1983
-      - 2009
-  - uid: 231
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-17.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 1985
-      - 1971
-      - 157
-      - 779
-      - 778
   - uid: 1229
     components:
     - type: Transform
@@ -9911,31 +9726,17 @@ entities:
       - 11525
       - 13248
       - 21646
-  - uid: 1960
+  - uid: 1720
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,1.5
+      pos: -16.5,-16.5
       parent: 60
     - type: DeviceList
       devices:
-      - 1645
-      - 21407
-      - 9155
-      - 788
-      - 792
-  - uid: 3204
-    components:
-    - type: MetaData
-      name: Ready Room Air Alarm
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,-21.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 5688
-      - 5364
+      - 842
+      - 2508
+      - 258
+      - 238
   - uid: 4046
     components:
     - type: Transform
@@ -9947,19 +9748,6 @@ entities:
       - 4502
       - 5518
       - 12511
-  - uid: 4709
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-17.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 1136
-      - 1133
-      - 122
-      - 788
-      - 792
   - uid: 5092
     components:
     - type: Transform
@@ -9989,18 +9777,6 @@ entities:
       - 5065
       - 7485
       - 7463
-  - uid: 5933
-    components:
-    - type: MetaData
-      name: Panopticon Air Alarm
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,-13.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 841
-      - 1845
   - uid: 7065
     components:
     - type: Transform
@@ -10048,6 +9824,79 @@ entities:
       - 21029
       - 21084
       - 21087
+  - uid: 8212
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -35.5,-13.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 13667
+      - 6097
+  - uid: 8283
+    components:
+    - type: Transform
+      pos: -27.5,-1.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 7918
+      - 7650
+  - uid: 8295
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,-9.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 7164
+      - 7656
+  - uid: 8296
+    components:
+    - type: Transform
+      pos: -26.5,-10.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 7685
+      - 6136
+  - uid: 8297
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-16.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 7741
+      - 6333
+  - uid: 8326
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-21.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 7684
+      - 6098
+  - uid: 8352
+    components:
+    - type: Transform
+      pos: -28.5,3.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 7649
+      - 7612
+  - uid: 8413
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -23.5,-1.5
+      parent: 60
   - uid: 8483
     components:
     - type: Transform
@@ -10087,6 +9936,18 @@ entities:
       - 9428
       - 9631
       - 9472
+  - uid: 11559
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,-25.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 6002
+      - 5962
+      - 1660
+      - 1581
   - uid: 12512
     components:
     - type: Transform
@@ -10135,6 +9996,26 @@ entities:
       devices:
       - 16666
       - 16667
+  - uid: 13697
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,-4.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 3493
+      - 4057
+  - uid: 13971
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-13.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 13623
+      - 8030
   - uid: 14670
     components:
     - type: Transform
@@ -10248,24 +10129,6 @@ entities:
       - 673
       - 1455
       - 1456
-  - uid: 21507
-    components:
-    - type: Transform
-      pos: -30.5,-21.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 21508
-      - 5940
-      - 6097
-      - 6098
-      - 6002
-      - 5962
-      - 15846
-      - 2585
-      - 17493
-      - 1660
-      - 1581
   - uid: 21515
     components:
     - type: Transform
@@ -10650,7 +10513,7 @@ entities:
       - 7686
       - 1996
       - 719
-      - 1780
+      - 972
   - uid: 21636
     components:
     - type: Transform
@@ -10883,24 +10746,6 @@ entities:
       devices:
       - 16668
       - 16669
-  - uid: 23925
-    components:
-    - type: Transform
-      pos: -25.5,2.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 7901
-      - 10586
-  - uid: 23926
-    components:
-    - type: Transform
-      pos: -34.5,1.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 13800
-      - 21411
   - uid: 23956
     components:
     - type: Transform
@@ -11147,6 +10992,16 @@ entities:
       parent: 60
 - proto: Airlock
   entities:
+  - uid: 268
+    components:
+    - type: Transform
+      pos: -8.5,-16.5
+      parent: 60
+  - uid: 9158
+    components:
+    - type: Transform
+      pos: -8.5,-19.5
+      parent: 60
   - uid: 13234
     components:
     - type: MetaData
@@ -11198,21 +11053,15 @@ entities:
       parent: 60
 - proto: AirlockArmoryGlassLocked
   entities:
-  - uid: 8471
+  - uid: 122
     components:
-    - type: MetaData
-      name: Armory
     - type: Transform
-      pos: -26.5,-2.5
+      pos: -30.5,-15.5
       parent: 60
-- proto: AirlockArmoryLocked
-  entities:
-  - uid: 813
+  - uid: 7920
     components:
-    - type: MetaData
-      name: Panopticon
     - type: Transform
-      pos: -26.5,-13.5
+      pos: -31.5,-7.5
       parent: 60
 - proto: AirlockAtmosphericsGlass
   entities:
@@ -11309,38 +11158,43 @@ entities:
       parent: 60
 - proto: AirlockBrigGlassLocked
   entities:
-  - uid: 242
+  - uid: 25
     components:
     - type: Transform
-      pos: -20.5,-21.5
+      pos: -25.5,-13.5
       parent: 60
-  - uid: 243
+  - uid: 51
     components:
     - type: Transform
-      pos: -20.5,-17.5
+      pos: -29.5,-13.5
       parent: 60
-  - uid: 245
+  - uid: 67
     components:
     - type: Transform
-      pos: -18.5,-17.5
+      pos: -29.5,-11.5
       parent: 60
-  - uid: 1919
+  - uid: 72
     components:
     - type: Transform
-      pos: -33.5,-17.5
+      pos: -25.5,-11.5
       parent: 60
-  - uid: 8297
+  - uid: 976
     components:
     - type: Transform
-      pos: -35.5,-19.5
-      parent: 60
-  - uid: 8454
-    components:
-    - type: Transform
-      pos: -18.5,-21.5
+      pos: -31.5,-17.5
       parent: 60
 - proto: AirlockBrigLocked
   entities:
+  - uid: 177
+    components:
+    - type: Transform
+      pos: -21.5,-12.5
+      parent: 60
+  - uid: 1856
+    components:
+    - type: Transform
+      pos: -34.5,-15.5
+      parent: 60
   - uid: 3781
     components:
     - type: MetaData
@@ -11362,12 +11216,10 @@ entities:
     - type: Transform
       pos: -49.5,-22.5
       parent: 60
-  - uid: 14225
+  - uid: 8229
     components:
-    - type: MetaData
-      name: Interrogation
     - type: Transform
-      pos: -31.5,-2.5
+      pos: -35.5,-3.5
       parent: 60
 - proto: AirlockCaptainGlassLocked
   entities:
@@ -11793,6 +11645,34 @@ entities:
     - type: Transform
       pos: 3.5,32.5
       parent: 60
+- proto: AirlockExternal
+  entities:
+  - uid: 779
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,-6.5
+      parent: 60
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1141:
+        - - DoorStatus
+          - Close
+  - uid: 1141
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,-5.5
+      parent: 60
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        779:
+        - - DoorStatus
+          - Close
 - proto: AirlockExternalAtmosphericsLocked
   entities:
   - uid: 12194
@@ -12664,30 +12544,6 @@ entities:
         24098:
         - - DoorStatus
           - DoorBolt
-  - uid: 2167
-    components:
-    - type: Transform
-      pos: -11.5,-9.5
-      parent: 60
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        2418:
-        - - DoorStatus
-          - DoorBolt
-  - uid: 2418
-    components:
-    - type: Transform
-      pos: -13.5,-11.5
-      parent: 60
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        2167:
-        - - DoorStatus
-          - DoorBolt
   - uid: 3900
     components:
     - type: Transform
@@ -12741,13 +12597,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -11.5,-0.5
       parent: 7536
-- proto: AirlockFreezer
-  entities:
-  - uid: 13598
-    components:
-    - type: Transform
-      pos: -12.5,-17.5
-      parent: 60
 - proto: AirlockFreezerKitchenHydroLocked
   entities:
   - uid: 2291
@@ -12796,6 +12645,11 @@ entities:
     - type: Transform
       pos: 18.5,7.5
       parent: 60
+  - uid: 1722
+    components:
+    - type: Transform
+      pos: -18.5,-10.5
+      parent: 60
   - uid: 2596
     components:
     - type: Transform
@@ -12826,36 +12680,6 @@ entities:
     - type: Transform
       pos: 1.5,-43.5
       parent: 60
-  - uid: 4553
-    components:
-    - type: Transform
-      pos: -16.5,6.5
-      parent: 60
-  - uid: 4554
-    components:
-    - type: Transform
-      pos: -16.5,-21.5
-      parent: 60
-  - uid: 4555
-    components:
-    - type: Transform
-      pos: -15.5,-21.5
-      parent: 60
-  - uid: 4561
-    components:
-    - type: Transform
-      pos: -14.5,-21.5
-      parent: 60
-  - uid: 4566
-    components:
-    - type: Transform
-      pos: -14.5,6.5
-      parent: 60
-  - uid: 4567
-    components:
-    - type: Transform
-      pos: -15.5,6.5
-      parent: 60
   - uid: 5001
     components:
     - type: Transform
@@ -13164,15 +12988,12 @@ entities:
     - type: Transform
       pos: 5.5,-33.5
       parent: 60
-- proto: AirlockHeadOfSecurityGlassLocked
+- proto: AirlockHeadOfSecurityLocked
   entities:
-  - uid: 8467
+  - uid: 1644
     components:
-    - type: MetaData
-      name: HoS Office
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,-2.5
+      pos: -30.5,-1.5
       parent: 60
 - proto: AirlockHydroGlassLocked
   entities:
@@ -13364,6 +13185,11 @@ entities:
       parent: 60
 - proto: AirlockMaintLocked
   entities:
+  - uid: 157
+    components:
+    - type: Transform
+      pos: -22.5,5.5
+      parent: 60
   - uid: 555
     components:
     - type: Transform
@@ -13379,6 +13205,11 @@ entities:
     - type: Transform
       pos: -1.5,-30.5
       parent: 60
+  - uid: 981
+    components:
+    - type: Transform
+      pos: -23.5,-8.5
+      parent: 60
   - uid: 1587
     components:
     - type: Transform
@@ -13455,11 +13286,6 @@ entities:
     - type: Transform
       pos: -39.5,-23.5
       parent: 60
-  - uid: 4686
-    components:
-    - type: Transform
-      pos: -17.5,3.5
-      parent: 60
   - uid: 5227
     components:
     - type: Transform
@@ -13507,6 +13333,11 @@ entities:
     - type: Transform
       pos: 35.5,5.5
       parent: 60
+  - uid: 8792
+    components:
+    - type: Transform
+      pos: -15.5,6.5
+      parent: 60
   - uid: 9620
     components:
     - type: Transform
@@ -13522,6 +13353,11 @@ entities:
     - type: Transform
       pos: 28.5,10.5
       parent: 60
+  - uid: 13668
+    components:
+    - type: Transform
+      pos: -17.5,3.5
+      parent: 60
   - uid: 13753
     components:
     - type: Transform
@@ -13659,12 +13495,20 @@ entities:
       parent: 60
 - proto: AirlockMaintSecLocked
   entities:
-  - uid: 18781
+  - uid: 777
     components:
-    - type: MetaData
-      name: Security Maint
     - type: Transform
-      pos: -30.5,3.5
+      pos: -23.5,-5.5
+      parent: 60
+  - uid: 4709
+    components:
+    - type: Transform
+      pos: -17.5,0.5
+      parent: 60
+  - uid: 12596
+    components:
+    - type: Transform
+      pos: -24.5,4.5
       parent: 60
 - proto: AirlockMaintTheatreLocked
   entities:
@@ -13921,38 +13765,17 @@ entities:
       parent: 60
 - proto: AirlockSecurityGlassLocked
   entities:
-  - uid: 342
+  - uid: 1727
     components:
-    - type: MetaData
-      name: Ready Room
     - type: Transform
-      pos: -29.5,-15.5
-      parent: 60
-  - uid: 1225
-    components:
-    - type: MetaData
-      name: Ready Room
-    - type: Transform
-      pos: -23.5,-15.5
+      pos: -22.5,-3.5
       parent: 60
 - proto: AirlockSecurityLocked
   entities:
-  - uid: 175
+  - uid: 132
     components:
     - type: Transform
-      pos: -8.5,-21.5
-      parent: 60
-  - uid: 13881
-    components:
-    - type: Transform
-      pos: -6.5,-16.5
-      parent: 60
-  - uid: 19620
-    components:
-    - type: MetaData
-      name: Security Maint
-    - type: Transform
-      pos: -30.5,1.5
+      pos: -24.5,-1.5
       parent: 60
 - proto: AirlockServiceLocked
   entities:
@@ -14101,51 +13924,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 105
-  - uid: 122
-    components:
-    - type: Transform
-      pos: -15.5,-15.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 4710
-      - 4709
-  - uid: 1645
-    components:
-    - type: Transform
-      pos: -15.5,1.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 1960
-      - 1962
-  - uid: 1975
-    components:
-    - type: Transform
-      pos: -26.5,-4.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 178
-      - 177
-  - uid: 1976
-    components:
-    - type: Transform
-      pos: -20.5,-15.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 1970
-      - 148
-  - uid: 1985
-    components:
-    - type: Transform
-      pos: -32.5,-15.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 230
-      - 231
   - uid: 2084
     components:
     - type: Transform
@@ -14268,9 +14046,6 @@ entities:
     - type: Transform
       pos: -6.5,-23.5
       parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 57
   - uid: 21501
     components:
     - type: Transform
@@ -14289,20 +14064,11 @@ entities:
     - type: Transform
       pos: -21.5,-23.5
       parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 4191
-      - 4190
-      - 63
-      - 57
   - uid: 21508
     components:
     - type: Transform
       pos: -31.5,-23.5
       parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 21506
   - uid: 21512
     components:
     - type: Transform
@@ -14433,11 +14199,8 @@ entities:
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 21613
       - 11347
-      - 4627
       - 21612
-      - 12
   - uid: 21615
     components:
     - type: Transform
@@ -14445,11 +14208,8 @@ entities:
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 21613
       - 11347
-      - 4627
       - 21612
-      - 12
   - uid: 21624
     components:
     - type: Transform
@@ -14740,14 +14500,6 @@ entities:
       parent: 60
 - proto: APCBasic
   entities:
-  - uid: 124
-    components:
-    - type: MetaData
-      name: Ready Room APC
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,-21.5
-      parent: 60
   - uid: 283
     components:
     - type: MetaData
@@ -14789,22 +14541,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -12.5,1.5
       parent: 60
-  - uid: 1955
-    components:
-    - type: MetaData
-      name: East Security APC
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-12.5
-      parent: 60
-  - uid: 1956
-    components:
-    - type: MetaData
-      name: West Security APC
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -32.5,-12.5
-      parent: 60
   - uid: 2277
     components:
     - type: MetaData
@@ -14877,6 +14613,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -1.5,-42.5
       parent: 60
+  - uid: 4009
+    components:
+    - type: Transform
+      pos: -20.5,-16.5
+      parent: 60
   - uid: 4086
     components:
     - type: MetaData
@@ -14983,14 +14724,6 @@ entities:
     - type: Transform
       pos: 10.5,-52.5
       parent: 60
-  - uid: 7032
-    components:
-    - type: MetaData
-      name: Panopticon APC
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-13.5
-      parent: 60
   - uid: 7124
     components:
     - type: MetaData
@@ -15044,6 +14777,12 @@ entities:
     - type: Transform
       pos: 9.5,-1.5
       parent: 7536
+  - uid: 8153
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-1.5
+      parent: 60
   - uid: 8236
     components:
     - type: MetaData
@@ -15052,12 +14791,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,37.5
       parent: 60
-  - uid: 8348
+  - uid: 8294
     components:
-    - type: MetaData
-      name: Interrogation APC
     - type: Transform
-      pos: -32.5,1.5
+      pos: -30.5,-10.5
       parent: 60
   - uid: 9393
     components:
@@ -15074,11 +14811,6 @@ entities:
     - type: Transform
       pos: -44.5,15.5
       parent: 60
-  - uid: 9465
-    components:
-    - type: Transform
-      pos: -19.5,1.5
-      parent: 60
   - uid: 9694
     components:
     - type: MetaData
@@ -15156,13 +14888,6 @@ entities:
     - type: Transform
       pos: 51.5,15.5
       parent: 60
-  - uid: 13718
-    components:
-    - type: MetaData
-      name: Armory APC
-    - type: Transform
-      pos: -24.5,-2.5
-      parent: 60
   - uid: 14552
     components:
     - type: MetaData
@@ -15346,13 +15071,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -104.5,14.5
       parent: 60
-  - uid: 24134
-    components:
-    - type: MetaData
-      name: Perma Brig APC
-    - type: Transform
-      pos: -5.5,-16.5
-      parent: 60
 - proto: AppleSeeds
   entities:
   - uid: 304
@@ -16210,11 +15928,23 @@ entities:
       parent: 60
 - proto: BarricadeBlock
   entities:
+  - uid: 1216
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -17.5,3.5
+      parent: 60
   - uid: 6579
     components:
     - type: Transform
       pos: -42.5,-31.5
       parent: 60
+  - uid: 11569
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,5.5
+      parent: 60
   - uid: 13938
     components:
     - type: Transform
@@ -16277,10 +16007,15 @@ entities:
       parent: 60
 - proto: Beaker
   entities:
-  - uid: 2244
+  - uid: 1575
     components:
     - type: Transform
-      pos: -12.753071,-14.410143
+      pos: -15.704805,-9.479211
+      parent: 60
+  - uid: 1947
+    components:
+    - type: Transform
+      pos: -15.704805,-9.166493
       parent: 60
   - uid: 4133
     components:
@@ -16319,15 +16054,10 @@ entities:
     - type: Transform
       pos: -6.5,24.5
       parent: 60
-  - uid: 1822
+  - uid: 1917
     components:
     - type: Transform
-      pos: -34.5,-11.5
-      parent: 60
-  - uid: 1850
-    components:
-    - type: Transform
-      pos: -19.5,-3.5
+      pos: -28.5,2.5
       parent: 60
   - uid: 2150
     components:
@@ -16384,21 +16114,6 @@ entities:
     - type: Transform
       pos: 56.5,-45.5
       parent: 60
-  - uid: 8438
-    components:
-    - type: Transform
-      pos: -18.5,-7.5
-      parent: 60
-  - uid: 8473
-    components:
-    - type: Transform
-      pos: -18.5,-11.5
-      parent: 60
-  - uid: 8682
-    components:
-    - type: Transform
-      pos: -34.5,-7.5
-      parent: 60
   - uid: 8934
     components:
     - type: Transform
@@ -16409,15 +16124,10 @@ entities:
     - type: Transform
       pos: 3.5,-3.5
       parent: 7536
-  - uid: 13733
+  - uid: 11663
     components:
     - type: Transform
-      pos: -7.5,-13.5
-      parent: 60
-  - uid: 13734
-    components:
-    - type: Transform
-      pos: -7.5,-12.5
+      pos: -6.5,-17.5
       parent: 60
   - uid: 13760
     components:
@@ -16479,6 +16189,13 @@ entities:
     - type: Transform
       pos: 49.5,-23.5
       parent: 60
+- proto: BedsheetBrown
+  entities:
+  - uid: 7031
+    components:
+    - type: Transform
+      pos: -6.5,-17.5
+      parent: 60
 - proto: BedsheetCaptain
   entities:
   - uid: 18506
@@ -16545,10 +16262,10 @@ entities:
       parent: 60
 - proto: BedsheetHOS
   entities:
-  - uid: 6117
+  - uid: 1906
     components:
     - type: Transform
-      pos: -19.5,-3.5
+      pos: -28.5,2.5
       parent: 60
 - proto: BedsheetIan
   entities:
@@ -16561,11 +16278,21 @@ entities:
     - type: InsideEntityStorage
 - proto: BedsheetMedical
   entities:
+  - uid: 230
+    components:
+    - type: Transform
+      pos: -18.5,-8.5
+      parent: 60
   - uid: 402
     components:
     - type: Transform
       pos: 36.5,-16.5
       parent: 60
+  - uid: 543
+    components:
+    - type: Transform
+      pos: -17.5,-9.5
+      parent: 60
   - uid: 9005
     components:
     - type: Transform
@@ -16593,33 +16320,6 @@ entities:
     - type: Transform
       pos: 27.5,-12.5
       parent: 60
-- proto: BedsheetOrange
-  entities:
-  - uid: 291
-    components:
-    - type: Transform
-      pos: -18.5,-7.5
-      parent: 60
-  - uid: 309
-    components:
-    - type: Transform
-      pos: -18.5,-11.5
-      parent: 60
-  - uid: 7785
-    components:
-    - type: Transform
-      pos: -34.5,-11.5
-      parent: 60
-  - uid: 8240
-    components:
-    - type: Transform
-      pos: -34.5,-7.5
-      parent: 60
-  - uid: 13699
-    components:
-    - type: Transform
-      pos: -7.5,-12.5
-      parent: 60
 - proto: BedsheetQM
   entities:
   - uid: 5932
@@ -16708,11 +16408,6 @@ entities:
     - type: Transform
       pos: 3.5,-3.5
       parent: 7536
-  - uid: 13784
-    components:
-    - type: Transform
-      pos: -7.5,-13.5
-      parent: 60
 - proto: BedsheetUSA
   entities:
   - uid: 4181
@@ -16746,13 +16441,21 @@ entities:
     - type: Transform
       pos: 22.253925,-11.4549055
       parent: 60
-- proto: Biogenerator
+- proto: Biofabricator
   entities:
-  - uid: 3676
+  - uid: 1560
     components:
     - type: Transform
-      pos: -8.5,-11.5
+      pos: -12.5,-11.5
       parent: 60
+    - type: TechnologyDatabase
+      supportedDisciplines:
+      - Industrial
+      - Arsenal
+      - Experimental
+      - CivilianServices
+- proto: Biogenerator
+  entities:
   - uid: 16143
     components:
     - type: Transform
@@ -16935,71 +16638,6 @@ entities:
     - type: Transform
       pos: -4.5,1.5
       parent: 60
-  - uid: 1238
-    components:
-    - type: Transform
-      pos: -17.5,-10.5
-      parent: 60
-  - uid: 1257
-    components:
-    - type: Transform
-      pos: -17.5,-11.5
-      parent: 60
-  - uid: 1293
-    components:
-    - type: Transform
-      pos: -17.5,-9.5
-      parent: 60
-  - uid: 1354
-    components:
-    - type: Transform
-      pos: -17.5,-7.5
-      parent: 60
-  - uid: 1384
-    components:
-    - type: Transform
-      pos: -17.5,-6.5
-      parent: 60
-  - uid: 1638
-    components:
-    - type: Transform
-      pos: -35.5,-11.5
-      parent: 60
-  - uid: 1639
-    components:
-    - type: Transform
-      pos: -35.5,-10.5
-      parent: 60
-  - uid: 1640
-    components:
-    - type: Transform
-      pos: -35.5,-9.5
-      parent: 60
-  - uid: 1652
-    components:
-    - type: Transform
-      pos: -17.5,-5.5
-      parent: 60
-  - uid: 1653
-    components:
-    - type: Transform
-      pos: -35.5,-7.5
-      parent: 60
-  - uid: 1655
-    components:
-    - type: Transform
-      pos: -35.5,-6.5
-      parent: 60
-  - uid: 1656
-    components:
-    - type: Transform
-      pos: -35.5,-5.5
-      parent: 60
-  - uid: 1681
-    components:
-    - type: Transform
-      pos: -18.5,-1.5
-      parent: 60
   - uid: 4457
     components:
     - type: Transform
@@ -17077,11 +16715,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -115.5,9.5
       parent: 60
-  - uid: 5432
-    components:
-    - type: Transform
-      pos: -18.5,0.5
-      parent: 60
   - uid: 8721
     components:
     - type: Transform
@@ -17097,26 +16730,11 @@ entities:
     - type: Transform
       pos: 4.5,3.5
       parent: 60
-  - uid: 10622
-    components:
-    - type: Transform
-      pos: -18.5,-0.5
-      parent: 60
   - uid: 13978
     components:
     - type: Transform
       pos: -1.5,4.5
       parent: 60
-  - uid: 14167
-    components:
-    - type: Transform
-      pos: -17.5,-16.5
-      parent: 60
-  - uid: 16425
-    components:
-    - type: Transform
-      pos: -17.5,-14.5
-      parent: 60
 - proto: BlastDoorWindowsOpen
   entities:
   - uid: 5306
@@ -17168,12 +16786,6 @@ entities:
       parent: 60
     - type: SpamEmitSound
       enabled: False
-  - uid: 14392
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-14.5
-      parent: 60
   - uid: 25282
     components:
     - type: Transform
@@ -17213,6 +16825,13 @@ entities:
         - 0
     - type: Foldable
       folded: True
+- proto: BookHowToCookForFortySpaceman
+  entities:
+  - uid: 1610
+    components:
+    - type: Transform
+      pos: -15.65473,-8.3815565
+      parent: 60
 - proto: BookRandomStory
   entities:
   - uid: 23696
@@ -17234,11 +16853,6 @@ entities:
     - type: Transform
       pos: -50.5,-15.5
       parent: 60
-  - uid: 13700
-    components:
-    - type: Transform
-      pos: -7.5,-14.5
-      parent: 60
   - uid: 14161
     components:
     - type: Transform
@@ -17266,6 +16880,11 @@ entities:
     - type: Transform
       pos: -6.5,22.5
       parent: 60
+  - uid: 8947
+    components:
+    - type: Transform
+      pos: -11.5,-12.5
+      parent: 60
   - uid: 9009
     components:
     - type: Transform
@@ -17326,6 +16945,13 @@ entities:
     - type: Transform
       pos: -34.5,19.5
       parent: 60
+- proto: BookTruth
+  entities:
+  - uid: 1465
+    components:
+    - type: Transform
+      pos: -19.442064,5.6200457
+      parent: 60
 - proto: BoozeDispenser
   entities:
   - uid: 2253
@@ -17426,13 +17052,6 @@ entities:
     - type: Transform
       pos: 36.484776,-1.3655467
       parent: 60
-- proto: BoxFlashbang
-  entities:
-  - uid: 23646
-    components:
-    - type: Transform
-      pos: -27.693483,-9.22786
-      parent: 60
 - proto: BoxFolderBlack
   entities:
   - uid: 8975
@@ -17577,13 +17196,6 @@ entities:
     - type: Transform
       pos: -58.50381,1.496242
       parent: 60
-- proto: BoxHandcuff
-  entities:
-  - uid: 8517
-    components:
-    - type: Transform
-      pos: -25.770853,-6.4264956
-      parent: 60
 - proto: BoxLatexGloves
   entities:
   - uid: 261
@@ -17615,11 +17227,6 @@ entities:
     - type: Transform
       pos: 1.5511138,15.604638
       parent: 60
-  - uid: 6704
-    components:
-    - type: Transform
-      pos: -22.497168,-20.37416
-      parent: 60
   - uid: 7217
     components:
     - type: Transform
@@ -17642,13 +17249,6 @@ entities:
     - type: Transform
       pos: 0.43422604,17.607504
       parent: 60
-- proto: BoxMagazinePistol
-  entities:
-  - uid: 6546
-    components:
-    - type: Transform
-      pos: -30.317034,-20.534887
-      parent: 60
 - proto: BoxMouthSwab
   entities:
   - uid: 8886
@@ -17705,15 +17305,10 @@ entities:
       parent: 60
 - proto: BoxZiptie
   entities:
-  - uid: 13148
+  - uid: 14362
     components:
     - type: Transform
-      pos: -30.915613,-20.534887
-      parent: 60
-  - uid: 21067
-    components:
-    - type: Transform
-      pos: -22.375732,-20.563042
+      pos: -18.393341,-3.4400811
       parent: 60
 - proto: BrbSign
   entities:
@@ -17727,76 +17322,6 @@ entities:
     - type: Transform
       pos: 46.54674,9.956706
       parent: 60
-- proto: BrigTimer
-  entities:
-  - uid: 24
-    components:
-    - type: MetaData
-      name: Cell 1 Brig Timer
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -32.5,-4.5
-      parent: 60
-    - type: DeviceLinkSource
-      linkedPorts:
-        1483:
-        - - Start
-          - Close
-        - - Timer
-          - Open
-        - - Timer
-          - AutoClose
-  - uid: 1853
-    components:
-    - type: MetaData
-      name: Cell 3 Brig Timer
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-4.5
-      parent: 60
-    - type: DeviceLinkSource
-      linkedPorts:
-        1548:
-        - - Start
-          - Close
-        - - Timer
-          - Open
-        - - Timer
-          - AutoClose
-  - uid: 9058
-    components:
-    - type: MetaData
-      name: Cell 2 Brig Timer
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -32.5,-8.5
-      parent: 60
-    - type: DeviceLinkSource
-      linkedPorts:
-        1555:
-        - - Start
-          - Close
-        - - Timer
-          - Open
-        - - Timer
-          - AutoClose
-  - uid: 9158
-    components:
-    - type: MetaData
-      name: Cell 4 Brig Timer
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-8.5
-      parent: 60
-    - type: DeviceLinkSource
-      linkedPorts:
-        1487:
-        - - Start
-          - Close
-        - - Timer
-          - Open
-        - - Timer
-          - AutoClose
 - proto: BrokenBottle
   entities:
   - uid: 23662
@@ -17804,15 +17329,13 @@ entities:
     - type: Transform
       pos: -56.485756,52.334377
       parent: 60
-- proto: Brutepack
-  entities:
-  - uid: 9030
-    components:
-    - type: Transform
-      pos: -19.411993,-13.214928
-      parent: 60
 - proto: Bucket
   entities:
+  - uid: 210
+    components:
+    - type: Transform
+      pos: -14.271206,-13.394466
+      parent: 60
   - uid: 2708
     components:
     - type: Transform
@@ -17838,11 +17361,6 @@ entities:
     - type: Transform
       pos: 12.5,3.5
       parent: 60
-  - uid: 13599
-    components:
-    - type: Transform
-      pos: -9.835501,-12.340368
-      parent: 60
 - proto: ButchCleaver
   entities:
   - uid: 2616
@@ -17892,12 +17410,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-0.5
       parent: 60
-  - uid: 10671
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,-2.5
-      parent: 60
   - uid: 13637
     components:
     - type: Transform
@@ -18036,6 +17548,11 @@ entities:
       parent: 60
 - proto: ButtonFrameJanitor
   entities:
+  - uid: 14074
+    components:
+    - type: Transform
+      pos: -28.5,-10.5
+      parent: 60
   - uid: 19869
     components:
     - type: Transform
@@ -18068,6 +17585,11 @@ entities:
       parent: 60
 - proto: CableApcExtension
   entities:
+  - uid: 8
+    components:
+    - type: Transform
+      pos: -16.5,-5.5
+      parent: 60
   - uid: 23
     components:
     - type: Transform
@@ -18083,70 +17605,15 @@ entities:
     - type: Transform
       pos: -65.5,7.5
       parent: 60
-  - uid: 69
-    components:
-    - type: Transform
-      pos: -35.5,-6.5
-      parent: 60
   - uid: 70
     components:
     - type: Transform
       pos: 1.5,-77.5
       parent: 60
-  - uid: 72
+  - uid: 84
     components:
     - type: Transform
-      pos: -32.5,-5.5
-      parent: 60
-  - uid: 76
-    components:
-    - type: Transform
-      pos: -33.5,-5.5
-      parent: 60
-  - uid: 79
-    components:
-    - type: Transform
-      pos: -31.5,-6.5
-      parent: 60
-  - uid: 81
-    components:
-    - type: Transform
-      pos: -31.5,-5.5
-      parent: 60
-  - uid: 96
-    components:
-    - type: Transform
-      pos: -23.5,-5.5
-      parent: 60
-  - uid: 112
-    components:
-    - type: Transform
-      pos: -27.5,0.5
-      parent: 60
-  - uid: 115
-    components:
-    - type: Transform
-      pos: -25.5,0.5
-      parent: 60
-  - uid: 119
-    components:
-    - type: Transform
-      pos: -29.5,-5.5
-      parent: 60
-  - uid: 151
-    components:
-    - type: Transform
-      pos: -17.5,-10.5
-      parent: 60
-  - uid: 152
-    components:
-    - type: Transform
-      pos: -35.5,-5.5
-      parent: 60
-  - uid: 155
-    components:
-    - type: Transform
-      pos: -17.5,-7.5
+      pos: -31.5,5.5
       parent: 60
   - uid: 167
     components:
@@ -18173,10 +17640,10 @@ entities:
     - type: Transform
       pos: 50.5,23.5
       parent: 60
-  - uid: 315
+  - uid: 313
     components:
     - type: Transform
-      pos: -29.5,-10.5
+      pos: -20.5,-3.5
       parent: 60
   - uid: 332
     components:
@@ -18213,21 +17680,16 @@ entities:
     - type: Transform
       pos: 41.5,-18.5
       parent: 60
-  - uid: 547
-    components:
-    - type: Transform
-      pos: -10.5,-16.5
-      parent: 60
-  - uid: 549
-    components:
-    - type: Transform
-      pos: -10.5,-15.5
-      parent: 60
   - uid: 551
     components:
     - type: Transform
       pos: -10.5,2.5
       parent: 60
+  - uid: 559
+    components:
+    - type: Transform
+      pos: -21.5,-3.5
+      parent: 60
   - uid: 561
     components:
     - type: Transform
@@ -18248,21 +17710,76 @@ entities:
     - type: Transform
       pos: -11.5,5.5
       parent: 60
+  - uid: 793
+    components:
+    - type: Transform
+      pos: -26.5,6.5
+      parent: 60
   - uid: 815
     components:
     - type: Transform
       pos: 13.5,-12.5
       parent: 60
+  - uid: 840
+    components:
+    - type: Transform
+      pos: -13.5,-19.5
+      parent: 60
+  - uid: 843
+    components:
+    - type: Transform
+      pos: -12.5,-19.5
+      parent: 60
   - uid: 873
     components:
     - type: Transform
       pos: -60.5,12.5
       parent: 60
+  - uid: 932
+    components:
+    - type: Transform
+      pos: -10.5,-19.5
+      parent: 60
   - uid: 940
     components:
     - type: Transform
       pos: -65.5,12.5
       parent: 60
+  - uid: 967
+    components:
+    - type: Transform
+      pos: -22.5,-3.5
+      parent: 60
+  - uid: 978
+    components:
+    - type: Transform
+      pos: -15.5,-21.5
+      parent: 60
+  - uid: 1114
+    components:
+    - type: Transform
+      pos: -16.5,8.5
+      parent: 60
+  - uid: 1120
+    components:
+    - type: Transform
+      pos: -24.5,9.5
+      parent: 60
+  - uid: 1152
+    components:
+    - type: Transform
+      pos: -14.5,-19.5
+      parent: 60
+  - uid: 1155
+    components:
+    - type: Transform
+      pos: -16.5,-21.5
+      parent: 60
+  - uid: 1160
+    components:
+    - type: Transform
+      pos: -11.5,-19.5
+      parent: 60
   - uid: 1167
     components:
     - type: Transform
@@ -18348,55 +17865,20 @@ entities:
     - type: Transform
       pos: -20.5,-33.5
       parent: 60
-  - uid: 1697
-    components:
-    - type: Transform
-      pos: -33.5,-21.5
-      parent: 60
-  - uid: 1701
-    components:
-    - type: Transform
-      pos: -19.5,-17.5
-      parent: 60
   - uid: 1703
     components:
     - type: Transform
       pos: 30.5,-17.5
       parent: 60
-  - uid: 1706
-    components:
-    - type: Transform
-      pos: -20.5,-15.5
-      parent: 60
   - uid: 1716
     components:
     - type: Transform
       pos: 1.5,-6.5
       parent: 60
-  - uid: 1717
+  - uid: 1737
     components:
     - type: Transform
-      pos: -18.5,-5.5
-      parent: 60
-  - uid: 1720
-    components:
-    - type: Transform
-      pos: -17.5,-5.5
-      parent: 60
-  - uid: 1722
-    components:
-    - type: Transform
-      pos: -20.5,0.5
-      parent: 60
-  - uid: 1735
-    components:
-    - type: Transform
-      pos: -19.5,-16.5
-      parent: 60
-  - uid: 1751
-    components:
-    - type: Transform
-      pos: -19.5,-19.5
+      pos: -24.5,-15.5
       parent: 60
   - uid: 1763
     components:
@@ -18408,131 +17890,21 @@ entities:
     - type: Transform
       pos: -57.5,-22.5
       parent: 60
-  - uid: 1824
+  - uid: 1821
     components:
     - type: Transform
-      pos: -21.5,-14.5
-      parent: 60
-  - uid: 1831
-    components:
-    - type: Transform
-      pos: -21.5,-12.5
-      parent: 60
-  - uid: 1835
-    components:
-    - type: Transform
-      pos: -32.5,-21.5
-      parent: 60
-  - uid: 1836
-    components:
-    - type: Transform
-      pos: -19.5,-15.5
-      parent: 60
-  - uid: 1854
-    components:
-    - type: Transform
-      pos: -18.5,-19.5
-      parent: 60
-  - uid: 1855
-    components:
-    - type: Transform
-      pos: -17.5,-19.5
-      parent: 60
-  - uid: 1859
-    components:
-    - type: Transform
-      pos: -19.5,-2.5
+      pos: -23.5,9.5
       parent: 60
   - uid: 1860
     components:
     - type: Transform
       pos: 32.5,-17.5
       parent: 60
-  - uid: 1872
-    components:
-    - type: Transform
-      pos: -27.5,-11.5
-      parent: 60
-  - uid: 1874
-    components:
-    - type: Transform
-      pos: -26.5,-8.5
-      parent: 60
-  - uid: 1881
-    components:
-    - type: Transform
-      pos: -26.5,-7.5
-      parent: 60
-  - uid: 1883
-    components:
-    - type: Transform
-      pos: -27.5,-7.5
-      parent: 60
-  - uid: 1887
-    components:
-    - type: Transform
-      pos: -28.5,-19.5
-      parent: 60
-  - uid: 1888
-    components:
-    - type: Transform
-      pos: -26.5,-18.5
-      parent: 60
-  - uid: 1889
-    components:
-    - type: Transform
-      pos: -26.5,-9.5
-      parent: 60
   - uid: 1891
     components:
     - type: Transform
       pos: 52.5,-24.5
       parent: 60
-  - uid: 1892
-    components:
-    - type: Transform
-      pos: -28.5,-7.5
-      parent: 60
-  - uid: 1893
-    components:
-    - type: Transform
-      pos: -26.5,-16.5
-      parent: 60
-  - uid: 1901
-    components:
-    - type: Transform
-      pos: -27.5,-15.5
-      parent: 60
-  - uid: 1935
-    components:
-    - type: Transform
-      pos: -19.5,-9.5
-      parent: 60
-  - uid: 1938
-    components:
-    - type: Transform
-      pos: -34.5,-5.5
-      parent: 60
-  - uid: 1947
-    components:
-    - type: Transform
-      pos: -17.5,-9.5
-      parent: 60
-  - uid: 1951
-    components:
-    - type: Transform
-      pos: -31.5,-10.5
-      parent: 60
-  - uid: 1958
-    components:
-    - type: Transform
-      pos: -18.5,-9.5
-      parent: 60
-  - uid: 1965
-    components:
-    - type: Transform
-      pos: -31.5,-9.5
-      parent: 60
   - uid: 2019
     components:
     - type: Transform
@@ -18543,40 +17915,10 @@ entities:
     - type: Transform
       pos: -23.5,-29.5
       parent: 60
-  - uid: 2090
+  - uid: 2042
     components:
     - type: Transform
-      pos: -33.5,2.5
-      parent: 60
-  - uid: 2093
-    components:
-    - type: Transform
-      pos: -32.5,1.5
-      parent: 60
-  - uid: 2096
-    components:
-    - type: Transform
-      pos: -23.5,-11.5
-      parent: 60
-  - uid: 2097
-    components:
-    - type: Transform
-      pos: -19.5,0.5
-      parent: 60
-  - uid: 2099
-    components:
-    - type: Transform
-      pos: -34.5,-17.5
-      parent: 60
-  - uid: 2166
-    components:
-    - type: Transform
-      pos: -12.5,-11.5
-      parent: 60
-  - uid: 2179
-    components:
-    - type: Transform
-      pos: -14.5,-11.5
+      pos: -32.5,5.5
       parent: 60
   - uid: 2216
     components:
@@ -18603,11 +17945,6 @@ entities:
     - type: Transform
       pos: 33.5,-38.5
       parent: 60
-  - uid: 2399
-    components:
-    - type: Transform
-      pos: -13.5,-11.5
-      parent: 60
   - uid: 2438
     components:
     - type: Transform
@@ -18643,31 +17980,6 @@ entities:
     - type: Transform
       pos: 39.5,-44.5
       parent: 60
-  - uid: 2760
-    components:
-    - type: Transform
-      pos: -34.5,-19.5
-      parent: 60
-  - uid: 2791
-    components:
-    - type: Transform
-      pos: -35.5,-19.5
-      parent: 60
-  - uid: 2792
-    components:
-    - type: Transform
-      pos: -33.5,-15.5
-      parent: 60
-  - uid: 2793
-    components:
-    - type: Transform
-      pos: -35.5,-18.5
-      parent: 60
-  - uid: 2807
-    components:
-    - type: Transform
-      pos: -33.5,-16.5
-      parent: 60
   - uid: 2887
     components:
     - type: Transform
@@ -18703,16 +18015,6 @@ entities:
     - type: Transform
       pos: -58.5,-22.5
       parent: 60
-  - uid: 3182
-    components:
-    - type: Transform
-      pos: -12.5,-19.5
-      parent: 60
-  - uid: 3198
-    components:
-    - type: Transform
-      pos: -30.5,0.5
-      parent: 60
   - uid: 3246
     components:
     - type: Transform
@@ -18858,26 +18160,11 @@ entities:
     - type: Transform
       pos: 45.5,6.5
       parent: 60
-  - uid: 4009
-    components:
-    - type: Transform
-      pos: -31.5,-0.5
-      parent: 60
-  - uid: 4017
-    components:
-    - type: Transform
-      pos: -10.5,-17.5
-      parent: 60
   - uid: 4221
     components:
     - type: Transform
       pos: -65.5,-0.5
       parent: 60
-  - uid: 4235
-    components:
-    - type: Transform
-      pos: -17.5,-20.5
-      parent: 60
   - uid: 4259
     components:
     - type: Transform
@@ -18918,26 +18205,11 @@ entities:
     - type: Transform
       pos: -66.5,1.5
       parent: 60
-  - uid: 4504
-    components:
-    - type: Transform
-      pos: -21.5,-7.5
-      parent: 60
-  - uid: 4516
-    components:
-    - type: Transform
-      pos: -20.5,-9.5
-      parent: 60
   - uid: 4528
     components:
     - type: Transform
       pos: 55.5,-35.5
       parent: 60
-  - uid: 4562
-    components:
-    - type: Transform
-      pos: -19.5,-1.5
-      parent: 60
   - uid: 4568
     components:
     - type: Transform
@@ -19283,11 +18555,6 @@ entities:
     - type: Transform
       pos: -15.5,-31.5
       parent: 60
-  - uid: 5224
-    components:
-    - type: Transform
-      pos: -29.5,-11.5
-      parent: 60
   - uid: 5233
     components:
     - type: Transform
@@ -19298,11 +18565,6 @@ entities:
     - type: Transform
       pos: 40.5,-7.5
       parent: 60
-  - uid: 5294
-    components:
-    - type: Transform
-      pos: -31.5,-13.5
-      parent: 60
   - uid: 5325
     components:
     - type: Transform
@@ -19348,21 +18610,6 @@ entities:
     - type: Transform
       pos: 8.5,5.5
       parent: 60
-  - uid: 5423
-    components:
-    - type: Transform
-      pos: -29.5,-19.5
-      parent: 60
-  - uid: 5431
-    components:
-    - type: Transform
-      pos: -34.5,-21.5
-      parent: 60
-  - uid: 5436
-    components:
-    - type: Transform
-      pos: -19.5,-18.5
-      parent: 60
   - uid: 5462
     components:
     - type: Transform
@@ -19388,11 +18635,6 @@ entities:
     - type: Transform
       pos: 58.5,5.5
       parent: 60
-  - uid: 5662
-    components:
-    - type: Transform
-      pos: -21.5,-10.5
-      parent: 60
   - uid: 5665
     components:
     - type: Transform
@@ -19428,81 +18670,26 @@ entities:
     - type: Transform
       pos: 55.5,4.5
       parent: 60
-  - uid: 5810
-    components:
-    - type: Transform
-      pos: -20.5,-1.5
-      parent: 60
   - uid: 5838
     components:
     - type: Transform
       pos: -15.5,-29.5
       parent: 60
-  - uid: 5925
+  - uid: 5940
     components:
     - type: Transform
-      pos: -19.5,-3.5
-      parent: 60
-  - uid: 5935
-    components:
-    - type: Transform
-      pos: -32.5,-12.5
-      parent: 60
-  - uid: 5936
-    components:
-    - type: Transform
-      pos: -21.5,-1.5
-      parent: 60
-  - uid: 5972
-    components:
-    - type: Transform
-      pos: -17.5,-18.5
-      parent: 60
-  - uid: 6043
-    components:
-    - type: Transform
-      pos: -31.5,-14.5
+      pos: -6.5,-19.5
       parent: 60
   - uid: 6086
     components:
     - type: Transform
       pos: 52.5,-25.5
       parent: 60
-  - uid: 6087
-    components:
-    - type: Transform
-      pos: -25.5,-20.5
-      parent: 60
-  - uid: 6093
-    components:
-    - type: Transform
-      pos: -33.5,-18.5
-      parent: 60
-  - uid: 6156
-    components:
-    - type: Transform
-      pos: -21.5,-8.5
-      parent: 60
-  - uid: 6173
-    components:
-    - type: Transform
-      pos: -21.5,-11.5
-      parent: 60
-  - uid: 6174
-    components:
-    - type: Transform
-      pos: -31.5,-12.5
-      parent: 60
   - uid: 6216
     components:
     - type: Transform
       pos: -16.5,-54.5
       parent: 60
-  - uid: 6365
-    components:
-    - type: Transform
-      pos: -17.5,-6.5
-      parent: 60
   - uid: 6428
     components:
     - type: Transform
@@ -19518,30 +18705,15 @@ entities:
     - type: Transform
       pos: 49.5,-11.5
       parent: 60
-  - uid: 6467
-    components:
-    - type: Transform
-      pos: -20.5,-12.5
-      parent: 60
-  - uid: 6541
-    components:
-    - type: Transform
-      pos: -30.5,-19.5
-      parent: 60
-  - uid: 6560
-    components:
-    - type: Transform
-      pos: -24.5,-8.5
-      parent: 60
   - uid: 6591
     components:
     - type: Transform
       pos: -57.5,-13.5
       parent: 60
-  - uid: 6611
+  - uid: 6651
     components:
     - type: Transform
-      pos: -23.5,-10.5
+      pos: -15.5,-17.5
       parent: 60
   - uid: 6664
     components:
@@ -19553,25 +18725,10 @@ entities:
     - type: Transform
       pos: -59.5,-21.5
       parent: 60
-  - uid: 6702
+  - uid: 6683
     components:
     - type: Transform
-      pos: -25.5,-19.5
-      parent: 60
-  - uid: 6703
-    components:
-    - type: Transform
-      pos: -25.5,-21.5
-      parent: 60
-  - uid: 6714
-    components:
-    - type: Transform
-      pos: -32.5,-17.5
-      parent: 60
-  - uid: 6733
-    components:
-    - type: Transform
-      pos: -33.5,-20.5
+      pos: -15.5,-18.5
       parent: 60
   - uid: 6740
     components:
@@ -19603,6 +18760,11 @@ entities:
     - type: Transform
       pos: -9.5,-54.5
       parent: 60
+  - uid: 6746
+    components:
+    - type: Transform
+      pos: -33.5,5.5
+      parent: 60
   - uid: 6747
     components:
     - type: Transform
@@ -19623,36 +18785,6 @@ entities:
     - type: Transform
       pos: -7.5,-54.5
       parent: 60
-  - uid: 6761
-    components:
-    - type: Transform
-      pos: -23.5,-9.5
-      parent: 60
-  - uid: 6763
-    components:
-    - type: Transform
-      pos: -21.5,-6.5
-      parent: 60
-  - uid: 6794
-    components:
-    - type: Transform
-      pos: -26.5,-19.5
-      parent: 60
-  - uid: 6818
-    components:
-    - type: Transform
-      pos: -31.5,-15.5
-      parent: 60
-  - uid: 6825
-    components:
-    - type: Transform
-      pos: -33.5,-19.5
-      parent: 60
-  - uid: 6828
-    components:
-    - type: Transform
-      pos: -20.5,-5.5
-      parent: 60
   - uid: 6858
     components:
     - type: Transform
@@ -19663,26 +18795,6 @@ entities:
     - type: Transform
       pos: -52.5,-16.5
       parent: 60
-  - uid: 6885
-    components:
-    - type: Transform
-      pos: -25.5,-15.5
-      parent: 60
-  - uid: 6886
-    components:
-    - type: Transform
-      pos: -27.5,-13.5
-      parent: 60
-  - uid: 6888
-    components:
-    - type: Transform
-      pos: -26.5,-17.5
-      parent: 60
-  - uid: 6889
-    components:
-    - type: Transform
-      pos: -26.5,-15.5
-      parent: 60
   - uid: 6921
     components:
     - type: Transform
@@ -19718,41 +18830,11 @@ entities:
     - type: Transform
       pos: -62.5,-0.5
       parent: 60
-  - uid: 6971
-    components:
-    - type: Transform
-      pos: -20.5,-6.5
-      parent: 60
-  - uid: 6983
-    components:
-    - type: Transform
-      pos: -22.5,-19.5
-      parent: 60
-  - uid: 6992
-    components:
-    - type: Transform
-      pos: -24.5,-19.5
-      parent: 60
-  - uid: 6993
-    components:
-    - type: Transform
-      pos: -27.5,-19.5
-      parent: 60
-  - uid: 7006
-    components:
-    - type: Transform
-      pos: -27.5,-12.5
-      parent: 60
   - uid: 7010
     components:
     - type: Transform
       pos: -34.5,-32.5
       parent: 60
-  - uid: 7041
-    components:
-    - type: Transform
-      pos: -26.5,-11.5
-      parent: 60
   - uid: 7062
     components:
     - type: Transform
@@ -19773,16 +18855,6 @@ entities:
     - type: Transform
       pos: -10.5,27.5
       parent: 60
-  - uid: 7231
-    components:
-    - type: Transform
-      pos: -28.5,-8.5
-      parent: 60
-  - uid: 7284
-    components:
-    - type: Transform
-      pos: -32.5,-15.5
-      parent: 60
   - uid: 7366
     components:
     - type: Transform
@@ -19928,45 +19000,25 @@ entities:
     - type: Transform
       pos: -63.5,7.5
       parent: 60
-  - uid: 7656
-    components:
-    - type: Transform
-      pos: -19.5,-0.5
-      parent: 60
-  - uid: 7685
-    components:
-    - type: Transform
-      pos: -21.5,0.5
-      parent: 60
-  - uid: 7741
-    components:
-    - type: Transform
-      pos: -10.5,-18.5
-      parent: 60
-  - uid: 7786
-    components:
-    - type: Transform
-      pos: -18.5,-3.5
-      parent: 60
-  - uid: 7790
-    components:
-    - type: Transform
-      pos: -21.5,-5.5
-      parent: 60
-  - uid: 7793
-    components:
-    - type: Transform
-      pos: -33.5,-17.5
-      parent: 60
   - uid: 7812
     components:
     - type: Transform
-      pos: -20.5,-10.5
+      pos: -20.5,-2.5
       parent: 60
-  - uid: 7917
+  - uid: 7813
     components:
     - type: Transform
-      pos: -19.5,-5.5
+      pos: -20.5,-1.5
+      parent: 60
+  - uid: 7900
+    components:
+    - type: Transform
+      pos: -20.5,0.5
+      parent: 60
+  - uid: 7901
+    components:
+    - type: Transform
+      pos: -20.5,-0.5
       parent: 60
   - uid: 8190
     components:
@@ -19983,51 +19035,6 @@ entities:
     - type: Transform
       pos: 10.5,-2.5
       parent: 7536
-  - uid: 8223
-    components:
-    - type: Transform
-      pos: -19.5,-20.5
-      parent: 60
-  - uid: 8226
-    components:
-    - type: Transform
-      pos: -21.5,-13.5
-      parent: 60
-  - uid: 8229
-    components:
-    - type: Transform
-      pos: -28.5,-9.5
-      parent: 60
-  - uid: 8247
-    components:
-    - type: Transform
-      pos: -29.5,-12.5
-      parent: 60
-  - uid: 8252
-    components:
-    - type: Transform
-      pos: -21.5,-9.5
-      parent: 60
-  - uid: 8263
-    components:
-    - type: Transform
-      pos: -35.5,-20.5
-      parent: 60
-  - uid: 8265
-    components:
-    - type: Transform
-      pos: -19.5,1.5
-      parent: 60
-  - uid: 8271
-    components:
-    - type: Transform
-      pos: -26.5,-10.5
-      parent: 60
-  - uid: 8273
-    components:
-    - type: Transform
-      pos: -23.5,-12.5
-      parent: 60
   - uid: 8275
     components:
     - type: Transform
@@ -20038,11 +19045,6 @@ entities:
     - type: Transform
       pos: 12.5,-2.5
       parent: 7536
-  - uid: 8282
-    components:
-    - type: Transform
-      pos: -17.5,-11.5
-      parent: 60
   - uid: 8315
     components:
     - type: Transform
@@ -20073,26 +19075,6 @@ entities:
     - type: Transform
       pos: -59.5,-13.5
       parent: 60
-  - uid: 8335
-    components:
-    - type: Transform
-      pos: -35.5,-11.5
-      parent: 60
-  - uid: 8340
-    components:
-    - type: Transform
-      pos: -35.5,-7.5
-      parent: 60
-  - uid: 8341
-    components:
-    - type: Transform
-      pos: -33.5,-9.5
-      parent: 60
-  - uid: 8347
-    components:
-    - type: Transform
-      pos: -31.5,-11.5
-      parent: 60
   - uid: 8356
     components:
     - type: Transform
@@ -20108,11 +19090,26 @@ entities:
     - type: Transform
       pos: 8.5,-2.5
       parent: 7536
+  - uid: 8380
+    components:
+    - type: Transform
+      pos: -30.5,5.5
+      parent: 60
   - uid: 8391
     components:
     - type: Transform
       pos: 5.5,-0.5
       parent: 7536
+  - uid: 8392
+    components:
+    - type: Transform
+      pos: -29.5,5.5
+      parent: 60
+  - uid: 8401
+    components:
+    - type: Transform
+      pos: -28.5,5.5
+      parent: 60
   - uid: 8405
     components:
     - type: Transform
@@ -20128,35 +19125,270 @@ entities:
     - type: Transform
       pos: 5.5,-3.5
       parent: 7536
-  - uid: 8429
+  - uid: 8425
     components:
     - type: Transform
-      pos: -35.5,-10.5
+      pos: -17.5,-19.5
+      parent: 60
+  - uid: 8427
+    components:
+    - type: Transform
+      pos: -18.5,-19.5
+      parent: 60
+  - uid: 8430
+    components:
+    - type: Transform
+      pos: -19.5,-19.5
+      parent: 60
+  - uid: 8434
+    components:
+    - type: Transform
+      pos: -19.5,-18.5
+      parent: 60
+  - uid: 8438
+    components:
+    - type: Transform
+      pos: -20.5,-17.5
+      parent: 60
+  - uid: 8440
+    components:
+    - type: Transform
+      pos: -20.5,-16.5
+      parent: 60
+  - uid: 8441
+    components:
+    - type: Transform
+      pos: -20.5,-15.5
+      parent: 60
+  - uid: 8442
+    components:
+    - type: Transform
+      pos: -20.5,-14.5
+      parent: 60
+  - uid: 8445
+    components:
+    - type: Transform
+      pos: -20.5,-13.5
+      parent: 60
+  - uid: 8446
+    components:
+    - type: Transform
+      pos: -20.5,-12.5
+      parent: 60
+  - uid: 8447
+    components:
+    - type: Transform
+      pos: -20.5,-11.5
+      parent: 60
+  - uid: 8448
+    components:
+    - type: Transform
+      pos: -19.5,-11.5
+      parent: 60
+  - uid: 8449
+    components:
+    - type: Transform
+      pos: -18.5,-11.5
+      parent: 60
+  - uid: 8450
+    components:
+    - type: Transform
+      pos: -18.5,-10.5
+      parent: 60
+  - uid: 8451
+    components:
+    - type: Transform
+      pos: -18.5,-9.5
+      parent: 60
+  - uid: 8452
+    components:
+    - type: Transform
+      pos: -18.5,-12.5
+      parent: 60
+  - uid: 8453
+    components:
+    - type: Transform
+      pos: -18.5,-13.5
+      parent: 60
+  - uid: 8454
+    components:
+    - type: Transform
+      pos: -18.5,-14.5
+      parent: 60
+  - uid: 8455
+    components:
+    - type: Transform
+      pos: -18.5,-15.5
+      parent: 60
+  - uid: 8457
+    components:
+    - type: Transform
+      pos: -6.5,-16.5
+      parent: 60
+  - uid: 8458
+    components:
+    - type: Transform
+      pos: -5.5,-16.5
+      parent: 60
+  - uid: 8462
+    components:
+    - type: Transform
+      pos: -5.5,-17.5
+      parent: 60
+  - uid: 8463
+    components:
+    - type: Transform
+      pos: -15.5,-16.5
+      parent: 60
+  - uid: 8464
+    components:
+    - type: Transform
+      pos: -14.5,-16.5
       parent: 60
   - uid: 8465
     components:
     - type: Transform
-      pos: -25.5,-7.5
+      pos: -13.5,-16.5
+      parent: 60
+  - uid: 8466
+    components:
+    - type: Transform
+      pos: -13.5,-15.5
+      parent: 60
+  - uid: 8467
+    components:
+    - type: Transform
+      pos: -13.5,-14.5
+      parent: 60
+  - uid: 8468
+    components:
+    - type: Transform
+      pos: -13.5,-13.5
+      parent: 60
+  - uid: 8469
+    components:
+    - type: Transform
+      pos: -13.5,-12.5
       parent: 60
   - uid: 8470
     components:
     - type: Transform
-      pos: -24.5,-7.5
+      pos: -13.5,-11.5
+      parent: 60
+  - uid: 8471
+    components:
+    - type: Transform
+      pos: -13.5,-10.5
+      parent: 60
+  - uid: 8473
+    components:
+    - type: Transform
+      pos: -13.5,-9.5
       parent: 60
   - uid: 8474
     components:
     - type: Transform
-      pos: -29.5,-9.5
+      pos: -12.5,-16.5
+      parent: 60
+  - uid: 8477
+    components:
+    - type: Transform
+      pos: -11.5,-16.5
+      parent: 60
+  - uid: 8479
+    components:
+    - type: Transform
+      pos: -10.5,-16.5
+      parent: 60
+  - uid: 8480
+    components:
+    - type: Transform
+      pos: -7.5,-13.5
+      parent: 60
+  - uid: 8481
+    components:
+    - type: Transform
+      pos: -9.5,-16.5
       parent: 60
   - uid: 8482
     components:
     - type: Transform
-      pos: -35.5,-9.5
+      pos: -8.5,-16.5
+      parent: 60
+  - uid: 8493
+    components:
+    - type: Transform
+      pos: -12.5,-13.5
+      parent: 60
+  - uid: 8497
+    components:
+    - type: Transform
+      pos: -11.5,-13.5
+      parent: 60
+  - uid: 8505
+    components:
+    - type: Transform
+      pos: -10.5,-13.5
+      parent: 60
+  - uid: 8507
+    components:
+    - type: Transform
+      pos: -9.5,-13.5
+      parent: 60
+  - uid: 8508
+    components:
+    - type: Transform
+      pos: -8.5,-13.5
+      parent: 60
+  - uid: 8509
+    components:
+    - type: Transform
+      pos: -7.5,-12.5
+      parent: 60
+  - uid: 8510
+    components:
+    - type: Transform
+      pos: -7.5,-14.5
       parent: 60
   - uid: 8512
     components:
     - type: Transform
-      pos: -34.5,-1.5
+      pos: -12.5,-9.5
+      parent: 60
+  - uid: 8514
+    components:
+    - type: Transform
+      pos: -16.5,-19.5
+      parent: 60
+  - uid: 8515
+    components:
+    - type: Transform
+      pos: -15.5,-19.5
+      parent: 60
+  - uid: 8517
+    components:
+    - type: Transform
+      pos: -11.5,-9.5
+      parent: 60
+  - uid: 8520
+    components:
+    - type: Transform
+      pos: -11.5,-10.5
+      parent: 60
+  - uid: 8524
+    components:
+    - type: Transform
+      pos: -30.5,-10.5
+      parent: 60
+  - uid: 8527
+    components:
+    - type: Transform
+      pos: -30.5,-11.5
+      parent: 60
+  - uid: 8528
+    components:
+    - type: Transform
+      pos: -29.5,-11.5
       parent: 60
   - uid: 8531
     components:
@@ -20168,25 +19400,180 @@ entities:
     - type: Transform
       pos: 3.5,-1.5
       parent: 7536
+  - uid: 8565
+    components:
+    - type: Transform
+      pos: -9.5,-19.5
+      parent: 60
+  - uid: 8571
+    components:
+    - type: Transform
+      pos: -28.5,-11.5
+      parent: 60
+  - uid: 8572
+    components:
+    - type: Transform
+      pos: -8.5,-19.5
+      parent: 60
+  - uid: 8574
+    components:
+    - type: Transform
+      pos: -27.5,-11.5
+      parent: 60
+  - uid: 8576
+    components:
+    - type: Transform
+      pos: -7.5,-19.5
+      parent: 60
+  - uid: 8577
+    components:
+    - type: Transform
+      pos: -26.5,-11.5
+      parent: 60
+  - uid: 8578
+    components:
+    - type: Transform
+      pos: -23.5,-22.5
+      parent: 60
+  - uid: 8579
+    components:
+    - type: Transform
+      pos: -23.5,-21.5
+      parent: 60
+  - uid: 8601
+    components:
+    - type: Transform
+      pos: -23.5,-20.5
+      parent: 60
+  - uid: 8602
+    components:
+    - type: Transform
+      pos: -26.5,-1.5
+      parent: 60
+  - uid: 8606
+    components:
+    - type: Transform
+      pos: -26.5,-2.5
+      parent: 60
+  - uid: 8607
+    components:
+    - type: Transform
+      pos: -26.5,-3.5
+      parent: 60
   - uid: 8609
     components:
     - type: Transform
-      pos: -24.5,-4.5
+      pos: -25.5,-3.5
       parent: 60
   - uid: 8610
     components:
     - type: Transform
-      pos: -27.5,-4.5
+      pos: -24.5,-3.5
+      parent: 60
+  - uid: 8675
+    components:
+    - type: Transform
+      pos: -23.5,-3.5
+      parent: 60
+  - uid: 8676
+    components:
+    - type: Transform
+      pos: -23.5,-4.5
+      parent: 60
+  - uid: 8677
+    components:
+    - type: Transform
+      pos: -23.5,-5.5
+      parent: 60
+  - uid: 8678
+    components:
+    - type: Transform
+      pos: -23.5,-6.5
+      parent: 60
+  - uid: 8682
+    components:
+    - type: Transform
+      pos: -22.5,-6.5
+      parent: 60
+  - uid: 8684
+    components:
+    - type: Transform
+      pos: -21.5,-6.5
+      parent: 60
+  - uid: 8694
+    components:
+    - type: Transform
+      pos: -20.5,-6.5
       parent: 60
   - uid: 8695
     components:
     - type: Transform
-      pos: -32.5,2.5
+      pos: -24.5,-2.5
+      parent: 60
+  - uid: 8696
+    components:
+    - type: Transform
+      pos: -24.5,-1.5
       parent: 60
   - uid: 8709
     components:
     - type: Transform
-      pos: -29.5,-4.5
+      pos: -24.5,-0.5
+      parent: 60
+  - uid: 8710
+    components:
+    - type: Transform
+      pos: -24.5,0.5
+      parent: 60
+  - uid: 8711
+    components:
+    - type: Transform
+      pos: -24.5,1.5
+      parent: 60
+  - uid: 8712
+    components:
+    - type: Transform
+      pos: -18.5,-6.5
+      parent: 60
+  - uid: 8713
+    components:
+    - type: Transform
+      pos: -19.5,-6.5
+      parent: 60
+  - uid: 8715
+    components:
+    - type: Transform
+      pos: -24.5,2.5
+      parent: 60
+  - uid: 8717
+    components:
+    - type: Transform
+      pos: -17.5,-6.5
+      parent: 60
+  - uid: 8718
+    components:
+    - type: Transform
+      pos: -16.5,-6.5
+      parent: 60
+  - uid: 8719
+    components:
+    - type: Transform
+      pos: -24.5,3.5
+      parent: 60
+  - uid: 8720
+    components:
+    - type: Transform
+      pos: -27.5,-3.5
+      parent: 60
+  - uid: 8722
+    components:
+    - type: Transform
+      pos: -28.5,-3.5
+      parent: 60
+  - uid: 8735
+    components:
+    - type: Transform
+      pos: -29.5,-3.5
       parent: 60
   - uid: 8739
     components:
@@ -20203,6 +19590,21 @@ entities:
     - type: Transform
       pos: -65.5,2.5
       parent: 60
+  - uid: 8744
+    components:
+    - type: Transform
+      pos: -26.5,5.5
+      parent: 60
+  - uid: 8748
+    components:
+    - type: Transform
+      pos: -27.5,5.5
+      parent: 60
+  - uid: 8749
+    components:
+    - type: Transform
+      pos: -26.5,7.5
+      parent: 60
   - uid: 8757
     components:
     - type: Transform
@@ -20213,6 +19615,16 @@ entities:
     - type: Transform
       pos: -66.5,2.5
       parent: 60
+  - uid: 8770
+    components:
+    - type: Transform
+      pos: -30.5,-3.5
+      parent: 60
+  - uid: 8774
+    components:
+    - type: Transform
+      pos: -30.5,-2.5
+      parent: 60
   - uid: 8786
     components:
     - type: Transform
@@ -20236,13 +19648,23 @@ entities:
   - uid: 8790
     components:
     - type: Transform
-      pos: -33.5,3.5
+      pos: -30.5,-1.5
+      parent: 60
+  - uid: 8892
+    components:
+    - type: Transform
+      pos: -30.5,-0.5
       parent: 60
   - uid: 8893
     components:
     - type: Transform
       pos: -0.5,-3.5
       parent: 7536
+  - uid: 8896
+    components:
+    - type: Transform
+      pos: -30.5,0.5
+      parent: 60
   - uid: 8900
     components:
     - type: Transform
@@ -20283,11 +19705,21 @@ entities:
     - type: Transform
       pos: -3.5,-3.5
       parent: 7536
+  - uid: 8908
+    components:
+    - type: Transform
+      pos: -30.5,1.5
+      parent: 60
   - uid: 8912
     components:
     - type: Transform
       pos: -5.5,-2.5
       parent: 7536
+  - uid: 8920
+    components:
+    - type: Transform
+      pos: -29.5,1.5
+      parent: 60
   - uid: 8924
     components:
     - type: Transform
@@ -20308,6 +19740,16 @@ entities:
     - type: Transform
       pos: -9.5,-2.5
       parent: 7536
+  - uid: 8956
+    components:
+    - type: Transform
+      pos: -28.5,1.5
+      parent: 60
+  - uid: 8957
+    components:
+    - type: Transform
+      pos: -29.5,-1.5
+      parent: 60
   - uid: 8958
     components:
     - type: Transform
@@ -20338,11 +19780,81 @@ entities:
     - type: Transform
       pos: -9.5,-1.5
       parent: 7536
+  - uid: 9011
+    components:
+    - type: Transform
+      pos: -28.5,-1.5
+      parent: 60
+  - uid: 9031
+    components:
+    - type: Transform
+      pos: -28.5,0.5
+      parent: 60
+  - uid: 9032
+    components:
+    - type: Transform
+      pos: -31.5,-3.5
+      parent: 60
+  - uid: 9033
+    components:
+    - type: Transform
+      pos: -32.5,-3.5
+      parent: 60
+  - uid: 9048
+    components:
+    - type: Transform
+      pos: -33.5,-3.5
+      parent: 60
   - uid: 9049
     components:
     - type: Transform
       pos: -9.5,-3.5
       parent: 7536
+  - uid: 9089
+    components:
+    - type: Transform
+      pos: -33.5,-2.5
+      parent: 60
+  - uid: 9111
+    components:
+    - type: Transform
+      pos: -33.5,-1.5
+      parent: 60
+  - uid: 9145
+    components:
+    - type: Transform
+      pos: -33.5,-0.5
+      parent: 60
+  - uid: 9148
+    components:
+    - type: Transform
+      pos: -33.5,0.5
+      parent: 60
+  - uid: 9149
+    components:
+    - type: Transform
+      pos: -34.5,-3.5
+      parent: 60
+  - uid: 9152
+    components:
+    - type: Transform
+      pos: -33.5,-4.5
+      parent: 60
+  - uid: 9156
+    components:
+    - type: Transform
+      pos: -7.5,-16.5
+      parent: 60
+  - uid: 9159
+    components:
+    - type: Transform
+      pos: -31.5,-11.5
+      parent: 60
+  - uid: 9161
+    components:
+    - type: Transform
+      pos: -32.5,-11.5
+      parent: 60
   - uid: 9172
     components:
     - type: Transform
@@ -20383,6 +19895,11 @@ entities:
     - type: Transform
       pos: 40.5,-8.5
       parent: 60
+  - uid: 9223
+    components:
+    - type: Transform
+      pos: -33.5,-11.5
+      parent: 60
   - uid: 9438
     components:
     - type: Transform
@@ -20398,11 +19915,31 @@ entities:
     - type: Transform
       pos: -46.5,16.5
       parent: 60
+  - uid: 9465
+    components:
+    - type: Transform
+      pos: -33.5,-10.5
+      parent: 60
+  - uid: 9546
+    components:
+    - type: Transform
+      pos: -33.5,-9.5
+      parent: 60
+  - uid: 9618
+    components:
+    - type: Transform
+      pos: -33.5,-8.5
+      parent: 60
   - uid: 9630
     components:
     - type: Transform
       pos: -54.5,14.5
       parent: 60
+  - uid: 9681
+    components:
+    - type: Transform
+      pos: -33.5,-7.5
+      parent: 60
   - uid: 9866
     components:
     - type: Transform
@@ -20423,6 +19960,11 @@ entities:
     - type: Transform
       pos: -23.5,-33.5
       parent: 60
+  - uid: 10000
+    components:
+    - type: Transform
+      pos: -32.5,-7.5
+      parent: 60
   - uid: 10001
     components:
     - type: Transform
@@ -20581,22 +20123,12 @@ entities:
   - uid: 10032
     components:
     - type: Transform
-      pos: -15.5,-21.5
+      pos: -31.5,-7.5
       parent: 60
   - uid: 10033
     components:
     - type: Transform
-      pos: -15.5,-20.5
-      parent: 60
-  - uid: 10034
-    components:
-    - type: Transform
-      pos: -15.5,-19.5
-      parent: 60
-  - uid: 10035
-    components:
-    - type: Transform
-      pos: -15.5,-18.5
+      pos: -30.5,-7.5
       parent: 60
   - uid: 10036
     components:
@@ -22006,7 +21538,7 @@ entities:
   - uid: 10368
     components:
     - type: Transform
-      pos: -24.5,-9.5
+      pos: -29.5,-7.5
       parent: 60
   - uid: 10370
     components:
@@ -22471,7 +22003,7 @@ entities:
   - uid: 10479
     components:
     - type: Transform
-      pos: -4.5,-23.5
+      pos: -28.5,-7.5
       parent: 60
   - uid: 10480
     components:
@@ -22823,6 +22355,16 @@ entities:
     - type: Transform
       pos: 0.5,-39.5
       parent: 60
+  - uid: 10585
+    components:
+    - type: Transform
+      pos: -27.5,-7.5
+      parent: 60
+  - uid: 10586
+    components:
+    - type: Transform
+      pos: -27.5,-8.5
+      parent: 60
   - uid: 10592
     components:
     - type: Transform
@@ -22878,6 +22420,11 @@ entities:
     - type: Transform
       pos: 7.5,-31.5
       parent: 60
+  - uid: 10603
+    components:
+    - type: Transform
+      pos: -29.5,-8.5
+      parent: 60
   - uid: 10604
     components:
     - type: Transform
@@ -22958,6 +22505,16 @@ entities:
     - type: Transform
       pos: 1.5,-37.5
       parent: 60
+  - uid: 10621
+    components:
+    - type: Transform
+      pos: -31.5,-12.5
+      parent: 60
+  - uid: 10622
+    components:
+    - type: Transform
+      pos: -31.5,-13.5
+      parent: 60
   - uid: 10623
     components:
     - type: Transform
@@ -23133,21 +22690,76 @@ entities:
     - type: Transform
       pos: -37.5,-24.5
       parent: 60
+  - uid: 10671
+    components:
+    - type: Transform
+      pos: -31.5,-14.5
+      parent: 60
+  - uid: 10672
+    components:
+    - type: Transform
+      pos: -31.5,-15.5
+      parent: 60
   - uid: 10673
     components:
     - type: Transform
-      pos: -21.5,-15.5
+      pos: -31.5,-16.5
+      parent: 60
+  - uid: 10674
+    components:
+    - type: Transform
+      pos: -31.5,-17.5
+      parent: 60
+  - uid: 10676
+    components:
+    - type: Transform
+      pos: -31.5,-18.5
       parent: 60
   - uid: 10677
     components:
     - type: Transform
-      pos: -19.5,-21.5
+      pos: -32.5,-18.5
+      parent: 60
+  - uid: 10678
+    components:
+    - type: Transform
+      pos: -33.5,-18.5
+      parent: 60
+  - uid: 10680
+    components:
+    - type: Transform
+      pos: -30.5,-15.5
+      parent: 60
+  - uid: 10681
+    components:
+    - type: Transform
+      pos: -29.5,-15.5
+      parent: 60
+  - uid: 10682
+    components:
+    - type: Transform
+      pos: -28.5,-15.5
       parent: 60
   - uid: 10683
     components:
     - type: Transform
       pos: 51.5,-37.5
       parent: 60
+  - uid: 10684
+    components:
+    - type: Transform
+      pos: -27.5,-15.5
+      parent: 60
+  - uid: 10685
+    components:
+    - type: Transform
+      pos: -27.5,-16.5
+      parent: 60
+  - uid: 10686
+    components:
+    - type: Transform
+      pos: -27.5,-17.5
+      parent: 60
   - uid: 10703
     components:
     - type: Transform
@@ -23173,6 +22785,16 @@ entities:
     - type: Transform
       pos: 41.5,-42.5
       parent: 60
+  - uid: 10828
+    components:
+    - type: Transform
+      pos: -27.5,-18.5
+      parent: 60
+  - uid: 10829
+    components:
+    - type: Transform
+      pos: -27.5,-19.5
+      parent: 60
   - uid: 10837
     components:
     - type: Transform
@@ -23778,6 +23400,41 @@ entities:
     - type: Transform
       pos: -52.5,-20.5
       parent: 60
+  - uid: 11097
+    components:
+    - type: Transform
+      pos: -27.5,-12.5
+      parent: 60
+  - uid: 11098
+    components:
+    - type: Transform
+      pos: -27.5,-13.5
+      parent: 60
+  - uid: 11127
+    components:
+    - type: Transform
+      pos: -23.5,-19.5
+      parent: 60
+  - uid: 11128
+    components:
+    - type: Transform
+      pos: -23.5,-18.5
+      parent: 60
+  - uid: 11129
+    components:
+    - type: Transform
+      pos: -23.5,-17.5
+      parent: 60
+  - uid: 11151
+    components:
+    - type: Transform
+      pos: -23.5,-16.5
+      parent: 60
+  - uid: 11154
+    components:
+    - type: Transform
+      pos: -23.5,-15.5
+      parent: 60
   - uid: 11163
     components:
     - type: Transform
@@ -24168,6 +23825,11 @@ entities:
     - type: Transform
       pos: 29.5,-33.5
       parent: 60
+  - uid: 11282
+    components:
+    - type: Transform
+      pos: -23.5,-14.5
+      parent: 60
   - uid: 11285
     components:
     - type: Transform
@@ -24263,15 +23925,50 @@ entities:
     - type: Transform
       pos: 24.5,-37.5
       parent: 60
-  - uid: 11373
+  - uid: 11336
     components:
     - type: Transform
-      pos: -31.5,-8.5
+      pos: -23.5,-13.5
       parent: 60
-  - uid: 11374
+  - uid: 11338
     components:
     - type: Transform
-      pos: -26.5,0.5
+      pos: -23.5,-12.5
+      parent: 60
+  - uid: 11339
+    components:
+    - type: Transform
+      pos: -23.5,-11.5
+      parent: 60
+  - uid: 11362
+    components:
+    - type: Transform
+      pos: -23.5,-10.5
+      parent: 60
+  - uid: 11363
+    components:
+    - type: Transform
+      pos: -34.5,-0.5
+      parent: 60
+  - uid: 11364
+    components:
+    - type: Transform
+      pos: -33.5,-6.5
+      parent: 60
+  - uid: 11367
+    components:
+    - type: Transform
+      pos: -33.5,-13.5
+      parent: 60
+  - uid: 11368
+    components:
+    - type: Transform
+      pos: -33.5,-12.5
+      parent: 60
+  - uid: 11372
+    components:
+    - type: Transform
+      pos: -15.5,-5.5
       parent: 60
   - uid: 11380
     components:
@@ -24283,11 +23980,6 @@ entities:
     - type: Transform
       pos: -10.5,-1.5
       parent: 7536
-  - uid: 11383
-    components:
-    - type: Transform
-      pos: -31.5,-7.5
-      parent: 60
   - uid: 11398
     components:
     - type: Transform
@@ -24298,11 +23990,6 @@ entities:
     - type: Transform
       pos: -52.5,-15.5
       parent: 60
-  - uid: 11456
-    components:
-    - type: Transform
-      pos: -30.5,2.5
-      parent: 60
   - uid: 11475
     components:
     - type: Transform
@@ -24408,11 +24095,6 @@ entities:
     - type: Transform
       pos: -12.5,-48.5
       parent: 60
-  - uid: 11559
-    components:
-    - type: Transform
-      pos: -12.5,-16.5
-      parent: 60
   - uid: 11632
     components:
     - type: Transform
@@ -24473,11 +24155,6 @@ entities:
     - type: Transform
       pos: 9.5,-47.5
       parent: 60
-  - uid: 11644
-    components:
-    - type: Transform
-      pos: -12.5,-18.5
-      parent: 60
   - uid: 11645
     components:
     - type: Transform
@@ -24573,11 +24250,6 @@ entities:
     - type: Transform
       pos: -45.5,27.5
       parent: 60
-  - uid: 11724
-    components:
-    - type: Transform
-      pos: -10.5,-19.5
-      parent: 60
   - uid: 11758
     components:
     - type: Transform
@@ -25026,13 +24698,28 @@ entities:
   - uid: 12188
     components:
     - type: Transform
-      pos: -25.5,-4.5
+      pos: -21.5,-18.5
+      parent: 60
+  - uid: 12189
+    components:
+    - type: Transform
+      pos: -21.5,-19.5
+      parent: 60
+  - uid: 12276
+    components:
+    - type: Transform
+      pos: -27.5,-20.5
       parent: 60
   - uid: 12278
     components:
     - type: Transform
       pos: 17.5,-2.5
       parent: 60
+  - uid: 12300
+    components:
+    - type: Transform
+      pos: -27.5,-21.5
+      parent: 60
   - uid: 12317
     components:
     - type: Transform
@@ -25151,7 +24838,7 @@ entities:
   - uid: 12354
     components:
     - type: Transform
-      pos: -12.5,-17.5
+      pos: -28.5,-21.5
       parent: 60
   - uid: 12362
     components:
@@ -25998,16 +25685,6 @@ entities:
     - type: Transform
       pos: 36.5,-16.5
       parent: 60
-  - uid: 13149
-    components:
-    - type: Transform
-      pos: -32.5,0.5
-      parent: 60
-  - uid: 13158
-    components:
-    - type: Transform
-      pos: -34.5,-9.5
-      parent: 60
   - uid: 13203
     components:
     - type: Transform
@@ -26843,161 +26520,41 @@ entities:
     - type: Transform
       pos: 31.5,-51.5
       parent: 60
-  - uid: 13583
-    components:
-    - type: Transform
-      pos: -32.5,-6.5
-      parent: 60
-  - uid: 13585
-    components:
-    - type: Transform
-      pos: -32.5,-10.5
-      parent: 60
-  - uid: 13623
-    components:
-    - type: Transform
-      pos: -32.5,-0.5
-      parent: 60
   - uid: 13655
     components:
     - type: Transform
       pos: -10.5,25.5
       parent: 60
-  - uid: 13662
-    components:
-    - type: Transform
-      pos: -32.5,-1.5
-      parent: 60
   - uid: 13686
     components:
     - type: Transform
       pos: -22.5,28.5
       parent: 60
-  - uid: 13695
-    components:
-    - type: Transform
-      pos: -7.5,-18.5
-      parent: 60
-  - uid: 13697
-    components:
-    - type: Transform
-      pos: -8.5,-18.5
-      parent: 60
   - uid: 13721
     components:
     - type: Transform
       pos: -60.5,27.5
       parent: 60
-  - uid: 13722
-    components:
-    - type: Transform
-      pos: -8.5,-19.5
-      parent: 60
-  - uid: 13723
-    components:
-    - type: Transform
-      pos: -8.5,-20.5
-      parent: 60
   - uid: 13724
     components:
     - type: Transform
       pos: -24.5,28.5
       parent: 60
-  - uid: 13727
-    components:
-    - type: Transform
-      pos: -12.5,-9.5
-      parent: 60
-  - uid: 13728
-    components:
-    - type: Transform
-      pos: -12.5,-10.5
-      parent: 60
-  - uid: 13729
-    components:
-    - type: Transform
-      pos: -9.5,-14.5
-      parent: 60
-  - uid: 13730
-    components:
-    - type: Transform
-      pos: -9.5,-13.5
-      parent: 60
-  - uid: 13731
-    components:
-    - type: Transform
-      pos: -9.5,-12.5
-      parent: 60
-  - uid: 13732
-    components:
-    - type: Transform
-      pos: -9.5,-11.5
-      parent: 60
-  - uid: 13736
-    components:
-    - type: Transform
-      pos: -9.5,-15.5
-      parent: 60
   - uid: 13742
     components:
     - type: Transform
       pos: -23.5,28.5
       parent: 60
-  - uid: 13747
+  - uid: 13767
     components:
     - type: Transform
-      pos: -5.5,-16.5
-      parent: 60
-  - uid: 13778
-    components:
-    - type: Transform
-      pos: -6.5,-16.5
-      parent: 60
-  - uid: 13779
-    components:
-    - type: Transform
-      pos: -6.5,-15.5
-      parent: 60
-  - uid: 13780
-    components:
-    - type: Transform
-      pos: -7.5,-15.5
-      parent: 60
-  - uid: 13781
-    components:
-    - type: Transform
-      pos: -8.5,-15.5
-      parent: 60
-  - uid: 13782
-    components:
-    - type: Transform
-      pos: -6.5,-17.5
-      parent: 60
-  - uid: 13783
-    components:
-    - type: Transform
-      pos: -6.5,-18.5
-      parent: 60
-  - uid: 13786
-    components:
-    - type: Transform
-      pos: -10.5,-14.5
+      pos: -4.5,-23.5
       parent: 60
   - uid: 13892
     components:
     - type: Transform
       pos: -50.5,15.5
       parent: 60
-  - uid: 13929
-    components:
-    - type: Transform
-      pos: -11.5,-14.5
-      parent: 60
-  - uid: 13933
-    components:
-    - type: Transform
-      pos: -12.5,-15.5
-      parent: 60
   - uid: 13955
     components:
     - type: Transform
@@ -27013,21 +26570,6 @@ entities:
     - type: Transform
       pos: 0.5,33.5
       parent: 60
-  - uid: 14227
-    components:
-    - type: Transform
-      pos: -33.5,-1.5
-      parent: 60
-  - uid: 14230
-    components:
-    - type: Transform
-      pos: -26.5,-1.5
-      parent: 60
-  - uid: 14231
-    components:
-    - type: Transform
-      pos: -30.5,1.5
-      parent: 60
   - uid: 14345
     components:
     - type: Transform
@@ -27073,125 +26615,15 @@ entities:
     - type: Transform
       pos: -15.5,8.5
       parent: 60
-  - uid: 14354
-    components:
-    - type: Transform
-      pos: -15.5,7.5
-      parent: 60
-  - uid: 14355
-    components:
-    - type: Transform
-      pos: -15.5,6.5
-      parent: 60
-  - uid: 14356
-    components:
-    - type: Transform
-      pos: -15.5,5.5
-      parent: 60
   - uid: 14357
     components:
     - type: Transform
-      pos: -15.5,3.5
-      parent: 60
-  - uid: 14358
-    components:
-    - type: Transform
-      pos: -15.5,4.5
-      parent: 60
-  - uid: 14359
-    components:
-    - type: Transform
-      pos: -15.5,-17.5
-      parent: 60
-  - uid: 14360
-    components:
-    - type: Transform
-      pos: -15.5,-16.5
-      parent: 60
-  - uid: 14361
-    components:
-    - type: Transform
-      pos: -15.5,-15.5
-      parent: 60
-  - uid: 14362
-    components:
-    - type: Transform
-      pos: -15.5,-14.5
-      parent: 60
-  - uid: 14363
-    components:
-    - type: Transform
-      pos: -15.5,-13.5
-      parent: 60
-  - uid: 14364
-    components:
-    - type: Transform
-      pos: -15.5,-12.5
-      parent: 60
-  - uid: 14365
-    components:
-    - type: Transform
-      pos: -15.5,-11.5
-      parent: 60
-  - uid: 14366
-    components:
-    - type: Transform
-      pos: -15.5,-10.5
-      parent: 60
-  - uid: 14367
-    components:
-    - type: Transform
-      pos: -15.5,-9.5
-      parent: 60
-  - uid: 14368
-    components:
-    - type: Transform
-      pos: -15.5,-8.5
+      pos: -14.5,-5.5
       parent: 60
   - uid: 14369
     components:
     - type: Transform
-      pos: -15.5,-7.5
-      parent: 60
-  - uid: 14370
-    components:
-    - type: Transform
-      pos: -15.5,-6.5
-      parent: 60
-  - uid: 14371
-    components:
-    - type: Transform
-      pos: -15.5,-5.5
-      parent: 60
-  - uid: 14372
-    components:
-    - type: Transform
-      pos: -15.5,2.5
-      parent: 60
-  - uid: 14373
-    components:
-    - type: Transform
-      pos: -15.5,1.5
-      parent: 60
-  - uid: 14374
-    components:
-    - type: Transform
-      pos: -15.5,0.5
-      parent: 60
-  - uid: 14375
-    components:
-    - type: Transform
-      pos: -15.5,-0.5
-      parent: 60
-  - uid: 14376
-    components:
-    - type: Transform
-      pos: -15.5,-1.5
-      parent: 60
-  - uid: 14377
-    components:
-    - type: Transform
-      pos: -15.5,-2.5
+      pos: -14.5,-6.5
       parent: 60
   - uid: 14378
     components:
@@ -27553,41 +26985,6 @@ entities:
     - type: Transform
       pos: -30.5,8.5
       parent: 60
-  - uid: 14585
-    components:
-    - type: Transform
-      pos: -24.5,8.5
-      parent: 60
-  - uid: 14586
-    components:
-    - type: Transform
-      pos: -23.5,8.5
-      parent: 60
-  - uid: 14587
-    components:
-    - type: Transform
-      pos: -22.5,8.5
-      parent: 60
-  - uid: 14588
-    components:
-    - type: Transform
-      pos: -21.5,8.5
-      parent: 60
-  - uid: 14589
-    components:
-    - type: Transform
-      pos: -20.5,8.5
-      parent: 60
-  - uid: 14590
-    components:
-    - type: Transform
-      pos: -19.5,8.5
-      parent: 60
-  - uid: 14591
-    components:
-    - type: Transform
-      pos: -18.5,8.5
-      parent: 60
   - uid: 14592
     components:
     - type: Transform
@@ -27713,6 +27110,11 @@ entities:
     - type: Transform
       pos: -22.5,17.5
       parent: 60
+  - uid: 14625
+    components:
+    - type: Transform
+      pos: -21.5,-17.5
+      parent: 60
   - uid: 14626
     components:
     - type: Transform
@@ -27721,17 +27123,17 @@ entities:
   - uid: 14631
     components:
     - type: Transform
-      pos: -26.5,-4.5
+      pos: -19.5,-17.5
       parent: 60
-  - uid: 14652
+  - uid: 14701
     components:
     - type: Transform
-      pos: -12.5,-14.5
+      pos: -25.5,-15.5
       parent: 60
   - uid: 14726
     components:
     - type: Transform
-      pos: -34.5,-2.5
+      pos: -24.5,-19.5
       parent: 60
   - uid: 14904
     components:
@@ -27816,7 +27218,12 @@ entities:
   - uid: 15183
     components:
     - type: Transform
-      pos: -26.5,-2.5
+      pos: -12.5,3.5
+      parent: 60
+  - uid: 15264
+    components:
+    - type: Transform
+      pos: -25.5,-19.5
       parent: 60
   - uid: 15272
     components:
@@ -28128,21 +27535,16 @@ entities:
     - type: Transform
       pos: -50.5,16.5
       parent: 60
-  - uid: 16164
+  - uid: 15899
     components:
     - type: Transform
-      pos: -30.5,-0.5
+      pos: -12.5,4.5
       parent: 60
   - uid: 16181
     components:
     - type: Transform
       pos: -7.5,46.5
       parent: 60
-  - uid: 16447
-    components:
-    - type: Transform
-      pos: -26.5,-0.5
-      parent: 60
   - uid: 16511
     components:
     - type: Transform
@@ -29868,11 +29270,6 @@ entities:
     - type: Transform
       pos: -11.5,4.5
       parent: 60
-  - uid: 17982
-    components:
-    - type: Transform
-      pos: -11.5,3.5
-      parent: 60
   - uid: 17989
     components:
     - type: Transform
@@ -29883,11 +29280,6 @@ entities:
     - type: Transform
       pos: -44.5,15.5
       parent: 60
-  - uid: 18104
-    components:
-    - type: Transform
-      pos: -32.5,-9.5
-      parent: 60
   - uid: 18213
     components:
     - type: Transform
@@ -30258,16 +29650,6 @@ entities:
     - type: Transform
       pos: 3.5,-10.5
       parent: 60
-  - uid: 18590
-    components:
-    - type: Transform
-      pos: -24.5,-3.5
-      parent: 60
-  - uid: 18606
-    components:
-    - type: Transform
-      pos: -31.5,2.5
-      parent: 60
   - uid: 18631
     components:
     - type: Transform
@@ -31563,11 +30945,6 @@ entities:
     - type: Transform
       pos: 8.5,-23.5
       parent: 60
-  - uid: 21074
-    components:
-    - type: Transform
-      pos: -28.5,-4.5
-      parent: 60
   - uid: 21093
     components:
     - type: Transform
@@ -31688,11 +31065,6 @@ entities:
     - type: Transform
       pos: 50.5,-45.5
       parent: 60
-  - uid: 21158
-    components:
-    - type: Transform
-      pos: -23.5,-4.5
-      parent: 60
   - uid: 21171
     components:
     - type: Transform
@@ -31828,16 +31200,6 @@ entities:
     - type: Transform
       pos: -80.5,17.5
       parent: 60
-  - uid: 21380
-    components:
-    - type: Transform
-      pos: -24.5,-2.5
-      parent: 60
-  - uid: 21409
-    components:
-    - type: Transform
-      pos: -23.5,-19.5
-      parent: 60
   - uid: 21413
     components:
     - type: Transform
@@ -31943,11 +31305,6 @@ entities:
     - type: Transform
       pos: -82.5,17.5
       parent: 60
-  - uid: 21770
-    components:
-    - type: Transform
-      pos: -26.5,-3.5
-      parent: 60
   - uid: 21792
     components:
     - type: Transform
@@ -35119,6 +34476,11 @@ entities:
     - type: Transform
       pos: 43.5,-3.5
       parent: 60
+  - uid: 1149
+    components:
+    - type: Transform
+      pos: -27.5,5.5
+      parent: 60
   - uid: 1203
     components:
     - type: Transform
@@ -35154,6 +34516,81 @@ entities:
     - type: Transform
       pos: 1.5,-38.5
       parent: 60
+  - uid: 1475
+    components:
+    - type: Transform
+      pos: -36.5,-13.5
+      parent: 60
+  - uid: 1477
+    components:
+    - type: Transform
+      pos: -36.5,-14.5
+      parent: 60
+  - uid: 1478
+    components:
+    - type: Transform
+      pos: -36.5,-15.5
+      parent: 60
+  - uid: 1480
+    components:
+    - type: Transform
+      pos: -36.5,-16.5
+      parent: 60
+  - uid: 1483
+    components:
+    - type: Transform
+      pos: -36.5,-17.5
+      parent: 60
+  - uid: 1484
+    components:
+    - type: Transform
+      pos: -36.5,-18.5
+      parent: 60
+  - uid: 1485
+    components:
+    - type: Transform
+      pos: -36.5,-19.5
+      parent: 60
+  - uid: 1486
+    components:
+    - type: Transform
+      pos: -36.5,-20.5
+      parent: 60
+  - uid: 1487
+    components:
+    - type: Transform
+      pos: -36.5,-21.5
+      parent: 60
+  - uid: 1488
+    components:
+    - type: Transform
+      pos: -36.5,-22.5
+      parent: 60
+  - uid: 1491
+    components:
+    - type: Transform
+      pos: -35.5,-22.5
+      parent: 60
+  - uid: 1492
+    components:
+    - type: Transform
+      pos: -34.5,-22.5
+      parent: 60
+  - uid: 1502
+    components:
+    - type: Transform
+      pos: -33.5,-22.5
+      parent: 60
+  - uid: 1503
+    components:
+    - type: Transform
+      pos: -32.5,-22.5
+      parent: 60
+  - uid: 1504
+    components:
+    - type: Transform
+      pos: -31.5,-22.5
+      parent: 60
   - uid: 1507
     components:
     - type: Transform
@@ -35169,6 +34606,76 @@ entities:
     - type: Transform
       pos: 31.5,-58.5
       parent: 60
+  - uid: 1510
+    components:
+    - type: Transform
+      pos: -30.5,-22.5
+      parent: 60
+  - uid: 1527
+    components:
+    - type: Transform
+      pos: -29.5,-22.5
+      parent: 60
+  - uid: 1528
+    components:
+    - type: Transform
+      pos: -28.5,-22.5
+      parent: 60
+  - uid: 1529
+    components:
+    - type: Transform
+      pos: -27.5,-22.5
+      parent: 60
+  - uid: 1530
+    components:
+    - type: Transform
+      pos: -26.5,-22.5
+      parent: 60
+  - uid: 1532
+    components:
+    - type: Transform
+      pos: -25.5,-22.5
+      parent: 60
+  - uid: 1534
+    components:
+    - type: Transform
+      pos: -24.5,-22.5
+      parent: 60
+  - uid: 1535
+    components:
+    - type: Transform
+      pos: -23.5,-22.5
+      parent: 60
+  - uid: 1536
+    components:
+    - type: Transform
+      pos: -22.5,-22.5
+      parent: 60
+  - uid: 1537
+    components:
+    - type: Transform
+      pos: -21.5,-22.5
+      parent: 60
+  - uid: 1540
+    components:
+    - type: Transform
+      pos: -20.5,-22.5
+      parent: 60
+  - uid: 1541
+    components:
+    - type: Transform
+      pos: -19.5,-22.5
+      parent: 60
+  - uid: 1542
+    components:
+    - type: Transform
+      pos: -17.5,-22.5
+      parent: 60
+  - uid: 1545
+    components:
+    - type: Transform
+      pos: -18.5,-22.5
+      parent: 60
   - uid: 1582
     components:
     - type: Transform
@@ -35259,6 +34766,21 @@ entities:
     - type: Transform
       pos: 4.5,-36.5
       parent: 60
+  - uid: 1793
+    components:
+    - type: Transform
+      pos: -15.5,7.5
+      parent: 60
+  - uid: 1797
+    components:
+    - type: Transform
+      pos: -29.5,5.5
+      parent: 60
+  - uid: 1820
+    components:
+    - type: Transform
+      pos: -26.5,5.5
+      parent: 60
   - uid: 1865
     components:
     - type: Transform
@@ -35474,11 +34996,6 @@ entities:
     - type: Transform
       pos: 1.5,-39.5
       parent: 60
-  - uid: 4018
-    components:
-    - type: Transform
-      pos: -27.5,5.5
-      parent: 60
   - uid: 4031
     components:
     - type: Transform
@@ -36029,6 +35546,11 @@ entities:
     - type: Transform
       pos: -57.5,-18.5
       parent: 60
+  - uid: 6541
+    components:
+    - type: Transform
+      pos: -28.5,5.5
+      parent: 60
   - uid: 6670
     components:
     - type: Transform
@@ -36439,20 +35961,10 @@ entities:
     - type: Transform
       pos: -72.5,-21.5
       parent: 60
-  - uid: 8441
+  - uid: 8506
     components:
     - type: Transform
-      pos: -22.5,4.5
-      parent: 60
-  - uid: 8455
-    components:
-    - type: Transform
-      pos: -16.5,-14.5
-      parent: 60
-  - uid: 8505
-    components:
-    - type: Transform
-      pos: -16.5,-16.5
+      pos: -15.5,3.5
       parent: 60
   - uid: 8628
     components:
@@ -36514,21 +36026,6 @@ entities:
     - type: Transform
       pos: -80.5,-12.5
       parent: 60
-  - uid: 8696
-    components:
-    - type: Transform
-      pos: -16.5,-18.5
-      parent: 60
-  - uid: 8711
-    components:
-    - type: Transform
-      pos: -16.5,-21.5
-      parent: 60
-  - uid: 8715
-    components:
-    - type: Transform
-      pos: -16.5,-17.5
-      parent: 60
   - uid: 8727
     components:
     - type: Transform
@@ -36579,11 +36076,6 @@ entities:
     - type: Transform
       pos: 41.5,-44.5
       parent: 60
-  - uid: 8770
-    components:
-    - type: Transform
-      pos: -16.5,-19.5
-      parent: 60
   - uid: 8772
     components:
     - type: Transform
@@ -36659,10 +36151,10 @@ entities:
     - type: Transform
       pos: 34.5,-70.5
       parent: 60
-  - uid: 9031
+  - uid: 9052
     components:
     - type: Transform
-      pos: -16.5,-12.5
+      pos: -15.5,8.5
       parent: 60
   - uid: 9055
     components:
@@ -36834,11 +36326,6 @@ entities:
     - type: Transform
       pos: 24.5,-76.5
       parent: 60
-  - uid: 9283
-    components:
-    - type: Transform
-      pos: -26.5,5.5
-      parent: 60
   - uid: 9296
     components:
     - type: Transform
@@ -38494,11 +37981,6 @@ entities:
     - type: Transform
       pos: -5.5,-49.5
       parent: 60
-  - uid: 11510
-    components:
-    - type: Transform
-      pos: -17.5,-7.5
-      parent: 60
   - uid: 11515
     components:
     - type: Transform
@@ -38634,11 +38116,6 @@ entities:
     - type: Transform
       pos: -47.5,27.5
       parent: 60
-  - uid: 11604
-    components:
-    - type: Transform
-      pos: -26.5,4.5
-      parent: 60
   - uid: 11605
     components:
     - type: Transform
@@ -38759,11 +38236,6 @@ entities:
     - type: Transform
       pos: 38.5,-76.5
       parent: 60
-  - uid: 11759
-    components:
-    - type: Transform
-      pos: -16.5,-13.5
-      parent: 60
   - uid: 11786
     components:
     - type: Transform
@@ -39064,11 +38536,6 @@ entities:
     - type: Transform
       pos: 35.5,-3.5
       parent: 60
-  - uid: 11978
-    components:
-    - type: Transform
-      pos: -16.5,-15.5
-      parent: 60
   - uid: 11983
     components:
     - type: Transform
@@ -39284,11 +38751,6 @@ entities:
     - type: Transform
       pos: 7.5,-37.5
       parent: 60
-  - uid: 12189
-    components:
-    - type: Transform
-      pos: -18.5,3.5
-      parent: 60
   - uid: 12198
     components:
     - type: Transform
@@ -39564,11 +39026,6 @@ entities:
     - type: Transform
       pos: -32.5,5.5
       parent: 60
-  - uid: 12685
-    components:
-    - type: Transform
-      pos: -18.5,4.5
-      parent: 60
   - uid: 12696
     components:
     - type: Transform
@@ -39864,45 +39321,25 @@ entities:
     - type: Transform
       pos: -16.5,-24.5
       parent: 60
-  - uid: 13478
-    components:
-    - type: Transform
-      pos: -19.5,4.5
-      parent: 60
   - uid: 13532
     components:
     - type: Transform
       pos: -58.5,9.5
       parent: 60
-  - uid: 13582
-    components:
-    - type: Transform
-      pos: -16.5,-20.5
-      parent: 60
-  - uid: 13624
-    components:
-    - type: Transform
-      pos: -25.5,4.5
-      parent: 60
   - uid: 13660
     components:
     - type: Transform
       pos: -15.5,-25.5
       parent: 60
-  - uid: 13667
-    components:
-    - type: Transform
-      pos: -23.5,4.5
-      parent: 60
   - uid: 13694
     components:
     - type: Transform
       pos: -112.5,31.5
       parent: 60
-  - uid: 13972
+  - uid: 13975
     components:
     - type: Transform
-      pos: -21.5,4.5
+      pos: -15.5,6.5
       parent: 60
   - uid: 14212
     components:
@@ -39914,6 +39351,11 @@ entities:
     - type: Transform
       pos: -10.5,24.5
       parent: 60
+  - uid: 14590
+    components:
+    - type: Transform
+      pos: -15.5,5.5
+      parent: 60
   - uid: 15124
     components:
     - type: Transform
@@ -41254,11 +40696,6 @@ entities:
     - type: Transform
       pos: 0.5,28.5
       parent: 60
-  - uid: 16456
-    components:
-    - type: Transform
-      pos: -28.5,5.5
-      parent: 60
   - uid: 16513
     components:
     - type: Transform
@@ -41704,6 +41141,11 @@ entities:
     - type: Transform
       pos: -33.5,5.5
       parent: 60
+  - uid: 17493
+    components:
+    - type: Transform
+      pos: -15.5,4.5
+      parent: 60
   - uid: 17674
     components:
     - type: Transform
@@ -41759,61 +41201,16 @@ entities:
     - type: Transform
       pos: -14.5,3.5
       parent: 60
-  - uid: 17950
-    components:
-    - type: Transform
-      pos: -15.5,3.5
-      parent: 60
-  - uid: 17951
-    components:
-    - type: Transform
-      pos: -16.5,3.5
-      parent: 60
   - uid: 17956
     components:
     - type: Transform
       pos: -36.5,5.5
       parent: 60
-  - uid: 17959
-    components:
-    - type: Transform
-      pos: -35.5,-6.5
-      parent: 60
-  - uid: 17962
-    components:
-    - type: Transform
-      pos: -35.5,-11.5
-      parent: 60
   - uid: 17963
     components:
     - type: Transform
       pos: -36.5,-6.5
       parent: 60
-  - uid: 17964
-    components:
-    - type: Transform
-      pos: -14.5,4.5
-      parent: 60
-  - uid: 17965
-    components:
-    - type: Transform
-      pos: -14.5,5.5
-      parent: 60
-  - uid: 17966
-    components:
-    - type: Transform
-      pos: -14.5,6.5
-      parent: 60
-  - uid: 17967
-    components:
-    - type: Transform
-      pos: -14.5,7.5
-      parent: 60
-  - uid: 17968
-    components:
-    - type: Transform
-      pos: -14.5,8.5
-      parent: 60
   - uid: 17969
     components:
     - type: Transform
@@ -41839,11 +41236,6 @@ entities:
     - type: Transform
       pos: 11.5,-3.5
       parent: 60
-  - uid: 17987
-    components:
-    - type: Transform
-      pos: -35.5,-7.5
-      parent: 60
   - uid: 18001
     components:
     - type: Transform
@@ -41854,21 +41246,6 @@ entities:
     - type: Transform
       pos: 10.5,-3.5
       parent: 60
-  - uid: 18008
-    components:
-    - type: Transform
-      pos: -16.5,2.5
-      parent: 60
-  - uid: 18092
-    components:
-    - type: Transform
-      pos: -35.5,-9.5
-      parent: 60
-  - uid: 18103
-    components:
-    - type: Transform
-      pos: -17.5,-11.5
-      parent: 60
   - uid: 18108
     components:
     - type: Transform
@@ -42199,91 +41576,16 @@ entities:
     - type: Transform
       pos: -0.5,-8.5
       parent: 60
-  - uid: 18463
-    components:
-    - type: Transform
-      pos: -35.5,-5.5
-      parent: 60
   - uid: 18496
     components:
     - type: Transform
       pos: -4.5,42.5
       parent: 60
-  - uid: 18509
-    components:
-    - type: Transform
-      pos: -16.5,0.5
-      parent: 60
-  - uid: 18510
-    components:
-    - type: Transform
-      pos: -16.5,-1.5
-      parent: 60
   - uid: 18549
     components:
     - type: Transform
       pos: 7.5,40.5
       parent: 60
-  - uid: 18592
-    components:
-    - type: Transform
-      pos: -35.5,-10.5
-      parent: 60
-  - uid: 18594
-    components:
-    - type: Transform
-      pos: -16.5,1.5
-      parent: 60
-  - uid: 18595
-    components:
-    - type: Transform
-      pos: -16.5,-9.5
-      parent: 60
-  - uid: 18596
-    components:
-    - type: Transform
-      pos: -16.5,-0.5
-      parent: 60
-  - uid: 18597
-    components:
-    - type: Transform
-      pos: -17.5,-9.5
-      parent: 60
-  - uid: 18598
-    components:
-    - type: Transform
-      pos: -16.5,-2.5
-      parent: 60
-  - uid: 18599
-    components:
-    - type: Transform
-      pos: -17.5,-10.5
-      parent: 60
-  - uid: 18600
-    components:
-    - type: Transform
-      pos: -16.5,-5.5
-      parent: 60
-  - uid: 18602
-    components:
-    - type: Transform
-      pos: -16.5,-8.5
-      parent: 60
-  - uid: 18603
-    components:
-    - type: Transform
-      pos: -16.5,-3.5
-      parent: 60
-  - uid: 18604
-    components:
-    - type: Transform
-      pos: -16.5,-7.5
-      parent: 60
-  - uid: 18605
-    components:
-    - type: Transform
-      pos: -16.5,-4.5
-      parent: 60
   - uid: 18610
     components:
     - type: Transform
@@ -42404,11 +41706,6 @@ entities:
     - type: Transform
       pos: -7.5,55.5
       parent: 60
-  - uid: 18766
-    components:
-    - type: Transform
-      pos: -16.5,-6.5
-      parent: 60
   - uid: 18775
     components:
     - type: Transform
@@ -42444,11 +41741,6 @@ entities:
     - type: Transform
       pos: 25.5,4.5
       parent: 60
-  - uid: 18998
-    components:
-    - type: Transform
-      pos: -16.5,-10.5
-      parent: 60
   - uid: 19043
     components:
     - type: Transform
@@ -44099,31 +43391,11 @@ entities:
     - type: Transform
       pos: -25.5,82.5
       parent: 60
-  - uid: 21012
-    components:
-    - type: Transform
-      pos: -16.5,-11.5
-      parent: 60
-  - uid: 21050
-    components:
-    - type: Transform
-      pos: -29.5,5.5
-      parent: 60
   - uid: 21069
     components:
     - type: Transform
       pos: -30.5,5.5
       parent: 60
-  - uid: 21214
-    components:
-    - type: Transform
-      pos: -20.5,4.5
-      parent: 60
-  - uid: 21217
-    components:
-    - type: Transform
-      pos: -24.5,4.5
-      parent: 60
   - uid: 21429
     components:
     - type: Transform
@@ -44159,11 +43431,6 @@ entities:
     - type: Transform
       pos: -16.5,-22.5
       parent: 60
-  - uid: 21765
-    components:
-    - type: Transform
-      pos: -17.5,-6.5
-      parent: 60
   - uid: 21781
     components:
     - type: Transform
@@ -44289,11 +43556,6 @@ entities:
     - type: Transform
       pos: 4.5,61.5
       parent: 60
-  - uid: 23644
-    components:
-    - type: Transform
-      pos: -17.5,3.5
-      parent: 60
   - uid: 23697
     components:
     - type: Transform
@@ -44334,11 +43596,6 @@ entities:
     - type: Transform
       pos: -10.5,56.5
       parent: 60
-  - uid: 23830
-    components:
-    - type: Transform
-      pos: -17.5,-5.5
-      parent: 60
   - uid: 23897
     components:
     - type: Transform
@@ -45043,20 +44300,15 @@ entities:
     - type: Transform
       pos: -11.5,4.5
       parent: 60
-  - uid: 84
-    components:
-    - type: Transform
-      pos: -31.5,2.5
-      parent: 60
   - uid: 88
     components:
     - type: Transform
-      pos: -30.5,2.5
+      pos: -32.5,5.5
       parent: 60
   - uid: 113
     components:
     - type: Transform
-      pos: -21.5,-8.5
+      pos: -24.5,4.5
       parent: 60
   - uid: 117
     components:
@@ -45068,21 +44320,6 @@ entities:
     - type: Transform
       pos: 4.5,-32.5
       parent: 60
-  - uid: 121
-    components:
-    - type: Transform
-      pos: -22.5,-3.5
-      parent: 60
-  - uid: 149
-    components:
-    - type: Transform
-      pos: -21.5,-5.5
-      parent: 60
-  - uid: 150
-    components:
-    - type: Transform
-      pos: -21.5,-4.5
-      parent: 60
   - uid: 156
     components:
     - type: Transform
@@ -45093,6 +44330,16 @@ entities:
     - type: Transform
       pos: 41.5,-18.5
       parent: 60
+  - uid: 178
+    components:
+    - type: Transform
+      pos: -24.5,5.5
+      parent: 60
+  - uid: 234
+    components:
+    - type: Transform
+      pos: -24.5,3.5
+      parent: 60
   - uid: 241
     components:
     - type: Transform
@@ -45133,11 +44380,26 @@ entities:
     - type: Transform
       pos: 50.5,-21.5
       parent: 60
+  - uid: 430
+    components:
+    - type: Transform
+      pos: -33.5,5.5
+      parent: 60
+  - uid: 558
+    components:
+    - type: Transform
+      pos: -25.5,5.5
+      parent: 60
   - uid: 592
     components:
     - type: Transform
       pos: -12.5,1.5
       parent: 60
+  - uid: 628
+    components:
+    - type: Transform
+      pos: -24.5,0.5
+      parent: 60
   - uid: 718
     components:
     - type: Transform
@@ -45153,6 +44415,11 @@ entities:
     - type: Transform
       pos: 51.5,-21.5
       parent: 60
+  - uid: 782
+    components:
+    - type: Transform
+      pos: -27.5,5.5
+      parent: 60
   - uid: 814
     components:
     - type: Transform
@@ -45163,6 +44430,16 @@ entities:
     - type: Transform
       pos: 43.5,-18.5
       parent: 60
+  - uid: 969
+    components:
+    - type: Transform
+      pos: -24.5,1.5
+      parent: 60
+  - uid: 975
+    components:
+    - type: Transform
+      pos: -24.5,2.5
+      parent: 60
   - uid: 994
     components:
     - type: Transform
@@ -45183,6 +44460,11 @@ entities:
     - type: Transform
       pos: 11.5,-19.5
       parent: 60
+  - uid: 1462
+    components:
+    - type: Transform
+      pos: -28.5,5.5
+      parent: 60
   - uid: 1499
     components:
     - type: Transform
@@ -45193,6 +44475,11 @@ entities:
     - type: Transform
       pos: 4.5,-27.5
       parent: 60
+  - uid: 1548
+    components:
+    - type: Transform
+      pos: -30.5,5.5
+      parent: 60
   - uid: 1554
     components:
     - type: Transform
@@ -45233,11 +44520,31 @@ entities:
     - type: Transform
       pos: 52.5,-30.5
       parent: 60
+  - uid: 1696
+    components:
+    - type: Transform
+      pos: -24.5,-1.5
+      parent: 60
+  - uid: 1700
+    components:
+    - type: Transform
+      pos: -24.5,-0.5
+      parent: 60
+  - uid: 1701
+    components:
+    - type: Transform
+      pos: -24.5,-3.5
+      parent: 60
   - uid: 1704
     components:
     - type: Transform
       pos: 4.5,-29.5
       parent: 60
+  - uid: 1708
+    components:
+    - type: Transform
+      pos: -24.5,-2.5
+      parent: 60
   - uid: 1738
     components:
     - type: Transform
@@ -45273,31 +44580,11 @@ entities:
     - type: Transform
       pos: 52.5,-28.5
       parent: 60
-  - uid: 1948
-    components:
-    - type: Transform
-      pos: -30.5,-0.5
-      parent: 60
-  - uid: 1953
-    components:
-    - type: Transform
-      pos: -30.5,-1.5
-      parent: 60
-  - uid: 1957
-    components:
-    - type: Transform
-      pos: -25.5,-2.5
-      parent: 60
   - uid: 2017
     components:
     - type: Transform
       pos: -34.5,2.5
       parent: 60
-  - uid: 2042
-    components:
-    - type: Transform
-      pos: -32.5,2.5
-      parent: 60
   - uid: 2058
     components:
     - type: Transform
@@ -45318,26 +44605,6 @@ entities:
     - type: Transform
       pos: 11.5,-20.5
       parent: 60
-  - uid: 2086
-    components:
-    - type: Transform
-      pos: -25.5,-3.5
-      parent: 60
-  - uid: 2087
-    components:
-    - type: Transform
-      pos: -18.5,0.5
-      parent: 60
-  - uid: 2091
-    components:
-    - type: Transform
-      pos: -21.5,-6.5
-      parent: 60
-  - uid: 2092
-    components:
-    - type: Transform
-      pos: -30.5,-8.5
-      parent: 60
   - uid: 2136
     components:
     - type: Transform
@@ -45453,41 +44720,21 @@ entities:
     - type: Transform
       pos: 40.5,-18.5
       parent: 60
-  - uid: 3172
-    components:
-    - type: Transform
-      pos: -7.5,-17.5
-      parent: 60
   - uid: 3185
     components:
     - type: Transform
       pos: -55.5,-18.5
       parent: 60
-  - uid: 3196
-    components:
-    - type: Transform
-      pos: -20.5,-1.5
-      parent: 60
   - uid: 3203
     components:
     - type: Transform
       pos: -52.5,-18.5
       parent: 60
-  - uid: 3217
-    components:
-    - type: Transform
-      pos: -31.5,-12.5
-      parent: 60
   - uid: 3222
     components:
     - type: Transform
       pos: 37.5,-9.5
       parent: 60
-  - uid: 3225
-    components:
-    - type: Transform
-      pos: -8.5,-17.5
-      parent: 60
   - uid: 3232
     components:
     - type: Transform
@@ -45508,30 +44755,10 @@ entities:
     - type: Transform
       pos: -9.5,29.5
       parent: 60
-  - uid: 3638
+  - uid: 4201
     components:
     - type: Transform
-      pos: -6.5,-17.5
-      parent: 60
-  - uid: 4010
-    components:
-    - type: Transform
-      pos: -30.5,-2.5
-      parent: 60
-  - uid: 4011
-    components:
-    - type: Transform
-      pos: -28.5,-15.5
-      parent: 60
-  - uid: 4080
-    components:
-    - type: Transform
-      pos: -25.5,-18.5
-      parent: 60
-  - uid: 4108
-    components:
-    - type: Transform
-      pos: -13.5,-14.5
+      pos: -26.5,5.5
       parent: 60
   - uid: 4495
     components:
@@ -45573,6 +44800,11 @@ entities:
     - type: Transform
       pos: 6.5,-53.5
       parent: 60
+  - uid: 4746
+    components:
+    - type: Transform
+      pos: -29.5,5.5
+      parent: 60
   - uid: 4758
     components:
     - type: Transform
@@ -45743,6 +44975,11 @@ entities:
     - type: Transform
       pos: 36.5,-15.5
       parent: 60
+  - uid: 5837
+    components:
+    - type: Transform
+      pos: -31.5,5.5
+      parent: 60
   - uid: 5898
     components:
     - type: Transform
@@ -46058,256 +45295,11 @@ entities:
     - type: Transform
       pos: 41.5,-48.5
       parent: 60
-  - uid: 8280
-    components:
-    - type: Transform
-      pos: -19.5,0.5
-      parent: 60
-  - uid: 8281
-    components:
-    - type: Transform
-      pos: -30.5,-4.5
-      parent: 60
-  - uid: 8283
-    components:
-    - type: Transform
-      pos: -30.5,-7.5
-      parent: 60
-  - uid: 8284
-    components:
-    - type: Transform
-      pos: -29.5,-3.5
-      parent: 60
-  - uid: 8285
-    components:
-    - type: Transform
-      pos: -30.5,-5.5
-      parent: 60
-  - uid: 8286
-    components:
-    - type: Transform
-      pos: -30.5,-3.5
-      parent: 60
-  - uid: 8287
-    components:
-    - type: Transform
-      pos: -30.5,-10.5
-      parent: 60
-  - uid: 8288
-    components:
-    - type: Transform
-      pos: -21.5,-7.5
-      parent: 60
-  - uid: 8289
-    components:
-    - type: Transform
-      pos: -24.5,-3.5
-      parent: 60
-  - uid: 8290
-    components:
-    - type: Transform
-      pos: -32.5,-12.5
-      parent: 60
-  - uid: 8293
-    components:
-    - type: Transform
-      pos: -27.5,-2.5
-      parent: 60
-  - uid: 8294
-    components:
-    - type: Transform
-      pos: -18.5,-1.5
-      parent: 60
-  - uid: 8295
-    components:
-    - type: Transform
-      pos: -26.5,-3.5
-      parent: 60
-  - uid: 8326
-    components:
-    - type: Transform
-      pos: -28.5,-3.5
-      parent: 60
-  - uid: 8327
-    components:
-    - type: Transform
-      pos: -27.5,-3.5
-      parent: 60
-  - uid: 8328
-    components:
-    - type: Transform
-      pos: -19.5,1.5
-      parent: 60
-  - uid: 8329
-    components:
-    - type: Transform
-      pos: -25.5,-20.5
-      parent: 60
-  - uid: 8330
-    components:
-    - type: Transform
-      pos: -30.5,-9.5
-      parent: 60
-  - uid: 8331
-    components:
-    - type: Transform
-      pos: -24.5,-2.5
-      parent: 60
-  - uid: 8332
-    components:
-    - type: Transform
-      pos: -30.5,-11.5
-      parent: 60
-  - uid: 8333
-    components:
-    - type: Transform
-      pos: -30.5,-12.5
-      parent: 60
-  - uid: 8334
-    components:
-    - type: Transform
-      pos: -26.5,-15.5
-      parent: 60
-  - uid: 8338
-    components:
-    - type: Transform
-      pos: -22.5,-15.5
-      parent: 60
-  - uid: 8351
-    components:
-    - type: Transform
-      pos: -25.5,-16.5
-      parent: 60
-  - uid: 8392
-    components:
-    - type: Transform
-      pos: -21.5,-10.5
-      parent: 60
-  - uid: 8401
-    components:
-    - type: Transform
-      pos: -30.5,-6.5
-      parent: 60
   - uid: 8402
     components:
     - type: Transform
       pos: -25.5,52.5
       parent: 60
-  - uid: 8403
-    components:
-    - type: Transform
-      pos: -18.5,-0.5
-      parent: 60
-  - uid: 8418
-    components:
-    - type: Transform
-      pos: -21.5,-2.5
-      parent: 60
-  - uid: 8425
-    components:
-    - type: Transform
-      pos: -25.5,-17.5
-      parent: 60
-  - uid: 8430
-    components:
-    - type: Transform
-      pos: -20.5,-12.5
-      parent: 60
-  - uid: 8446
-    components:
-    - type: Transform
-      pos: -32.5,3.5
-      parent: 60
-  - uid: 8463
-    components:
-    - type: Transform
-      pos: -30.5,-14.5
-      parent: 60
-  - uid: 8507
-    components:
-    - type: Transform
-      pos: -30.5,-13.5
-      parent: 60
-  - uid: 8515
-    components:
-    - type: Transform
-      pos: -21.5,-9.5
-      parent: 60
-  - uid: 8524
-    components:
-    - type: Transform
-      pos: -30.5,-15.5
-      parent: 60
-  - uid: 8578
-    components:
-    - type: Transform
-      pos: -22.5,-13.5
-      parent: 60
-  - uid: 8579
-    components:
-    - type: Transform
-      pos: -23.5,-15.5
-      parent: 60
-  - uid: 8674
-    components:
-    - type: Transform
-      pos: -29.5,-15.5
-      parent: 60
-  - uid: 8675
-    components:
-    - type: Transform
-      pos: -24.5,-15.5
-      parent: 60
-  - uid: 8683
-    components:
-    - type: Transform
-      pos: -22.5,-12.5
-      parent: 60
-  - uid: 8684
-    components:
-    - type: Transform
-      pos: -22.5,-14.5
-      parent: 60
-  - uid: 8694
-    components:
-    - type: Transform
-      pos: -23.5,-3.5
-      parent: 60
-  - uid: 8714
-    components:
-    - type: Transform
-      pos: -25.5,-15.5
-      parent: 60
-  - uid: 8718
-    components:
-    - type: Transform
-      pos: -25.5,-21.5
-      parent: 60
-  - uid: 8719
-    components:
-    - type: Transform
-      pos: -21.5,-1.5
-      parent: 60
-  - uid: 8735
-    components:
-    - type: Transform
-      pos: -27.5,-15.5
-      parent: 60
-  - uid: 8744
-    components:
-    - type: Transform
-      pos: -21.5,-11.5
-      parent: 60
-  - uid: 8791
-    components:
-    - type: Transform
-      pos: -22.5,-2.5
-      parent: 60
-  - uid: 8883
-    components:
-    - type: Transform
-      pos: -25.5,-19.5
-      parent: 60
   - uid: 8913
     components:
     - type: Transform
@@ -47008,11 +46000,6 @@ entities:
     - type: Transform
       pos: -28.5,-26.5
       parent: 60
-  - uid: 10000
-    components:
-    - type: Transform
-      pos: -27.5,-25.5
-      parent: 60
   - uid: 10054
     components:
     - type: Transform
@@ -47738,10 +46725,45 @@ entities:
     - type: Transform
       pos: 26.5,-39.5
       parent: 60
+  - uid: 11370
+    components:
+    - type: Transform
+      pos: -26.5,-2.5
+      parent: 60
+  - uid: 11373
+    components:
+    - type: Transform
+      pos: -26.5,-1.5
+      parent: 60
+  - uid: 11374
+    components:
+    - type: Transform
+      pos: -26.5,-1.5
+      parent: 60
   - uid: 11375
     components:
     - type: Transform
-      pos: -30.5,1.5
+      pos: -25.5,-2.5
+      parent: 60
+  - uid: 11377
+    components:
+    - type: Transform
+      pos: -23.5,-3.5
+      parent: 60
+  - uid: 11384
+    components:
+    - type: Transform
+      pos: -23.5,-4.5
+      parent: 60
+  - uid: 11385
+    components:
+    - type: Transform
+      pos: -23.5,-5.5
+      parent: 60
+  - uid: 11456
+    components:
+    - type: Transform
+      pos: -23.5,-6.5
       parent: 60
   - uid: 11467
     components:
@@ -47753,15 +46775,70 @@ entities:
     - type: Transform
       pos: 50.5,-32.5
       parent: 60
+  - uid: 11510
+    components:
+    - type: Transform
+      pos: -23.5,-7.5
+      parent: 60
+  - uid: 11516
+    components:
+    - type: Transform
+      pos: -23.5,-8.5
+      parent: 60
+  - uid: 11551
+    components:
+    - type: Transform
+      pos: -23.5,-9.5
+      parent: 60
   - uid: 11556
     components:
     - type: Transform
-      pos: -21.5,-12.5
+      pos: -25.5,-11.5
+      parent: 60
+  - uid: 11567
+    components:
+    - type: Transform
+      pos: -27.5,-11.5
+      parent: 60
+  - uid: 11568
+    components:
+    - type: Transform
+      pos: -26.5,-11.5
+      parent: 60
+  - uid: 11574
+    components:
+    - type: Transform
+      pos: -20.5,-16.5
+      parent: 60
+  - uid: 11575
+    components:
+    - type: Transform
+      pos: -20.5,-14.5
       parent: 60
   - uid: 11576
     components:
     - type: Transform
-      pos: -30.5,0.5
+      pos: -20.5,-15.5
+      parent: 60
+  - uid: 11578
+    components:
+    - type: Transform
+      pos: -20.5,-13.5
+      parent: 60
+  - uid: 11579
+    components:
+    - type: Transform
+      pos: -24.5,-11.5
+      parent: 60
+  - uid: 11580
+    components:
+    - type: Transform
+      pos: -20.5,-12.5
+      parent: 60
+  - uid: 11644
+    components:
+    - type: Transform
+      pos: -21.5,-12.5
       parent: 60
   - uid: 11651
     components:
@@ -47803,16 +46880,51 @@ entities:
     - type: Transform
       pos: -6.5,-52.5
       parent: 60
+  - uid: 11694
+    components:
+    - type: Transform
+      pos: -22.5,-12.5
+      parent: 60
+  - uid: 11724
+    components:
+    - type: Transform
+      pos: -23.5,-12.5
+      parent: 60
+  - uid: 11726
+    components:
+    - type: Transform
+      pos: -23.5,-11.5
+      parent: 60
   - uid: 11733
     components:
     - type: Transform
       pos: 29.5,18.5
       parent: 60
+  - uid: 11759
+    components:
+    - type: Transform
+      pos: -23.5,-10.5
+      parent: 60
+  - uid: 11834
+    components:
+    - type: Transform
+      pos: -28.5,-11.5
+      parent: 60
+  - uid: 11865
+    components:
+    - type: Transform
+      pos: -29.5,-11.5
+      parent: 60
   - uid: 11890
     components:
     - type: Transform
       pos: 52.5,-3.5
       parent: 60
+  - uid: 11945
+    components:
+    - type: Transform
+      pos: -30.5,-11.5
+      parent: 60
   - uid: 11963
     components:
     - type: Transform
@@ -47823,6 +46935,11 @@ entities:
     - type: Transform
       pos: 54.5,-3.5
       parent: 60
+  - uid: 11978
+    components:
+    - type: Transform
+      pos: -30.5,-10.5
+      parent: 60
   - uid: 11987
     components:
     - type: Transform
@@ -47876,7 +46993,7 @@ entities:
   - uid: 12050
     components:
     - type: Transform
-      pos: -13.5,-4.5
+      pos: -29.5,-12.5
       parent: 60
   - uid: 12071
     components:
@@ -47903,6 +47020,11 @@ entities:
     - type: Transform
       pos: 23.5,-10.5
       parent: 60
+  - uid: 12138
+    components:
+    - type: Transform
+      pos: -25.5,-12.5
+      parent: 60
   - uid: 12139
     components:
     - type: Transform
@@ -47978,11 +47100,6 @@ entities:
     - type: Transform
       pos: 51.5,-3.5
       parent: 60
-  - uid: 12276
-    components:
-    - type: Transform
-      pos: -13.5,-5.5
-      parent: 60
   - uid: 12280
     components:
     - type: Transform
@@ -47998,11 +47115,6 @@ entities:
     - type: Transform
       pos: 43.5,-7.5
       parent: 60
-  - uid: 12300
-    components:
-    - type: Transform
-      pos: -13.5,-13.5
-      parent: 60
   - uid: 12306
     components:
     - type: Transform
@@ -48093,11 +47205,6 @@ entities:
     - type: Transform
       pos: 44.5,-9.5
       parent: 60
-  - uid: 12558
-    components:
-    - type: Transform
-      pos: -13.5,-3.5
-      parent: 60
   - uid: 12641
     components:
     - type: Transform
@@ -48208,11 +47315,6 @@ entities:
     - type: Transform
       pos: 52.5,14.5
       parent: 60
-  - uid: 13383
-    components:
-    - type: Transform
-      pos: -21.5,-3.5
-      parent: 60
   - uid: 13391
     components:
     - type: Transform
@@ -48283,11 +47385,6 @@ entities:
     - type: Transform
       pos: -58.5,9.5
       parent: 60
-  - uid: 13641
-    components:
-    - type: Transform
-      pos: -7.5,-20.5
-      parent: 60
   - uid: 13702
     components:
     - type: Transform
@@ -48343,66 +47440,11 @@ entities:
     - type: Transform
       pos: -8.5,-22.5
       parent: 60
-  - uid: 13713
-    components:
-    - type: Transform
-      pos: -8.5,-21.5
-      parent: 60
-  - uid: 13714
-    components:
-    - type: Transform
-      pos: -8.5,-20.5
-      parent: 60
-  - uid: 13715
-    components:
-    - type: Transform
-      pos: -8.5,-19.5
-      parent: 60
-  - uid: 13725
-    components:
-    - type: Transform
-      pos: -6.5,-16.5
-      parent: 60
-  - uid: 13735
-    components:
-    - type: Transform
-      pos: -9.5,-20.5
-      parent: 60
-  - uid: 13746
-    components:
-    - type: Transform
-      pos: -8.5,-18.5
-      parent: 60
   - uid: 13761
     components:
     - type: Transform
       pos: -10.5,24.5
       parent: 60
-  - uid: 13766
-    components:
-    - type: Transform
-      pos: -10.5,-16.5
-      parent: 60
-  - uid: 13817
-    components:
-    - type: Transform
-      pos: -11.5,-16.5
-      parent: 60
-  - uid: 13983
-    components:
-    - type: Transform
-      pos: -19.5,-1.5
-      parent: 60
-  - uid: 14055
-    components:
-    - type: Transform
-      pos: -19.5,-0.5
-      parent: 60
-  - uid: 14224
-    components:
-    - type: Transform
-      pos: -32.5,1.5
-      parent: 60
   - uid: 14329
     components:
     - type: Transform
@@ -48528,21 +47570,6 @@ entities:
     - type: Transform
       pos: -23.5,22.5
       parent: 60
-  - uid: 14696
-    components:
-    - type: Transform
-      pos: -13.5,-19.5
-      parent: 60
-  - uid: 14697
-    components:
-    - type: Transform
-      pos: -7.5,-16.5
-      parent: 60
-  - uid: 14701
-    components:
-    - type: Transform
-      pos: -12.5,-18.5
-      parent: 60
   - uid: 14705
     components:
     - type: Transform
@@ -48608,26 +47635,11 @@ entities:
     - type: Transform
       pos: -25.5,57.5
       parent: 60
-  - uid: 15264
-    components:
-    - type: Transform
-      pos: -12.5,-19.5
-      parent: 60
   - uid: 15398
     components:
     - type: Transform
       pos: -23.5,47.5
       parent: 60
-  - uid: 15442
-    components:
-    - type: Transform
-      pos: -12.5,-17.5
-      parent: 60
-  - uid: 15445
-    components:
-    - type: Transform
-      pos: -9.5,-17.5
-      parent: 60
   - uid: 15522
     components:
     - type: Transform
@@ -48673,30 +47685,15 @@ entities:
     - type: Transform
       pos: -7.5,42.5
       parent: 60
-  - uid: 16060
-    components:
-    - type: Transform
-      pos: -13.5,-15.5
-      parent: 60
   - uid: 16061
     components:
     - type: Transform
       pos: -4.5,-56.5
       parent: 60
-  - uid: 16095
+  - uid: 16110
     components:
     - type: Transform
-      pos: -9.5,-16.5
-      parent: 60
-  - uid: 16123
-    components:
-    - type: Transform
-      pos: -8.5,-16.5
-      parent: 60
-  - uid: 16131
-    components:
-    - type: Transform
-      pos: -13.5,-16.5
+      pos: -33.5,3.5
       parent: 60
   - uid: 16352
     components:
@@ -48868,6 +47865,11 @@ entities:
     - type: Transform
       pos: -25.5,47.5
       parent: 60
+  - uid: 16995
+    components:
+    - type: Transform
+      pos: -33.5,4.5
+      parent: 60
   - uid: 17069
     components:
     - type: Transform
@@ -48988,11 +47990,6 @@ entities:
     - type: Transform
       pos: -7.5,2.5
       parent: 60
-  - uid: 18640
-    components:
-    - type: Transform
-      pos: -12.5,-16.5
-      parent: 60
   - uid: 18752
     components:
     - type: Transform
@@ -49048,41 +48045,6 @@ entities:
     - type: Transform
       pos: -9.5,-3.5
       parent: 60
-  - uid: 18763
-    components:
-    - type: Transform
-      pos: -10.5,-3.5
-      parent: 60
-  - uid: 18764
-    components:
-    - type: Transform
-      pos: -11.5,-3.5
-      parent: 60
-  - uid: 18765
-    components:
-    - type: Transform
-      pos: -12.5,-3.5
-      parent: 60
-  - uid: 18769
-    components:
-    - type: Transform
-      pos: -5.5,-15.5
-      parent: 60
-  - uid: 18770
-    components:
-    - type: Transform
-      pos: -5.5,-16.5
-      parent: 60
-  - uid: 18773
-    components:
-    - type: Transform
-      pos: -12.5,-5.5
-      parent: 60
-  - uid: 18774
-    components:
-    - type: Transform
-      pos: -12.5,-4.5
-      parent: 60
   - uid: 18842
     components:
     - type: Transform
@@ -50478,21 +49440,6 @@ entities:
     - type: Transform
       pos: 27.5,-34.5
       parent: 60
-  - uid: 23839
-    components:
-    - type: Transform
-      pos: -26.5,-14.5
-      parent: 60
-  - uid: 23851
-    components:
-    - type: Transform
-      pos: -26.5,-13.5
-      parent: 60
-  - uid: 23852
-    components:
-    - type: Transform
-      pos: -27.5,-13.5
-      parent: 60
   - uid: 23913
     components:
     - type: Transform
@@ -51774,41 +50721,6 @@ entities:
     - type: Transform
       pos: 39.455097,-25.454304
       parent: 60
-- proto: CannabisSeeds
-  entities:
-  - uid: 12355
-    components:
-    - type: Transform
-      pos: -12.431261,-20.388779
-      parent: 60
-- proto: CapacitorStockPart
-  entities:
-  - uid: 6272
-    components:
-    - type: Transform
-      rot: 0.00019908661488443613 rad
-      pos: 18.263704,-44.683575
-      parent: 60
-  - uid: 13015
-    components:
-    - type: Transform
-      pos: -67.444885,9.609138
-      parent: 60
-  - uid: 13017
-    components:
-    - type: Transform
-      pos: -67.61676,9.687263
-      parent: 60
-  - uid: 19183
-    components:
-    - type: Transform
-      pos: 23.618336,21.636284
-      parent: 60
-  - uid: 19184
-    components:
-    - type: Transform
-      pos: 23.743336,21.526909
-      parent: 60
 - proto: CaptainIDCard
   entities:
   - uid: 23919
@@ -51832,6 +50744,64 @@ entities:
       parent: 60
 - proto: Carpet
   entities:
+  - uid: 309
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-17.5
+      parent: 60
+  - uid: 314
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-18.5
+      parent: 60
+  - uid: 1857
+    components:
+    - type: Transform
+      pos: -27.5,2.5
+      parent: 60
+  - uid: 1913
+    components:
+    - type: Transform
+      pos: -28.5,2.5
+      parent: 60
+  - uid: 2160
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-17.5
+      parent: 60
+  - uid: 2162
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-18.5
+      parent: 60
+  - uid: 2167
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-17.5
+      parent: 60
+  - uid: 2179
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-18.5
+      parent: 60
+  - uid: 2182
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-17.5
+      parent: 60
+  - uid: 2183
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-18.5
+      parent: 60
   - uid: 4276
     components:
     - type: Transform
@@ -51852,36 +50822,11 @@ entities:
     - type: Transform
       pos: -46.5,-18.5
       parent: 60
-  - uid: 5660
-    components:
-    - type: Transform
-      pos: -19.5,-3.5
-      parent: 60
-  - uid: 5910
-    components:
-    - type: Transform
-      pos: -21.5,0.5
-      parent: 60
-  - uid: 6091
-    components:
-    - type: Transform
-      pos: -20.5,0.5
-      parent: 60
   - uid: 7293
     components:
     - type: Transform
       pos: -26.5,-29.5
       parent: 60
-  - uid: 8227
-    components:
-    - type: Transform
-      pos: -21.5,-0.5
-      parent: 60
-  - uid: 8255
-    components:
-    - type: Transform
-      pos: -20.5,-0.5
-      parent: 60
   - uid: 10823
     components:
     - type: Transform
@@ -51959,6 +50904,18 @@ entities:
     - type: Transform
       pos: -11.5,18.5
       parent: 60
+  - uid: 6648
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-16.5
+      parent: 60
+  - uid: 6709
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-17.5
+      parent: 60
   - uid: 13095
     components:
     - type: Transform
@@ -52533,26 +51490,6 @@ entities:
     - type: Transform
       pos: 18.5,-29.5
       parent: 60
-  - uid: 13603
-    components:
-    - type: Transform
-      pos: -8.5,-13.5
-      parent: 60
-  - uid: 13654
-    components:
-    - type: Transform
-      pos: -7.5,-13.5
-      parent: 60
-  - uid: 13692
-    components:
-    - type: Transform
-      pos: -7.5,-12.5
-      parent: 60
-  - uid: 13693
-    components:
-    - type: Transform
-      pos: -8.5,-12.5
-      parent: 60
   - uid: 16543
     components:
     - type: Transform
@@ -52886,21 +51823,32 @@ entities:
     - type: Transform
       pos: -48.5,27.5
       parent: 60
-  - uid: 399
-    components:
-    - type: Transform
-      pos: -12.5,-11.5
-      parent: 60
   - uid: 585
     components:
     - type: Transform
       pos: 55.5,4.5
       parent: 60
+  - uid: 794
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,4.5
+      parent: 60
   - uid: 930
     components:
     - type: Transform
       pos: 54.5,4.5
       parent: 60
+  - uid: 1127
+    components:
+    - type: Transform
+      pos: -16.5,3.5
+      parent: 60
+  - uid: 1201
+    components:
+    - type: Transform
+      pos: -28.5,5.5
+      parent: 60
   - uid: 1357
     components:
     - type: Transform
@@ -52941,6 +51889,37 @@ entities:
     - type: Transform
       pos: -52.5,27.5
       parent: 60
+  - uid: 1725
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,5.5
+      parent: 60
+  - uid: 1809
+    components:
+    - type: Transform
+      pos: -23.5,-7.5
+      parent: 60
+  - uid: 1811
+    components:
+    - type: Transform
+      pos: -23.5,-6.5
+      parent: 60
+  - uid: 1812
+    components:
+    - type: Transform
+      pos: -22.5,-6.5
+      parent: 60
+  - uid: 1816
+    components:
+    - type: Transform
+      pos: -21.5,-6.5
+      parent: 60
+  - uid: 1817
+    components:
+    - type: Transform
+      pos: -20.5,-6.5
+      parent: 60
   - uid: 1988
     components:
     - type: Transform
@@ -52951,6 +51930,12 @@ entities:
     - type: Transform
       pos: 9.5,-44.5
       parent: 60
+  - uid: 2093
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,5.5
+      parent: 60
   - uid: 2523
     components:
     - type: Transform
@@ -52966,6 +51951,11 @@ entities:
     - type: Transform
       pos: 17.5,-54.5
       parent: 60
+  - uid: 2553
+    components:
+    - type: Transform
+      pos: -19.5,-6.5
+      parent: 60
   - uid: 2557
     components:
     - type: Transform
@@ -52986,11 +51976,62 @@ entities:
     - type: Transform
       pos: 18.5,-54.5
       parent: 60
+  - uid: 2569
+    components:
+    - type: Transform
+      pos: -18.5,-6.5
+      parent: 60
+  - uid: 2578
+    components:
+    - type: Transform
+      pos: -17.5,-6.5
+      parent: 60
+  - uid: 2579
+    components:
+    - type: Transform
+      pos: -16.5,-6.5
+      parent: 60
+  - uid: 2581
+    components:
+    - type: Transform
+      pos: -16.5,-5.5
+      parent: 60
+  - uid: 2584
+    components:
+    - type: Transform
+      pos: -16.5,-4.5
+      parent: 60
+  - uid: 2602
+    components:
+    - type: Transform
+      pos: -16.5,-3.5
+      parent: 60
   - uid: 2604
     components:
     - type: Transform
       pos: 60.5,-54.5
       parent: 60
+  - uid: 2629
+    components:
+    - type: Transform
+      pos: -16.5,-2.5
+      parent: 60
+  - uid: 2672
+    components:
+    - type: Transform
+      pos: -16.5,-1.5
+      parent: 60
+  - uid: 2760
+    components:
+    - type: Transform
+      pos: -16.5,-0.5
+      parent: 60
+  - uid: 3225
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,5.5
+      parent: 60
   - uid: 3364
     components:
     - type: Transform
@@ -53051,6 +52092,11 @@ entities:
     - type: Transform
       pos: 5.5,-41.5
       parent: 60
+  - uid: 4202
+    components:
+    - type: Transform
+      pos: -16.5,0.5
+      parent: 60
   - uid: 4211
     components:
     - type: Transform
@@ -53111,12 +52157,6 @@ entities:
     - type: Transform
       pos: -52.5,-22.5
       parent: 60
-  - uid: 4746
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,3.5
-      parent: 60
   - uid: 5175
     components:
     - type: Transform
@@ -53217,6 +52257,11 @@ entities:
     - type: Transform
       pos: -57.5,-26.5
       parent: 60
+  - uid: 6309
+    components:
+    - type: Transform
+      pos: -29.5,5.5
+      parent: 60
   - uid: 6400
     components:
     - type: Transform
@@ -53292,11 +52337,21 @@ entities:
     - type: Transform
       pos: 39.5,-60.5
       parent: 60
+  - uid: 6703
+    components:
+    - type: Transform
+      pos: -26.5,5.5
+      parent: 60
   - uid: 6719
     components:
     - type: Transform
       pos: 63.5,-32.5
       parent: 60
+  - uid: 6818
+    components:
+    - type: Transform
+      pos: -14.5,-6.5
+      parent: 60
   - uid: 6842
     components:
     - type: Transform
@@ -53862,6 +52917,11 @@ entities:
     - type: Transform
       pos: 7.5,-49.5
       parent: 60
+  - uid: 8248
+    components:
+    - type: Transform
+      pos: -33.5,3.5
+      parent: 60
   - uid: 8307
     components:
     - type: Transform
@@ -53877,12 +52937,6 @@ entities:
     - type: Transform
       pos: -73.5,-20.5
       parent: 60
-  - uid: 8344
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,2.5
-      parent: 60
   - uid: 8364
     components:
     - type: Transform
@@ -53928,16 +52982,16 @@ entities:
     - type: Transform
       pos: -61.5,-26.5
       parent: 60
+  - uid: 8429
+    components:
+    - type: Transform
+      pos: -14.5,-5.5
+      parent: 60
   - uid: 8435
     components:
     - type: Transform
       pos: -73.5,-16.5
       parent: 60
-  - uid: 8456
-    components:
-    - type: Transform
-      pos: -24.5,4.5
-      parent: 60
   - uid: 8485
     components:
     - type: Transform
@@ -54178,15 +53232,10 @@ entities:
     - type: Transform
       pos: -58.5,-5.5
       parent: 60
-  - uid: 9032
+  - uid: 8791
     components:
     - type: Transform
-      pos: -22.5,4.5
-      parent: 60
-  - uid: 9033
-    components:
-    - type: Transform
-      pos: -25.5,4.5
+      pos: -16.5,2.5
       parent: 60
   - uid: 9064
     components:
@@ -54718,6 +53767,11 @@ entities:
     - type: Transform
       pos: 47.5,-41.5
       parent: 60
+  - uid: 11366
+    components:
+    - type: Transform
+      pos: -16.5,1.5
+      parent: 60
   - uid: 11376
     components:
     - type: Transform
@@ -55808,11 +54862,6 @@ entities:
     - type: Transform
       pos: 54.5,-11.5
       parent: 60
-  - uid: 13139
-    components:
-    - type: Transform
-      pos: -23.5,4.5
-      parent: 60
   - uid: 13320
     components:
     - type: Transform
@@ -55868,6 +54917,17 @@ entities:
     - type: Transform
       pos: 39.5,-35.5
       parent: 60
+  - uid: 13732
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,5.5
+      parent: 60
+  - uid: 13733
+    components:
+    - type: Transform
+      pos: -15.5,3.5
+      parent: 60
   - uid: 13918
     components:
     - type: Transform
@@ -55923,11 +54983,6 @@ entities:
     - type: Transform
       pos: -3.5,38.5
       parent: 60
-  - uid: 15569
-    components:
-    - type: Transform
-      pos: -12.5,-10.5
-      parent: 60
   - uid: 15745
     components:
     - type: Transform
@@ -56003,11 +55058,6 @@ entities:
     - type: Transform
       pos: 8.5,57.5
       parent: 60
-  - uid: 16096
-    components:
-    - type: Transform
-      pos: -12.5,-9.5
-      parent: 60
   - uid: 16115
     components:
     - type: Transform
@@ -56573,11 +55623,6 @@ entities:
     - type: Transform
       pos: -25.5,49.5
       parent: 60
-  - uid: 17953
-    components:
-    - type: Transform
-      pos: -28.5,5.5
-      parent: 60
   - uid: 18438
     components:
     - type: Transform
@@ -56598,16 +55643,6 @@ entities:
     - type: Transform
       pos: -31.5,5.5
       parent: 60
-  - uid: 18591
-    components:
-    - type: Transform
-      pos: -19.5,4.5
-      parent: 60
-  - uid: 18601
-    components:
-    - type: Transform
-      pos: -21.5,4.5
-      parent: 60
   - uid: 18726
     components:
     - type: Transform
@@ -56793,11 +55828,6 @@ entities:
     - type: Transform
       pos: 55.5,-23.5
       parent: 60
-  - uid: 18827
-    components:
-    - type: Transform
-      pos: -29.5,5.5
-      parent: 60
   - uid: 19000
     components:
     - type: Transform
@@ -56823,11 +55853,6 @@ entities:
     - type: Transform
       pos: 40.5,4.5
       parent: 60
-  - uid: 19130
-    components:
-    - type: Transform
-      pos: -20.5,4.5
-      parent: 60
   - uid: 19703
     components:
     - type: Transform
@@ -58875,6 +57900,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 56.5,-5.5
       parent: 60
+  - uid: 81
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -34.5,-19.5
+      parent: 60
+  - uid: 245
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -34.5,-20.5
+      parent: 60
   - uid: 662
     components:
     - type: Transform
@@ -58906,12 +57943,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -63.5,-13.5
       parent: 60
-  - uid: 1648
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,-20.5
-      parent: 60
   - uid: 1672
     components:
     - type: Transform
@@ -58924,17 +57955,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 54.5,-42.5
       parent: 60
-  - uid: 1867
+  - uid: 1957
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -25.5,-20.5
-      parent: 60
-  - uid: 2088
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -33.5,0.5
+      pos: -22.5,-17.5
       parent: 60
   - uid: 2143
     components:
@@ -58954,6 +57979,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 24.5,-51.5
       parent: 60
+  - uid: 3217
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,-14.5
+      parent: 60
   - uid: 3351
     components:
     - type: Transform
@@ -59238,11 +58269,29 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,-50.5
       parent: 60
-  - uid: 8510
+  - uid: 8213
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,-4.5
+      parent: 60
+  - uid: 8258
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -31.5,-0.5
+      pos: -22.5,-16.5
+      parent: 60
+  - uid: 8340
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,-4.5
+      parent: 60
+  - uid: 8343
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-14.5
       parent: 60
   - uid: 9079
     components:
@@ -59276,18 +58325,6 @@ entities:
     - type: Transform
       pos: -48.5,4.5
       parent: 60
-  - uid: 11377
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -33.5,-0.5
-      parent: 60
-  - uid: 11385
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -31.5,0.5
-      parent: 60
   - uid: 11480
     components:
     - type: Transform
@@ -59530,12 +58567,6 @@ entities:
     - type: Transform
       pos: -110.5,3.5
       parent: 60
-  - uid: 23894
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,0.5
-      parent: 60
   - uid: 24023
     components:
     - type: Transform
@@ -59788,38 +58819,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 12.52908,-13.379191
       parent: 60
-- proto: ChairFoldingSpawnFolded
-  entities:
-  - uid: 1762
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -33.5,-11.5
-      parent: 60
-  - uid: 1764
-    components:
-    - type: Transform
-      pos: -19.5,-11.5
-      parent: 60
-  - uid: 1909
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -33.5,-7.5
-      parent: 60
-  - uid: 8232
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -19.5,-7.5
-      parent: 60
 - proto: ChairOfficeDark
   entities:
-  - uid: 238
+  - uid: 492
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -30.5,-19.5
+      pos: -34.5,-16.5
       parent: 60
   - uid: 1379
     components:
@@ -59827,16 +58832,40 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,-27.5
       parent: 60
-  - uid: 1573
+  - uid: 1583
     components:
     - type: Transform
-      pos: -26.5,-9.5
+      pos: -34.5,-9.5
       parent: 60
-  - uid: 2094
+  - uid: 1635
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,-4.5
+      parent: 60
+  - uid: 1767
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,-12.5
+      parent: 60
+  - uid: 1859
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,-0.5
+      parent: 60
+  - uid: 1881
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -34.446068,-3.4362593
+      pos: -29.5,-4.5
+      parent: 60
+  - uid: 1932
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-17.5
       parent: 60
   - uid: 2590
     components:
@@ -59860,6 +58889,12 @@ entities:
     - type: Transform
       pos: -47.5,12.5
       parent: 60
+  - uid: 4010
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,-15.5
+      parent: 60
   - uid: 4273
     components:
     - type: Transform
@@ -59937,11 +58972,17 @@ entities:
     - type: Transform
       pos: -65.5,10.5
       parent: 60
-  - uid: 8345
+  - uid: 8252
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-19.5
+      rot: 3.141592653589793 rad
+      pos: -32.5,-0.5
+      parent: 60
+  - uid: 8253
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -34.5,-0.5
       parent: 60
   - uid: 8383
     components:
@@ -60250,6 +59291,52 @@ entities:
       parent: 60
 - proto: ChairWood
   entities:
+  - uid: 24
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.5,-14.5
+      parent: 60
+  - uid: 63
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,-14.5
+      parent: 60
+  - uid: 501
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-17.5
+      parent: 60
+  - uid: 977
+    components:
+    - type: Transform
+      pos: -9.5,-12.5
+      parent: 60
+  - uid: 1128
+    components:
+    - type: Transform
+      pos: -8.5,-12.5
+      parent: 60
+  - uid: 1956
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-18.5
+      parent: 60
+  - uid: 2086
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-17.5
+      parent: 60
+  - uid: 2087
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-18.5
+      parent: 60
   - uid: 2847
     components:
     - type: Transform
@@ -60565,11 +59652,6 @@ entities:
     - type: Transform
       pos: 45.485657,-24.447033
       parent: 60
-  - uid: 16150
-    components:
-    - type: Transform
-      pos: -19.84328,-13.204234
-      parent: 60
 - proto: ChemDispenser
   entities:
   - uid: 2520
@@ -60603,16 +59685,17 @@ entities:
       parent: 60
 - proto: ChessBoard
   entities:
+  - uid: 155
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.540611,-13.414931
+      parent: 60
   - uid: 5198
     components:
     - type: Transform
       pos: 2.5348077,-76.44673
       parent: 60
-  - uid: 8948
-    components:
-    - type: Transform
-      pos: -34.5,-15.5
-      parent: 60
   - uid: 13678
     components:
     - type: Transform
@@ -60711,13 +59794,6 @@ entities:
     - type: Transform
       pos: 5.5158696,-7.3988457
       parent: 60
-- proto: CigarSpent
-  entities:
-  - uid: 21734
-    components:
-    - type: Transform
-      pos: -33.433487,-2.3675175
-      parent: 60
 - proto: CigPackGreen
   entities:
   - uid: 12874
@@ -60748,16 +59824,16 @@ entities:
       parent: 60
 - proto: ClosetBombFilled
   entities:
-  - uid: 2112
-    components:
-    - type: Transform
-      pos: -23.5,-20.5
-      parent: 60
   - uid: 11346
     components:
     - type: Transform
       pos: -51.5,11.5
       parent: 60
+  - uid: 11383
+    components:
+    - type: Transform
+      pos: -19.5,1.5
+      parent: 60
 - proto: ClosetChefFilled
   entities:
   - uid: 2620
@@ -60767,6 +59843,16 @@ entities:
       parent: 60
 - proto: ClosetEmergencyFilledRandom
   entities:
+  - uid: 1731
+    components:
+    - type: Transform
+      pos: -15.5,-1.5
+      parent: 60
+  - uid: 1909
+    components:
+    - type: Transform
+      pos: -27.5,4.5
+      parent: 60
   - uid: 2682
     components:
     - type: Transform
@@ -61002,6 +60088,11 @@ entities:
         - 0
         - 0
         - 0
+  - uid: 9051
+    components:
+    - type: Transform
+      pos: -14.5,5.5
+      parent: 60
   - uid: 11659
     components:
     - type: Transform
@@ -61168,11 +60259,6 @@ entities:
         - 0
         - 0
         - 0
-  - uid: 21497
-    components:
-    - type: Transform
-      pos: -18.5,5.5
-      parent: 60
   - uid: 21980
     components:
     - type: Transform
@@ -61205,11 +60291,6 @@ entities:
       parent: 60
 - proto: ClosetEmergencyN2FilledRandom
   entities:
-  - uid: 21503
-    components:
-    - type: Transform
-      pos: -19.5,5.5
-      parent: 60
   - uid: 22006
     components:
     - type: Transform
@@ -61227,6 +60308,16 @@ entities:
       parent: 60
 - proto: ClosetFireFilled
   entities:
+  - uid: 1915
+    components:
+    - type: Transform
+      pos: -28.5,4.5
+      parent: 60
+  - uid: 1983
+    components:
+    - type: Transform
+      pos: -15.5,-2.5
+      parent: 60
   - uid: 3606
     components:
     - type: Transform
@@ -61365,11 +60456,6 @@ entities:
         - 0
         - 0
         - 0
-  - uid: 8447
-    components:
-    - type: Transform
-      pos: -24.5,5.5
-      parent: 60
   - uid: 12851
     components:
     - type: Transform
@@ -61531,10 +60617,10 @@ entities:
         - 0
 - proto: ClosetL3SecurityFilled
   entities:
-  - uid: 8469
+  - uid: 1578
     components:
     - type: Transform
-      pos: -29.5,-20.5
+      pos: -18.5,1.5
       parent: 60
 - proto: ClosetL3VirologyFilled
   entities:
@@ -61664,6 +60750,11 @@ entities:
         - 0
 - proto: ClosetMaintenanceFilledRandom
   entities:
+  - uid: 1973
+    components:
+    - type: Transform
+      pos: -15.5,-0.5
+      parent: 60
   - uid: 3546
     components:
     - type: Transform
@@ -61802,6 +60893,11 @@ entities:
         - 0
         - 0
         - 0
+  - uid: 13607
+    components:
+    - type: Transform
+      pos: -21.5,3.5
+      parent: 60
   - uid: 17844
     components:
     - type: Transform
@@ -62084,17 +61180,6 @@ entities:
         - 0
         - 0
         - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 4711
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
   - uid: 11484
     components:
     - type: Transform
@@ -62214,6 +61299,11 @@ entities:
         - 0
         - 0
         - 0
+  - uid: 8714
+    components:
+    - type: Transform
+      pos: -14.5,2.5
+      parent: 60
   - uid: 9477
     components:
     - type: Transform
@@ -62272,6 +61362,14 @@ entities:
     - type: Transform
       pos: -47.5,38.5
       parent: 60
+- proto: ClosetWallFireFilledRandom
+  entities:
+  - uid: 1568
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,-15.5
+      parent: 60
 - proto: ClothingBackpackClown
   entities:
   - uid: 6698
@@ -62300,10 +61398,6 @@ entities:
     - type: Transform
       pos: 6.5002446,-6.7582207
       parent: 60
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          ents: []
 - proto: ClothingBeltHolster
   entities:
   - uid: 9072
@@ -62679,13 +61773,6 @@ entities:
     - type: Transform
       pos: -12.635327,-50.409695
       parent: 60
-- proto: ClothingHeadHatPaper
-  entities:
-  - uid: 13642
-    components:
-    - type: Transform
-      pos: -8.54058,-12.424972
-      parent: 60
 - proto: ClothingHeadHatPartyRed
   entities:
   - uid: 16162
@@ -62859,6 +61946,13 @@ entities:
     - type: Transform
       pos: 22.494247,-51.263294
       parent: 60
+- proto: ClothingHeadHelmetBone
+  entities:
+  - uid: 15901
+    components:
+    - type: Transform
+      pos: -18.371449,5.6168633
+      parent: 60
 - proto: ClothingHeadHelmetCosmonaut
   entities:
   - uid: 17900
@@ -62873,23 +61967,6 @@ entities:
     - type: Transform
       pos: 29.516983,-1.2031906
       parent: 60
-- proto: ClothingHeadHelmetRiot
-  entities:
-  - uid: 1740
-    components:
-    - type: Transform
-      pos: -27.272326,1.5471131
-      parent: 60
-  - uid: 1749
-    components:
-    - type: Transform
-      pos: -27.272326,1.422113
-      parent: 60
-  - uid: 7747
-    components:
-    - type: Transform
-      pos: -27.272326,1.703363
-      parent: 60
 - proto: ClothingHeadHelmetTemplar
   entities:
   - uid: 5205
@@ -63074,6 +62151,18 @@ entities:
     - type: Transform
       pos: -41.75516,14.452198
       parent: 60
+- proto: ClothingMultipleHeadphones
+  entities:
+  - uid: 7861
+    components:
+    - type: Transform
+      pos: 54.640587,-35.651684
+      parent: 60
+  - uid: 17780
+    components:
+    - type: Transform
+      pos: -38.4609,19.6876
+      parent: 60
 - proto: ClothingNeckAromanticPin
   entities:
   - uid: 24089
@@ -63095,18 +62184,6 @@ entities:
     - type: Transform
       pos: -40.498245,-36.02266
       parent: 60
-- proto: ClothingNeckHeadphones
-  entities:
-  - uid: 7861
-    components:
-    - type: Transform
-      pos: 54.640587,-35.651684
-      parent: 60
-  - uid: 17780
-    components:
-    - type: Transform
-      pos: -38.4609,19.6876
-      parent: 60
 - proto: ClothingNeckMantleHOP
   entities:
   - uid: 5207
@@ -63206,52 +62283,6 @@ entities:
     - type: Transform
       pos: -12.119702,-50.42532
       parent: 60
-- proto: ClothingOuterArmorBulletproof
-  entities:
-  - uid: 2579
-    components:
-    - type: Transform
-      pos: -28.26191,1.6537957
-      parent: 60
-  - uid: 19170
-    components:
-    - type: Transform
-      pos: -28.26191,1.5496291
-      parent: 60
-  - uid: 21162
-    components:
-    - type: Transform
-      pos: -28.251492,1.424629
-      parent: 60
-- proto: ClothingOuterArmorReflective
-  entities:
-  - uid: 1840
-    components:
-    - type: Transform
-      pos: -28.69941,1.5912957
-      parent: 60
-  - uid: 17469
-    components:
-    - type: Transform
-      pos: -28.709826,1.393379
-      parent: 60
-- proto: ClothingOuterArmorRiot
-  entities:
-  - uid: 10684
-    components:
-    - type: Transform
-      pos: -27.63691,1.5366963
-      parent: 60
-  - uid: 15898
-    components:
-    - type: Transform
-      pos: -27.63691,1.390863
-      parent: 60
-  - uid: 21723
-    components:
-    - type: Transform
-      pos: -27.626492,1.6512797
-      parent: 60
 - proto: ClothingOuterCardborg
   entities:
   - uid: 5366
@@ -63651,11 +62682,28 @@ entities:
       rot: 3.141592653589793 rad
       pos: 4.5,-32.5
       parent: 60
+  - uid: 1461
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -32.5,-19.5
+      parent: 60
+  - uid: 1561
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -32.5,-20.5
+      parent: 60
   - uid: 1882
     components:
     - type: Transform
       pos: -5.5,-44.5
       parent: 60
+  - uid: 1888
+    components:
+    - type: Transform
+      pos: -28.5,1.5
+      parent: 60
   - uid: 2249
     components:
     - type: Transform
@@ -63746,17 +62794,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 24.5,-40.5
       parent: 60
-  - uid: 8225
-    components:
-    - type: Transform
-      pos: -21.5,0.5
-      parent: 60
-  - uid: 8259
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-1.5
-      parent: 60
   - uid: 8745
     components:
     - type: Transform
@@ -64068,11 +63105,11 @@ entities:
       parent: 60
 - proto: ComputerCargoOrdersSecurity
   entities:
-  - uid: 9618
+  - uid: 1643
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: -27.5,-4.5
       parent: 60
 - proto: ComputerCargoOrdersService
   entities:
@@ -64096,11 +63133,6 @@ entities:
       parent: 60
 - proto: ComputerCrewMonitoring
   entities:
-  - uid: 1833
-    components:
-    - type: Transform
-      pos: -25.5,-8.5
-      parent: 60
   - uid: 2144
     components:
     - type: Transform
@@ -64119,6 +63151,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -25.5,-30.5
       parent: 60
+  - uid: 8344
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,-15.5
+      parent: 60
   - uid: 8705
     components:
     - type: Transform
@@ -64137,38 +63175,27 @@ entities:
       parent: 60
 - proto: ComputerCriminalRecords
   entities:
-  - uid: 617
-    components:
-    - type: Transform
-      pos: -30.5,-18.5
-      parent: 60
-  - uid: 667
-    components:
-    - type: Transform
-      pos: -22.5,-18.5
-      parent: 60
   - uid: 2024
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -26.5,-30.5
       parent: 60
-  - uid: 4217
+  - uid: 2066
     components:
     - type: Transform
-      pos: -27.5,-8.5
+      pos: -34.5,-11.5
       parent: 60
-  - uid: 8213
+  - uid: 3590
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,0.5
+      pos: -26.5,-16.5
       parent: 60
-  - uid: 8681
+  - uid: 7906
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -24.5,-6.5
+      pos: -34.5,-1.5
       parent: 60
   - uid: 18561
     components:
@@ -64375,10 +63402,16 @@ entities:
       parent: 60
 - proto: ComputerStationRecords
   entities:
-  - uid: 584
+  - uid: 1729
     components:
     - type: Transform
-      pos: -23.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: -28.5,-4.5
+      parent: 60
+  - uid: 8243
+    components:
+    - type: Transform
+      pos: -32.5,0.5
       parent: 60
   - uid: 10938
     components:
@@ -64406,21 +63439,28 @@ entities:
       parent: 60
 - proto: ComputerSurveillanceCameraMonitor
   entities:
-  - uid: 564
+  - uid: 983
     components:
     - type: Transform
-      pos: -29.5,-18.5
+      rot: 3.141592653589793 rad
+      pos: -26.5,-18.5
       parent: 60
-  - uid: 1658
+  - uid: 1663
     components:
     - type: Transform
-      pos: -26.5,-8.5
+      rot: 3.141592653589793 rad
+      pos: -34.5,-10.5
       parent: 60
   - uid: 2068
     components:
     - type: Transform
       pos: -1.5,3.5
       parent: 60
+  - uid: 7916
+    components:
+    - type: Transform
+      pos: -34.5,0.5
+      parent: 60
 - proto: ComputerSurveillanceWirelessCameraMonitor
   entities:
   - uid: 17202
@@ -64438,21 +63478,6 @@ entities:
       parent: 60
 - proto: ComputerTelevision
   entities:
-  - uid: 10
-    components:
-    - type: Transform
-      pos: -34.5,-5.5
-      parent: 60
-  - uid: 1552
-    components:
-    - type: Transform
-      pos: -18.5,-5.5
-      parent: 60
-  - uid: 1650
-    components:
-    - type: Transform
-      pos: -34.5,-9.5
-      parent: 60
   - uid: 2213
     components:
     - type: Transform
@@ -64473,10 +63498,10 @@ entities:
     - type: Transform
       pos: -47.5,24.5
       parent: 60
-  - uid: 8898
+  - uid: 17968
     components:
     - type: Transform
-      pos: -18.5,-9.5
+      pos: -11.5,-13.5
       parent: 60
 - proto: ContainmentFieldGenerator
   entities:
@@ -64934,6 +63959,13 @@ entities:
     - type: Transform
       pos: -18.5,16.5
       parent: 60
+- proto: CrateContrabandStorageSecure
+  entities:
+  - uid: 2091
+    components:
+    - type: Transform
+      pos: -29.5,-17.5
+      parent: 60
 - proto: CrateEmergencyInflatablewall
   entities:
   - uid: 16524
@@ -64987,6 +64019,11 @@ entities:
       parent: 60
 - proto: CrateEngineeringCableBulk
   entities:
+  - uid: 1559
+    components:
+    - type: Transform
+      pos: -32.5,3.5
+      parent: 60
   - uid: 2593
     components:
     - type: Transform
@@ -65294,6 +64331,13 @@ entities:
     - type: Transform
       pos: 54.5,12.5
       parent: 60
+- proto: CrateFoodCooking
+  entities:
+  - uid: 9034
+    components:
+    - type: Transform
+      pos: -13.5,-8.5
+      parent: 60
 - proto: CrateFreezer
   entities:
   - uid: 531
@@ -65347,23 +64391,6 @@ entities:
         - 0
         - 0
         - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 18641
-          - 17812
-          - 18647
-          - 18725
-          - 19185
-          - 19186
-          - 19187
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: CrateHydroponicsSeedsMedicinal
   entities:
   - uid: 2759
@@ -65371,6 +64398,13 @@ entities:
     - type: Transform
       pos: 33.5,-37.5
       parent: 60
+- proto: CrateHydroponicsTools
+  entities:
+  - uid: 1833
+    components:
+    - type: Transform
+      pos: -12.5,-12.5
+      parent: 60
 - proto: CrateLockBoxEngineering
   entities:
   - uid: 22134
@@ -65394,10 +64428,10 @@ entities:
       parent: 60
 - proto: CrateLockBoxSecurity
   entities:
-  - uid: 22136
+  - uid: 7902
     components:
     - type: Transform
-      pos: -31.5,-16.5
+      pos: -28.5,-20.5
       parent: 60
 - proto: CrateLockBoxService
   entities:
@@ -65489,22 +64523,6 @@ entities:
         - 0
         - 0
         - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 18835
-          - 18834
-          - 18823
-          - 18792
-          - 18731
-          - 18442
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: CrateScienceSecure
   entities:
   - uid: 13917
@@ -65530,16 +64548,20 @@ entities:
         - 0
         - 0
         - 0
-- proto: CrateSecurityTrackingMindshieldImplants
+- proto: CrateSecurityRiot
   entities:
-  - uid: 1559
+  - uid: 1137
     components:
     - type: Transform
-      anchored: True
-      pos: -24.5,-11.5
+      pos: -26.5,-7.5
+      parent: 60
+- proto: CrateSecurityTrackingMindshieldImplants
+  entities:
+  - uid: 2105
+    components:
+    - type: Transform
+      pos: -29.5,-19.5
       parent: 60
-    - type: Physics
-      bodyType: Static
 - proto: CrateServiceJanitorialSupplies
   entities:
   - uid: 734
@@ -65572,10 +64594,10 @@ entities:
     - type: Transform
       pos: 47.5,18.5
       parent: 60
-  - uid: 17449
+  - uid: 13683
     components:
     - type: Transform
-      pos: -5.5,-15.5
+      pos: -14.5,-20.5
       parent: 60
   - uid: 21481
     components:
@@ -65700,6 +64722,12 @@ entities:
       parent: 60
 - proto: CryogenicSleepUnit
   entities:
+  - uid: 1574
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-20.5
+      parent: 60
   - uid: 6056
     components:
     - type: Transform
@@ -65765,17 +64793,25 @@ entities:
       parent: 60
 - proto: CurtainsBlackOpen
   entities:
-  - uid: 8672
+  - uid: 1570
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,-2.5
+      pos: -33.5,-17.5
       parent: 60
-  - uid: 14624
+  - uid: 1861
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-2.5
+      pos: -28.5,-1.5
+      parent: 60
+  - uid: 1867
+    components:
+    - type: Transform
+      pos: -29.5,-1.5
+      parent: 60
+  - uid: 1948
+    components:
+    - type: Transform
+      pos: -34.5,-17.5
       parent: 60
   - uid: 23835
     components:
@@ -65811,6 +64847,30 @@ entities:
       parent: 60
 - proto: CurtainsRedOpen
   entities:
+  - uid: 1744
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-21.5
+      parent: 60
+  - uid: 1745
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-21.5
+      parent: 60
+  - uid: 1847
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-17.5
+      parent: 60
+  - uid: 2099
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-16.5
+      parent: 60
   - uid: 23090
     components:
     - type: Transform
@@ -65821,11 +64881,6 @@ entities:
     - type: Transform
       pos: 21.5,-21.5
       parent: 60
-  - uid: 23927
-    components:
-    - type: Transform
-      pos: -32.5,-3.5
-      parent: 60
   - uid: 24816
     components:
     - type: Transform
@@ -65909,10 +64964,10 @@ entities:
       parent: 60
 - proto: DefaultStationBeaconArmory
   entities:
-  - uid: 8462
+  - uid: 2806
     components:
     - type: Transform
-      pos: -26.5,-1.5
+      pos: -28.5,-8.5
       parent: 60
 - proto: DefaultStationBeaconArrivals
   entities:
@@ -65956,6 +65011,20 @@ entities:
     - type: Transform
       pos: 0.5,0.5
       parent: 60
+- proto: DefaultStationBeaconBrig
+  entities:
+  - uid: 8270
+    components:
+    - type: Transform
+      pos: -20.5,-14.5
+      parent: 60
+- proto: DefaultStationBeaconBrigMed
+  entities:
+  - uid: 1473
+    components:
+    - type: Transform
+      pos: -19.5,-9.5
+      parent: 60
 - proto: DefaultStationBeaconCaptainsQuarters
   entities:
   - uid: 15423
@@ -66126,10 +65195,10 @@ entities:
       parent: 60
 - proto: DefaultStationBeaconPermaBrig
   entities:
-  - uid: 18707
+  - uid: 12355
     components:
     - type: Transform
-      pos: -8.5,-15.5
+      pos: -14.5,-15.5
       parent: 60
 - proto: DefaultStationBeaconPowerBank
   entities:
@@ -66175,10 +65244,10 @@ entities:
       parent: 60
 - proto: DefaultStationBeaconSecurity
   entities:
-  - uid: 21496
+  - uid: 12356
     components:
     - type: Transform
-      pos: -27.5,-19.5
+      pos: -27.5,-2.5
       parent: 60
 - proto: DefaultStationBeaconServerRoom
   entities:
@@ -66260,13 +65329,19 @@ entities:
       parent: 60
 - proto: DefaultStationBeaconWardensOffice
   entities:
-  - uid: 8458
+  - uid: 1569
     components:
     - type: Transform
-      pos: -27.5,-11.5
+      pos: -28.5,-19.5
       parent: 60
 - proto: DefibrillatorCabinetFilled
   entities:
+  - uid: 2513
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -21.5,-9.5
+      parent: 60
   - uid: 4626
     components:
     - type: Transform
@@ -66288,10 +65363,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 37.5,-14.5
       parent: 60
-  - uid: 19514
+  - uid: 13967
     components:
     - type: Transform
-      pos: -19.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-8.5
       parent: 60
   - uid: 21264
     components:
@@ -66300,20 +65376,15 @@ entities:
       parent: 60
 - proto: DeployableBarrier
   entities:
-  - uid: 8606
+  - uid: 1800
     components:
     - type: Transform
-      pos: -34.5,-13.5
+      pos: -25.5,3.5
       parent: 60
-  - uid: 8722
+  - uid: 1804
     components:
     - type: Transform
-      pos: -33.5,-13.5
-      parent: 60
-  - uid: 21733
-    components:
-    - type: Transform
-      pos: -32.5,-13.5
+      pos: -25.5,2.5
       parent: 60
 - proto: DeskBell
   entities:
@@ -66340,6 +65411,11 @@ entities:
       bodyType: Static
 - proto: DiceBag
   entities:
+  - uid: 968
+    components:
+    - type: Transform
+      pos: -13.360777,-17.374952
+      parent: 60
   - uid: 14192
     components:
     - type: Transform
@@ -66366,18 +65442,6 @@ entities:
     - type: Transform
       pos: 33.5,-20.5
       parent: 60
-  - uid: 430
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-22.5
-      parent: 60
-  - uid: 431
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-23.5
-      parent: 60
   - uid: 488
     components:
     - type: Transform
@@ -66430,6 +65494,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,-23.5
       parent: 60
+  - uid: 1571
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,-20.5
+      parent: 60
+  - uid: 1748
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,8.5
+      parent: 60
   - uid: 2187
     components:
     - type: Transform
@@ -66639,12 +65715,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,-24.5
       parent: 60
-  - uid: 8450
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -33.5,-16.5
-      parent: 60
   - uid: 9343
     components:
     - type: Transform
@@ -66673,28 +65743,40 @@ entities:
       rot: 3.141592653589793 rad
       pos: -48.5,-5.5
       parent: 60
-  - uid: 11365
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -33.5,-19.5
-      parent: 60
   - uid: 13092
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 29.5,-26.5
       parent: 60
-  - uid: 14084
+  - uid: 13747
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -34.5,-3.5
+      parent: 60
+  - uid: 13785
+    components:
+    - type: Transform
+      pos: -27.5,-15.5
+      parent: 60
+  - uid: 13786
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -16.5,7.5
+      pos: -31.5,-15.5
       parent: 60
-  - uid: 14085
+  - uid: 13788
     components:
     - type: Transform
-      pos: -16.5,8.5
+      rot: 1.5707963267948966 rad
+      pos: -31.5,-13.5
+      parent: 60
+  - uid: 13790
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,-3.5
       parent: 60
   - uid: 14634
     components:
@@ -66867,7 +65949,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 30.5,-23.5
       parent: 60
-  - uid: 436
+  - uid: 542
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -66879,11 +65961,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-23.5
       parent: 60
-  - uid: 740
-    components:
-    - type: Transform
-      pos: 0.5,-22.5
-      parent: 60
   - uid: 1025
     components:
     - type: Transform
@@ -66899,6 +65976,12 @@ entities:
     - type: Transform
       pos: 16.5,8.5
       parent: 60
+  - uid: 1875
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -24.5,-23.5
+      parent: 60
   - uid: 2268
     components:
     - type: Transform
@@ -66946,17 +66029,16 @@ entities:
     - type: Transform
       pos: -37.5,8.5
       parent: 60
-  - uid: 4057
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -24.5,-23.5
-      parent: 60
   - uid: 6083
     components:
     - type: Transform
       pos: -37.5,-5.5
       parent: 60
+  - uid: 6094
+    components:
+    - type: Transform
+      pos: -23.5,-13.5
+      parent: 60
   - uid: 6323
     components:
     - type: Transform
@@ -66968,11 +66050,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -53.5,2.5
       parent: 60
-  - uid: 14083
-    components:
-    - type: Transform
-      pos: -15.5,7.5
-      parent: 60
   - uid: 18957
     components:
     - type: Transform
@@ -66993,18 +66070,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 28.5,-23.5
       parent: 60
-  - uid: 749
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -15.5,-23.5
-      parent: 60
-  - uid: 751
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -18.5,-23.5
-      parent: 60
   - uid: 824
     components:
     - type: Transform
@@ -67016,6 +66081,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-41.5
       parent: 60
+  - uid: 1779
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,-23.5
+      parent: 60
   - uid: 1884
     components:
     - type: Transform
@@ -67027,15 +66098,10 @@ entities:
     - type: Transform
       pos: 0.5,-29.5
       parent: 60
-  - uid: 2066
+  - uid: 2165
     components:
     - type: Transform
-      pos: 0.5,-23.5
-      parent: 60
-  - uid: 2115
-    components:
-    - type: Transform
-      pos: -37.5,-19.5
+      pos: -37.5,-3.5
       parent: 60
   - uid: 2192
     components:
@@ -67055,11 +66121,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 37.5,-22.5
       parent: 60
-  - uid: 3187
-    components:
-    - type: Transform
-      pos: -15.5,-1.5
-      parent: 60
   - uid: 4767
     components:
     - type: Transform
@@ -67083,6 +66144,11 @@ entities:
     - type: Transform
       pos: 16.5,12.5
       parent: 60
+  - uid: 13818
+    components:
+    - type: Transform
+      pos: -23.5,-15.5
+      parent: 60
   - uid: 14089
     components:
     - type: Transform
@@ -67519,12 +66585,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -22.5,-23.5
       parent: 60
-  - uid: 855
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -23.5,-23.5
-      parent: 60
   - uid: 858
     components:
     - type: Transform
@@ -67569,132 +66629,14 @@ entities:
   - uid: 965
     components:
     - type: Transform
-      pos: -15.5,-22.5
-      parent: 60
-  - uid: 966
-    components:
-    - type: Transform
-      pos: -15.5,-21.5
-      parent: 60
-  - uid: 967
-    components:
-    - type: Transform
-      pos: -15.5,-20.5
-      parent: 60
-  - uid: 968
-    components:
-    - type: Transform
-      pos: -15.5,-20.5
-      parent: 60
-  - uid: 969
-    components:
-    - type: Transform
-      pos: -15.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-23.5
       parent: 60
   - uid: 970
     components:
     - type: Transform
-      pos: -15.5,-19.5
-      parent: 60
-  - uid: 971
-    components:
-    - type: Transform
-      pos: -15.5,-16.5
-      parent: 60
-  - uid: 972
-    components:
-    - type: Transform
-      pos: -15.5,-17.5
-      parent: 60
-  - uid: 973
-    components:
-    - type: Transform
-      pos: -15.5,-15.5
-      parent: 60
-  - uid: 974
-    components:
-    - type: Transform
-      pos: -15.5,-14.5
-      parent: 60
-  - uid: 975
-    components:
-    - type: Transform
-      pos: -15.5,-13.5
-      parent: 60
-  - uid: 976
-    components:
-    - type: Transform
-      pos: -15.5,-12.5
-      parent: 60
-  - uid: 977
-    components:
-    - type: Transform
-      pos: -15.5,-11.5
-      parent: 60
-  - uid: 978
-    components:
-    - type: Transform
-      pos: -15.5,-10.5
-      parent: 60
-  - uid: 980
-    components:
-    - type: Transform
-      pos: -15.5,-8.5
-      parent: 60
-  - uid: 981
-    components:
-    - type: Transform
-      pos: -15.5,-7.5
-      parent: 60
-  - uid: 982
-    components:
-    - type: Transform
-      pos: -15.5,-6.5
-      parent: 60
-  - uid: 983
-    components:
-    - type: Transform
-      pos: -15.5,-5.5
-      parent: 60
-  - uid: 984
-    components:
-    - type: Transform
-      pos: -15.5,-4.5
-      parent: 60
-  - uid: 985
-    components:
-    - type: Transform
-      pos: -15.5,-3.5
-      parent: 60
-  - uid: 987
-    components:
-    - type: Transform
-      pos: -15.5,-2.5
-      parent: 60
-  - uid: 988
-    components:
-    - type: Transform
-      pos: -15.5,-0.5
-      parent: 60
-  - uid: 989
-    components:
-    - type: Transform
-      pos: -15.5,0.5
-      parent: 60
-  - uid: 990
-    components:
-    - type: Transform
-      pos: -15.5,1.5
-      parent: 60
-  - uid: 992
-    components:
-    - type: Transform
-      pos: -15.5,3.5
-      parent: 60
-  - uid: 993
-    components:
-    - type: Transform
-      pos: -15.5,4.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,-22.5
       parent: 60
   - uid: 998
     components:
@@ -67832,6 +66774,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 16.5,-22.5
       parent: 60
+  - uid: 1115
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-23.5
+      parent: 60
+  - uid: 1116
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -18.5,-23.5
+      parent: 60
   - uid: 1212
     components:
     - type: Transform
@@ -68009,6 +66963,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,-16.5
       parent: 60
+  - uid: 1739
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,-17.5
+      parent: 60
+  - uid: 1757
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,-18.5
+      parent: 60
+  - uid: 1780
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,8.5
+      parent: 60
   - uid: 1801
     components:
     - type: Transform
@@ -68027,6 +66999,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 34.5,24.5
       parent: 60
+  - uid: 1819
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,8.5
+      parent: 60
   - uid: 1832
     components:
     - type: Transform
@@ -68094,8 +67072,7 @@ entities:
   - uid: 2118
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-1.5
+      pos: -37.5,-19.5
       parent: 60
   - uid: 2119
     components:
@@ -68392,6 +67369,12 @@ entities:
     - type: Transform
       pos: 0.5,-16.5
       parent: 60
+  - uid: 2791
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-13.5
+      parent: 60
   - uid: 2833
     components:
     - type: Transform
@@ -68518,24 +67501,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -39.5,-6.5
       parent: 60
-  - uid: 3493
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -34.5,-19.5
-      parent: 60
   - uid: 3542
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 45.5,-32.5
       parent: 60
-  - uid: 3590
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-18.5
-      parent: 60
   - uid: 3880
     components:
     - type: Transform
@@ -69052,12 +68023,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,-2.5
       parent: 60
-  - uid: 6082
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -37.5,-3.5
-      parent: 60
   - uid: 6090
     components:
     - type: Transform
@@ -69173,6 +68138,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -35.5,8.5
       parent: 60
+  - uid: 6707
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,8.5
+      parent: 60
   - uid: 6716
     components:
     - type: Transform
@@ -69198,6 +68169,12 @@ entities:
     - type: Transform
       pos: 16.5,16.5
       parent: 60
+  - uid: 7014
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,8.5
+      parent: 60
   - uid: 7042
     components:
     - type: Transform
@@ -69253,36 +68230,36 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,-8.5
       parent: 60
+  - uid: 7790
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,-13.5
+      parent: 60
+  - uid: 7811
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,-19.5
+      parent: 60
   - uid: 7958
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,-44.5
       parent: 60
+  - uid: 8203
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-3.5
+      parent: 60
   - uid: 8379
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 20.5,24.5
       parent: 60
-  - uid: 8421
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -36.5,-19.5
-      parent: 60
-  - uid: 8451
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -31.5,-16.5
-      parent: 60
-  - uid: 8464
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -32.5,-16.5
-      parent: 60
   - uid: 8536
     components:
     - type: Transform
@@ -69313,6 +68290,12 @@ entities:
     - type: Transform
       pos: 16.5,23.5
       parent: 60
+  - uid: 8883
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -18.5,8.5
+      parent: 60
   - uid: 8897
     components:
     - type: Transform
@@ -69331,21 +68314,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 35.5,24.5
       parent: 60
-  - uid: 9145
-    components:
-    - type: Transform
-      pos: -18.5,-22.5
-      parent: 60
   - uid: 9146
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -32.5,-23.5
       parent: 60
-  - uid: 9161
+  - uid: 9283
     components:
     - type: Transform
-      pos: -15.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: -17.5,8.5
       parent: 60
   - uid: 9336
     components:
@@ -69441,16 +68420,17 @@ entities:
     - type: Transform
       pos: -55.5,6.5
       parent: 60
-  - uid: 11364
-    components:
-    - type: Transform
-      pos: -15.5,-9.5
-      parent: 60
-  - uid: 11370
+  - uid: 11582
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -35.5,-19.5
+      pos: -19.5,8.5
+      parent: 60
+  - uid: 11604
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,8.5
       parent: 60
   - uid: 11881
     components:
@@ -69499,6 +68479,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -55.5,3.5
       parent: 60
+  - uid: 13603
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,8.5
+      parent: 60
   - uid: 13628
     components:
     - type: Transform
@@ -69511,6 +68497,174 @@ entities:
       rot: 3.141592653589793 rad
       pos: -55.5,5.5
       parent: 60
+  - uid: 13662
+    components:
+    - type: Transform
+      pos: -23.5,-22.5
+      parent: 60
+  - uid: 13664
+    components:
+    - type: Transform
+      pos: -23.5,-21.5
+      parent: 60
+  - uid: 13665
+    components:
+    - type: Transform
+      pos: -23.5,-20.5
+      parent: 60
+  - uid: 13672
+    components:
+    - type: Transform
+      pos: -23.5,-19.5
+      parent: 60
+  - uid: 13673
+    components:
+    - type: Transform
+      pos: -23.5,-18.5
+      parent: 60
+  - uid: 13674
+    components:
+    - type: Transform
+      pos: -23.5,-17.5
+      parent: 60
+  - uid: 13675
+    components:
+    - type: Transform
+      pos: -23.5,-16.5
+      parent: 60
+  - uid: 13701
+    components:
+    - type: Transform
+      pos: -23.5,-14.5
+      parent: 60
+  - uid: 13713
+    components:
+    - type: Transform
+      pos: -23.5,-12.5
+      parent: 60
+  - uid: 13714
+    components:
+    - type: Transform
+      pos: -23.5,-11.5
+      parent: 60
+  - uid: 13718
+    components:
+    - type: Transform
+      pos: -23.5,-10.5
+      parent: 60
+  - uid: 13720
+    components:
+    - type: Transform
+      pos: -23.5,-9.5
+      parent: 60
+  - uid: 13722
+    components:
+    - type: Transform
+      pos: -23.5,-8.5
+      parent: 60
+  - uid: 13725
+    components:
+    - type: Transform
+      pos: -23.5,-7.5
+      parent: 60
+  - uid: 13726
+    components:
+    - type: Transform
+      pos: -23.5,-6.5
+      parent: 60
+  - uid: 13727
+    components:
+    - type: Transform
+      pos: -23.5,-5.5
+      parent: 60
+  - uid: 13730
+    components:
+    - type: Transform
+      pos: -23.5,-4.5
+      parent: 60
+  - uid: 13731
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,-3.5
+      parent: 60
+  - uid: 13740
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-3.5
+      parent: 60
+  - uid: 13744
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-3.5
+      parent: 60
+  - uid: 13746
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -36.5,-3.5
+      parent: 60
+  - uid: 13754
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,-13.5
+      parent: 60
+  - uid: 13764
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -27.5,-13.5
+      parent: 60
+  - uid: 13765
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -28.5,-13.5
+      parent: 60
+  - uid: 13776
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -29.5,-13.5
+      parent: 60
+  - uid: 13778
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -30.5,-13.5
+      parent: 60
+  - uid: 13779
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-14.5
+      parent: 60
+  - uid: 13780
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-15.5
+      parent: 60
+  - uid: 13781
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,-15.5
+      parent: 60
+  - uid: 13782
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,-15.5
+      parent: 60
+  - uid: 13783
+    components:
+    - type: Transform
+      pos: -27.5,-16.5
+      parent: 60
   - uid: 13857
     components:
     - type: Transform
@@ -69600,72 +68754,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -26.5,8.5
       parent: 60
-  - uid: 14073
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -24.5,8.5
-      parent: 60
-  - uid: 14074
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,8.5
-      parent: 60
-  - uid: 14075
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -22.5,8.5
-      parent: 60
-  - uid: 14076
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,8.5
-      parent: 60
-  - uid: 14077
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,8.5
-      parent: 60
-  - uid: 14078
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -19.5,8.5
-      parent: 60
-  - uid: 14079
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -18.5,8.5
-      parent: 60
-  - uid: 14080
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -17.5,8.5
-      parent: 60
-  - uid: 14081
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -15.5,5.5
-      parent: 60
-  - uid: 14082
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -15.5,6.5
-      parent: 60
-  - uid: 14086
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -15.5,8.5
-      parent: 60
   - uid: 14087
     components:
     - type: Transform
@@ -70207,12 +69295,6 @@ entities:
     - type: Transform
       pos: -24.5,-24.5
       parent: 60
-  - uid: 21509
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-17.5
-      parent: 60
   - uid: 21689
     components:
     - type: Transform
@@ -70654,12 +69736,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 33.5,22.5
       parent: 60
-  - uid: 2121
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-1.5
-      parent: 60
   - uid: 2271
     components:
     - type: Transform
@@ -70774,17 +69850,28 @@ entities:
     - type: Transform
       pos: -56.5,14.5
       parent: 60
-  - uid: 11367
+  - uid: 13700
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -30.5,-16.5
+      pos: -22.5,-15.5
+      parent: 60
+  - uid: 13748
+    components:
+    - type: Transform
+      pos: -34.5,-2.5
       parent: 60
   - uid: 13756
     components:
     - type: Transform
       pos: 7.5,10.5
       parent: 60
+  - uid: 13817
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -19.5,-3.5
+      parent: 60
   - uid: 14067
     components:
     - type: Transform
@@ -70801,6 +69888,12 @@ entities:
     - type: Transform
       pos: -43.5,-3.5
       parent: 60
+  - uid: 14365
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,-20.5
+      parent: 60
   - uid: 15793
     components:
     - type: Transform
@@ -70910,11 +70003,6 @@ entities:
     - type: Transform
       pos: 19.5,-20.5
       parent: 60
-  - uid: 144
-    components:
-    - type: Transform
-      pos: -30.5,-16.5
-      parent: 60
   - uid: 659
     components:
     - type: Transform
@@ -70935,6 +70023,26 @@ entities:
     - type: Transform
       pos: 3.5,-27.5
       parent: 60
+  - uid: 1354
+    components:
+    - type: Transform
+      pos: -26.5,-20.5
+      parent: 60
+  - uid: 1869
+    components:
+    - type: Transform
+      pos: -34.5,-2.5
+      parent: 60
+  - uid: 1914
+    components:
+    - type: Transform
+      pos: -19.5,-3.5
+      parent: 60
+  - uid: 1971
+    components:
+    - type: Transform
+      pos: -22.5,-15.5
+      parent: 60
   - uid: 2273
     components:
     - type: Transform
@@ -71045,11 +70153,6 @@ entities:
     - type: Transform
       pos: -56.5,14.5
       parent: 60
-  - uid: 11363
-    components:
-    - type: Transform
-      pos: -13.5,-1.5
-      parent: 60
   - uid: 13757
     components:
     - type: Transform
@@ -71149,6 +70252,13 @@ entities:
     - type: Transform
       pos: 57.5,20.5
       parent: 60
+- proto: DisposalXJunction
+  entities:
+  - uid: 966
+    components:
+    - type: Transform
+      pos: 0.5,-23.5
+      parent: 60
 - proto: DisposalYJunction
   entities:
   - uid: 2351
@@ -71174,6 +70284,11 @@ entities:
       parent: 60
 - proto: DogBed
   entities:
+  - uid: 1855
+    components:
+    - type: Transform
+      pos: -27.5,-20.5
+      parent: 60
   - uid: 2036
     components:
     - type: MetaData
@@ -71196,11 +70311,6 @@ entities:
     - type: Transform
       pos: 6.5,-29.5
       parent: 60
-  - uid: 7920
-    components:
-    - type: Transform
-      pos: -25.5,-11.5
-      parent: 60
   - uid: 11557
     components:
     - type: Transform
@@ -71216,11 +70326,6 @@ entities:
       parent: 60
 - proto: DonkpocketBoxSpawner
   entities:
-  - uid: 628
-    components:
-    - type: Transform
-      pos: -24.5,-14.5
-      parent: 60
   - uid: 3137
     components:
     - type: Transform
@@ -71315,6 +70420,11 @@ entities:
       parent: 60
 - proto: DresserFilled
   entities:
+  - uid: 1469
+    components:
+    - type: Transform
+      pos: -7.5,-17.5
+      parent: 60
   - uid: 16967
     components:
     - type: Transform
@@ -71329,10 +70439,10 @@ entities:
       parent: 60
 - proto: DresserHeadOfSecurityFilled
   entities:
-  - uid: 1696
+  - uid: 1733
     components:
     - type: Transform
-      pos: -18.5,-3.5
+      pos: -27.5,2.5
       parent: 60
 - proto: DresserQuarterMasterFilled
   entities:
@@ -71350,23 +70460,11 @@ entities:
       parent: 60
 - proto: DresserWardenFilled
   entities:
-  - uid: 1861
+  - uid: 8267
     components:
     - type: Transform
-      pos: -28.5,-12.5
+      pos: -29.5,-20.5
       parent: 60
-    - type: Storage
-      storedItems:
-        1862:
-          position: 0,0
-          _rotation: South
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 1862
 - proto: DrinkDoctorsDelightGlass
   entities:
   - uid: 16136
@@ -71440,11 +70538,6 @@ entities:
       parent: 60
 - proto: DrinkMugMetal
   entities:
-  - uid: 1915
-    components:
-    - type: Transform
-      pos: -26.325293,-20.46791
-      parent: 60
   - uid: 16127
     components:
     - type: Transform
@@ -71464,13 +70557,6 @@ entities:
     - type: Transform
       pos: 4.3360195,21.684647
       parent: 60
-- proto: DrinkMugRed
-  entities:
-  - uid: 9546
-    components:
-    - type: Transform
-      pos: -26.590918,-20.34291
-      parent: 60
 - proto: DrinkSakeBottleFull
   entities:
   - uid: 3742
@@ -71572,16 +70658,6 @@ entities:
     - type: Transform
       pos: 51.394554,17.7191
       parent: 60
-  - uid: 13788
-    components:
-    - type: Transform
-      pos: -7.5137773,-11.361463
-      parent: 60
-  - uid: 16380
-    components:
-    - type: Transform
-      pos: -7.6075273,-11.314588
-      parent: 60
   - uid: 20082
     components:
     - type: Transform
@@ -71643,6 +70719,18 @@ entities:
       parent: 60
 - proto: EmergencyLight
   entities:
+  - uid: 1573
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -15.5,-11.5
+      parent: 60
+  - uid: 2856
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,-20.5
+      parent: 60
   - uid: 4955
     components:
     - type: Transform
@@ -71721,6 +70809,106 @@ entities:
     - type: PointLight
       enabled: True
     - type: ActiveEmergencyLight
+  - uid: 12558
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,2.5
+      parent: 60
+  - uid: 13684
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,-20.5
+      parent: 60
+  - uid: 13972
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,-4.5
+      parent: 60
+  - uid: 13983
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -34.5,-2.5
+      parent: 60
+  - uid: 14055
+    components:
+    - type: Transform
+      pos: -31.5,-11.5
+      parent: 60
+  - uid: 14075
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,-10.5
+      parent: 60
+  - uid: 14077
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -17.5,-12.5
+      parent: 60
+  - uid: 14078
+    components:
+    - type: Transform
+      pos: -20.5,-22.5
+      parent: 60
+  - uid: 14080
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -36.5,-8.5
+      parent: 60
+  - uid: 14081
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -36.5,3.5
+      parent: 60
+  - uid: 14082
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,7.5
+      parent: 60
+  - uid: 14083
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,7.5
+      parent: 60
+  - uid: 14084
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,2.5
+      parent: 60
+  - uid: 14375
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,-18.5
+      parent: 60
+  - uid: 14652
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -38.5,-17.5
+      parent: 60
+  - uid: 14696
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-24.5
+      parent: 60
+  - uid: 15445
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -18.5,-0.5
+      parent: 60
   - uid: 21368
     components:
     - type: Transform
@@ -71903,13 +71091,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,31.5
       parent: 60
-- proto: EmergencyMedipen
-  entities:
-  - uid: 17955
-    components:
-    - type: Transform
-      pos: -18.983906,-13.563609
-      parent: 60
 - proto: EmergencyOxygenTankFilled
   entities:
   - uid: 21242
@@ -72100,16 +71281,6 @@ entities:
     - type: Transform
       pos: -17.5,16.5
       parent: 60
-  - uid: 1979
-    components:
-    - type: Transform
-      pos: -35.5,-14.5
-      parent: 60
-  - uid: 2005
-    components:
-    - type: Transform
-      pos: -17.5,-15.5
-      parent: 60
   - uid: 3153
     components:
     - type: Transform
@@ -72156,6 +71327,12 @@ entities:
     - type: Transform
       pos: 9.5,-31.5
       parent: 60
+  - uid: 8273
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-5.5
+      parent: 60
   - uid: 8911
     components:
     - type: Transform
@@ -72171,11 +71348,22 @@ entities:
     - type: Transform
       pos: 46.5,16.5
       parent: 60
+  - uid: 13719
+    components:
+    - type: Transform
+      pos: -17.5,-21.5
+      parent: 60
   - uid: 14158
     components:
     - type: Transform
       pos: -12.5,12.5
       parent: 60
+  - uid: 14585
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-9.5
+      parent: 60
   - uid: 17230
     components:
     - type: Transform
@@ -72266,11 +71454,6 @@ entities:
     - type: Transform
       pos: -29.5,12.5
       parent: 60
-  - uid: 21739
-    components:
-    - type: Transform
-      pos: -28.5,-21.5
-      parent: 60
   - uid: 21740
     components:
     - type: Transform
@@ -72281,11 +71464,6 @@ entities:
     - type: Transform
       pos: -12.5,-25.5
       parent: 60
-  - uid: 21769
-    components:
-    - type: Transform
-      pos: -35.5,1.5
-      parent: 60
   - uid: 23077
     components:
     - type: Transform
@@ -72310,13 +71488,6 @@ entities:
       parent: 60
 - proto: FaxMachineBase
   entities:
-  - uid: 1578
-    components:
-    - type: Transform
-      pos: -26.5,-6.5
-      parent: 60
-    - type: FaxMachine
-      name: Security
   - uid: 4256
     components:
     - type: Transform
@@ -72331,13 +71502,6 @@ entities:
       parent: 60
     - type: FaxMachine
       name: HoP Office
-  - uid: 6890
-    components:
-    - type: Transform
-      pos: -20.5,-0.5
-      parent: 60
-    - type: FaxMachine
-      name: HoS Office
   - uid: 7919
     components:
     - type: Transform
@@ -72345,6 +71509,20 @@ entities:
       parent: 60
     - type: FaxMachine
       name: RD Office
+  - uid: 8341
+    components:
+    - type: Transform
+      pos: -27.5,0.5
+      parent: 60
+    - type: FaxMachine
+      name: Head of Security
+  - uid: 8348
+    components:
+    - type: Transform
+      pos: -34.5,-7.5
+      parent: 60
+    - type: FaxMachine
+      name: Security
   - uid: 11100
     components:
     - type: Transform
@@ -72424,6 +71602,11 @@ entities:
     - type: Transform
       pos: -45.5,-15.5
       parent: 60
+  - uid: 3168
+    components:
+    - type: Transform
+      pos: -33.5,0.5
+      parent: 60
   - uid: 4172
     components:
     - type: Transform
@@ -72434,6 +71617,16 @@ entities:
     - type: Transform
       pos: -53.5,8.5
       parent: 60
+  - uid: 7786
+    components:
+    - type: Transform
+      pos: -27.5,-18.5
+      parent: 60
+  - uid: 8282
+    components:
+    - type: Transform
+      pos: -34.5,-6.5
+      parent: 60
   - uid: 16408
     components:
     - type: Transform
@@ -72475,110 +71668,47 @@ entities:
       parent: 60
 - proto: FireAlarm
   entities:
-  - uid: 63
+  - uid: 137
     components:
     - type: Transform
-      pos: -24.5,-21.5
+      pos: -18.5,-16.5
       parent: 60
     - type: DeviceList
       devices:
-      - 21505
-      - 17493
-      - 15846
-      - 2585
-      - 9052
-      - 22
-      - 1491
-      - 670
-      - 672
-      - 671
-  - uid: 177
-    components:
-    - type: Transform
-      pos: -23.5,-2.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 1975
-      - 2002
-      - 1993
-      - 182
-      - 180
-      - 210
-      - 1972
-      - 1982
-      - 1967
-  - uid: 230
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -29.5,-13.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 180
-      - 182
-      - 1969
-      - 1985
-  - uid: 1962
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,5.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 8574
-      - 1644
-      - 1643
-      - 1645
-  - uid: 1970
+      - 13736
+      - 1790
+      - 13645
+      - 556
+  - uid: 1951
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -23.5,-13.5
+      pos: -21.5,-11.5
       parent: 60
     - type: DeviceList
       devices:
-      - 232
-      - 184
-      - 1976
-      - 1972
-      - 210
-  - uid: 4190
+      - 8269
+      - 13645
+      - 556
+      - 13622
+      - 13641
+  - uid: 4200
     components:
     - type: Transform
-      pos: -12.5,-21.5
+      pos: -31.5,-1.5
       parent: 60
     - type: DeviceList
       devices:
-      - 21505
-      - 17493
-      - 15846
-      - 2585
-      - 9052
-      - 22
-      - 1491
-      - 670
-      - 672
-      - 671
-  - uid: 4191
-    components:
-    - type: Transform
-      pos: -6.5,-21.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 21505
-      - 17493
-      - 15846
-      - 2585
-      - 9052
-      - 22
-      - 1491
-      - 670
-      - 672
-      - 671
+      - 8286
+      - 8285
+      - 8264
+      - 13445
+      - 13582
+      - 13583
+      - 12685
+      - 13098
+      - 14392
+      - 13584
   - uid: 4511
     components:
     - type: Transform
@@ -72608,44 +71738,11 @@ entities:
       - 4338
       - 4337
       - 4361
-      - 1643
-      - 1644
-      - 8574
       - 8986
       - 8521
       - 9054
       - 21513
-  - uid: 4627
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -35.5,-16.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 780
-      - 7721
-      - 1017
-      - 8168
-      - 5623
-      - 9468
-      - 21614
-      - 6098
-      - 6097
-      - 5940
-      - 21615
-  - uid: 4710
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -17.5,-17.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 122
-      - 9052
-      - 22
-      - 1491
+      - 16425
   - uid: 4831
     components:
     - type: Transform
@@ -72700,6 +71797,80 @@ entities:
       - 6593
       - 6785
       - 6661
+  - uid: 8268
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -35.5,-12.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 8286
+      - 8285
+      - 8264
+      - 13585
+      - 13599
+      - 13617
+      - 13615
+      - 13614
+      - 13613
+      - 13610
+  - uid: 8274
+    components:
+    - type: Transform
+      pos: -27.5,-10.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 13619
+      - 13620
+      - 13615
+      - 13617
+      - 13658
+      - 13657
+      - 13654
+  - uid: 8332
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-7.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 13585
+      - 13599
+  - uid: 8333
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-17.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 13614
+      - 13654
+      - 13657
+      - 13658
+      - 8345
+      - 13784
+      - 8331
+  - uid: 8334
+    components:
+    - type: Transform
+      pos: -32.5,-17.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 13613
+  - uid: 8336
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,2.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 12685
   - uid: 8889
     components:
     - type: Transform
@@ -72715,6 +71886,21 @@ entities:
       - 8961
       - 3110
       - 18825
+  - uid: 9058
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-25.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 6043
+      - 6041
+      - 5836
+      - 14366
+      - 8263
+      - 8291
+      - 8293
   - uid: 9395
     components:
     - type: Transform
@@ -72739,10 +71925,16 @@ entities:
       - 21614
       - 9468
       - 5623
-      - 6098
-      - 6097
-      - 5940
       - 21615
+  - uid: 11437
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,-4.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 14392
   - uid: 12733
     components:
     - type: Transform
@@ -72753,6 +71945,42 @@ entities:
       devices:
       - 12571
       - 12594
+  - uid: 14374
+    components:
+    - type: Transform
+      pos: -7.5,-21.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 671
+      - 670
+      - 672
+      - 8287
+      - 8288
+      - 8289
+      - 8263
+      - 8291
+      - 8293
+      - 8265
+      - 13670
+  - uid: 14454
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -25.5,-14.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 8289
+      - 8288
+      - 8287
+      - 8331
+      - 13784
+      - 8345
+      - 13620
+      - 13622
+      - 13619
+      - 8269
   - uid: 16334
     components:
     - type: Transform
@@ -72831,20 +72059,6 @@ entities:
       - 9184
       - 9237
       - 6626
-  - uid: 21506
-    components:
-    - type: Transform
-      pos: -31.5,-21.5
-      parent: 60
-    - type: DeviceList
-      devices:
-      - 6098
-      - 6097
-      - 5940
-      - 2585
-      - 15846
-      - 17493
-      - 21508
   - uid: 21514
     components:
     - type: Transform
@@ -73025,17 +72239,21 @@ entities:
       parent: 60
     - type: DeviceList
       devices:
-      - 5940
-      - 6097
-      - 6098
-      - 21614
+      - 13583
       - 9468
       - 5623
       - 8168
       - 1017
       - 7721
       - 780
-      - 21615
+      - 6082
+      - 13582
+      - 13445
+      - 7051
+      - 6043
+      - 6041
+      - 5836
+      - 13584
   - uid: 21617
     components:
     - type: Transform
@@ -73348,33 +72566,6 @@ entities:
       parent: 60
 - proto: FirelockEdge
   entities:
-  - uid: 22
-    components:
-    - type: Transform
-      pos: -15.5,-20.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 4191
-      - 4710
-      - 4190
-      - 63
-  - uid: 184
-    components:
-    - type: Transform
-      pos: -18.5,-16.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 1970
-  - uid: 232
-    components:
-    - type: Transform
-      pos: -20.5,-16.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 1970
   - uid: 458
     components:
     - type: Transform
@@ -73390,6 +72581,16 @@ entities:
     - type: Transform
       pos: -0.5,-20.5
       parent: 60
+  - uid: 556
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -17.5,-17.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 1951
+      - 137
   - uid: 1280
     components:
     - type: Transform
@@ -73398,37 +72599,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21553
-  - uid: 1491
-    components:
-    - type: Transform
-      pos: -14.5,-20.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 4191
-      - 4710
-      - 4190
-      - 63
-  - uid: 1643
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,5.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 4545
-      - 1962
-  - uid: 1644
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -15.5,5.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 4545
-      - 1962
   - uid: 1698
     components:
     - type: Transform
@@ -73445,50 +72615,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21553
-  - uid: 1967
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-5.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 177
-  - uid: 1969
-    components:
-    - type: Transform
-      pos: -33.5,-16.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 230
-  - uid: 1982
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-9.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 177
-  - uid: 1993
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -32.5,-9.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 177
-  - uid: 2002
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -32.5,-5.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 177
   - uid: 2455
     components:
     - type: Transform
@@ -73571,6 +72697,16 @@ entities:
     - type: Transform
       pos: -0.5,-58.5
       parent: 60
+  - uid: 8269
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -22.5,-14.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 1951
+      - 14454
   - uid: 8408
     components:
     - type: Transform
@@ -73598,16 +72734,6 @@ entities:
       deviceLists:
       - 23767
       - 4545
-  - uid: 8574
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,5.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 4545
-      - 1962
   - uid: 8986
     components:
     - type: Transform
@@ -73617,17 +72743,6 @@ entities:
       deviceLists:
       - 23767
       - 4545
-  - uid: 9052
-    components:
-    - type: Transform
-      pos: -16.5,-20.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 4191
-      - 4710
-      - 4190
-      - 63
   - uid: 9054
     components:
     - type: Transform
@@ -73682,6 +72797,16 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21539
+  - uid: 13645
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,-17.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 1951
+      - 137
   - uid: 17035
     components:
     - type: Transform
@@ -73943,33 +73068,6 @@ entities:
       - 25158
 - proto: FirelockGlass
   entities:
-  - uid: 180
-    components:
-    - type: Transform
-      pos: -30.5,-12.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 230
-      - 177
-  - uid: 182
-    components:
-    - type: Transform
-      pos: -31.5,-12.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 230
-      - 177
-  - uid: 210
-    components:
-    - type: Transform
-      pos: -22.5,-12.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 1970
-      - 177
   - uid: 670
     components:
     - type: Transform
@@ -73977,9 +73075,7 @@ entities:
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 4191
-      - 4190
-      - 63
+      - 14374
   - uid: 671
     components:
     - type: Transform
@@ -73987,9 +73083,7 @@ entities:
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 4191
-      - 4190
-      - 63
+      - 14374
   - uid: 672
     components:
     - type: Transform
@@ -73997,9 +73091,7 @@ entities:
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 4191
-      - 4190
-      - 63
+      - 14374
   - uid: 673
     components:
     - type: Transform
@@ -74034,7 +73126,6 @@ entities:
       - 21635
       - 21613
       - 11347
-      - 4627
   - uid: 1017
     components:
     - type: Transform
@@ -74045,7 +73136,6 @@ entities:
       - 21635
       - 21613
       - 11347
-      - 4627
   - uid: 1191
     components:
     - type: Transform
@@ -74059,15 +73149,19 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21558
-  - uid: 1972
+  - uid: 1790
     components:
     - type: Transform
-      pos: -21.5,-12.5
+      pos: -8.5,-19.5
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 1970
-      - 177
+      - 137
+  - uid: 1960
+    components:
+    - type: Transform
+      pos: -13.5,3.5
+      parent: 60
   - uid: 2044
     components:
     - type: Transform
@@ -74083,17 +73177,6 @@ entities:
     - type: Transform
       pos: 42.5,-30.5
       parent: 60
-  - uid: 2585
-    components:
-    - type: Transform
-      pos: -26.5,-22.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 4191
-      - 21506
-      - 4190
-      - 63
   - uid: 2680
     components:
     - type: Transform
@@ -74347,12 +73430,20 @@ entities:
       deviceLists:
       - 21613
       - 11347
-      - 4627
   - uid: 5684
     components:
     - type: Transform
       pos: 44.5,-38.5
       parent: 60
+  - uid: 5836
+    components:
+    - type: Transform
+      pos: -38.5,-15.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 9058
+      - 21613
   - uid: 5900
     components:
     - type: Transform
@@ -74363,39 +73454,32 @@ entities:
     - type: Transform
       pos: 16.5,6.5
       parent: 60
-  - uid: 5940
+  - uid: 6041
     components:
     - type: Transform
-      pos: -36.5,-17.5
+      pos: -37.5,-15.5
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 21506
+      - 9058
       - 21613
-      - 11347
-      - 4627
-  - uid: 6097
+  - uid: 6043
     components:
     - type: Transform
-      pos: -37.5,-17.5
+      pos: -36.5,-15.5
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 21506
+      - 9058
       - 21613
-      - 11347
-      - 4627
-  - uid: 6098
+  - uid: 6082
     components:
     - type: Transform
-      pos: -38.5,-17.5
+      pos: -38.5,10.5
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 21506
       - 21613
-      - 11347
-      - 4627
   - uid: 6133
     components:
     - type: Transform
@@ -74455,6 +73539,9 @@ entities:
     - type: Transform
       pos: -40.5,-5.5
       parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 21613
   - uid: 7118
     components:
     - type: Transform
@@ -74508,7 +73595,6 @@ entities:
       - 21635
       - 21613
       - 11347
-      - 4627
   - uid: 8168
     components:
     - type: Transform
@@ -74518,7 +73604,118 @@ entities:
       deviceLists:
       - 21613
       - 11347
-      - 4627
+  - uid: 8263
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,-22.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 9058
+      - 14374
+  - uid: 8264
+    components:
+    - type: Transform
+      pos: -34.5,-5.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8268
+      - 4200
+  - uid: 8265
+    components:
+    - type: Transform
+      pos: -24.5,-25.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 14374
+  - uid: 8285
+    components:
+    - type: Transform
+      pos: -33.5,-5.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8268
+      - 4200
+  - uid: 8286
+    components:
+    - type: Transform
+      pos: -32.5,-5.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8268
+      - 4200
+  - uid: 8287
+    components:
+    - type: Transform
+      pos: -22.5,-21.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 14454
+      - 14374
+  - uid: 8288
+    components:
+    - type: Transform
+      pos: -23.5,-21.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 14454
+      - 14374
+  - uid: 8289
+    components:
+    - type: Transform
+      pos: -24.5,-21.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 14454
+      - 14374
+  - uid: 8291
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,-23.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 9058
+      - 14374
+  - uid: 8293
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,-24.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 9058
+      - 14374
+  - uid: 8331
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,-18.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8333
+      - 14454
+  - uid: 8345
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,-16.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8333
+      - 14454
   - uid: 8611
     components:
     - type: Transform
@@ -74608,7 +73805,6 @@ entities:
       deviceLists:
       - 21613
       - 11347
-      - 4627
   - uid: 9526
     components:
     - type: Transform
@@ -74649,6 +73845,15 @@ entities:
     - type: Transform
       pos: 42.5,-18.5
       parent: 60
+  - uid: 12685
+    components:
+    - type: Transform
+      pos: -30.5,-1.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 4200
+      - 8336
   - uid: 12765
     components:
     - type: Transform
@@ -74659,6 +73864,14 @@ entities:
     - type: Transform
       pos: -50.5,-24.5
       parent: 60
+  - uid: 13098
+    components:
+    - type: Transform
+      pos: -24.5,-1.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 4200
   - uid: 13106
     components:
     - type: Transform
@@ -74710,6 +73923,195 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21514
+  - uid: 13445
+    components:
+    - type: Transform
+      pos: -35.5,-1.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 4200
+      - 21613
+  - uid: 13582
+    components:
+    - type: Transform
+      pos: -35.5,-0.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 4200
+      - 21613
+  - uid: 13583
+    components:
+    - type: Transform
+      pos: -35.5,0.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 4200
+      - 21613
+  - uid: 13584
+    components:
+    - type: Transform
+      pos: -35.5,-3.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 21613
+      - 4200
+  - uid: 13585
+    components:
+    - type: Transform
+      pos: -31.5,-7.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8268
+      - 8332
+  - uid: 13599
+    components:
+    - type: Transform
+      pos: -31.5,-8.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8268
+      - 8332
+  - uid: 13610
+    components:
+    - type: Transform
+      pos: -34.5,-15.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8268
+  - uid: 13613
+    components:
+    - type: Transform
+      pos: -31.5,-17.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8334
+      - 8268
+  - uid: 13614
+    components:
+    - type: Transform
+      pos: -30.5,-15.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8333
+      - 8268
+  - uid: 13615
+    components:
+    - type: Transform
+      pos: -29.5,-13.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8268
+      - 8274
+  - uid: 13617
+    components:
+    - type: Transform
+      pos: -29.5,-11.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8268
+      - 8274
+  - uid: 13619
+    components:
+    - type: Transform
+      pos: -25.5,-11.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 14454
+      - 8274
+  - uid: 13620
+    components:
+    - type: Transform
+      pos: -25.5,-13.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 14454
+      - 8274
+  - uid: 13622
+    components:
+    - type: Transform
+      pos: -21.5,-12.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 1951
+      - 14454
+  - uid: 13641
+    components:
+    - type: Transform
+      pos: -18.5,-10.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 1951
+  - uid: 13654
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -28.5,-14.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8333
+      - 8274
+  - uid: 13657
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -27.5,-14.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8333
+      - 8274
+  - uid: 13658
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,-14.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8333
+      - 8274
+  - uid: 13670
+    components:
+    - type: Transform
+      pos: -9.5,-25.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 14374
+  - uid: 13736
+    components:
+    - type: Transform
+      pos: -8.5,-16.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 137
+  - uid: 13784
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,-17.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8333
+      - 14454
   - uid: 13961
     components:
     - type: Transform
@@ -74730,17 +74132,23 @@ entities:
     - type: Transform
       pos: -20.5,26.5
       parent: 60
-  - uid: 15846
+  - uid: 14366
     components:
     - type: Transform
-      pos: -26.5,-23.5
+      pos: -39.5,-20.5
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 4191
-      - 21506
-      - 4190
-      - 63
+      - 9058
+  - uid: 14392
+    components:
+    - type: Transform
+      pos: -22.5,-3.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 11437
+      - 4200
   - uid: 16007
     components:
     - type: Transform
@@ -74766,6 +74174,14 @@ entities:
       deviceLists:
       - 16330
       - 16334
+  - uid: 16425
+    components:
+    - type: Transform
+      pos: -15.5,6.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 4545
   - uid: 16556
     components:
     - type: Transform
@@ -74790,17 +74206,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21710
-  - uid: 17493
-    components:
-    - type: Transform
-      pos: -26.5,-24.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 4191
-      - 21506
-      - 4190
-      - 63
   - uid: 18608
     components:
     - type: Transform
@@ -74942,10 +74347,10 @@ entities:
       - 25158
 - proto: Fireplace
   entities:
-  - uid: 6065
+  - uid: 1874
     components:
     - type: Transform
-      pos: -21.5,1.5
+      pos: -30.5,2.5
       parent: 60
   - uid: 7044
     components:
@@ -74978,6 +74383,11 @@ entities:
       parent: 60
 - proto: FlashlightLantern
   entities:
+  - uid: 1702
+    components:
+    - type: Transform
+      pos: -24.629189,-7.388514
+      parent: 60
   - uid: 4669
     components:
     - type: Transform
@@ -74988,6 +74398,11 @@ entities:
     - type: Transform
       pos: -59.580887,2.6484475
       parent: 60
+  - uid: 15693
+    components:
+    - type: Transform
+      pos: -24.452017,-7.607415
+      parent: 60
   - uid: 18112
     components:
     - type: Transform
@@ -75033,13 +74448,6 @@ entities:
     - type: Transform
       pos: -70.59139,20.353971
       parent: 60
-- proto: FlashlightSeclite
-  entities:
-  - uid: 323
-    components:
-    - type: Transform
-      pos: -21.5,-20.5
-      parent: 60
 - proto: FlippoLighter
   entities:
   - uid: 1352
@@ -75054,6 +74462,13 @@ entities:
       parent: 60
 - proto: FloorDrain
   entities:
+  - uid: 1681
+    components:
+    - type: Transform
+      pos: -7.5,-19.5
+      parent: 60
+    - type: Fixtures
+      fixtures: {}
   - uid: 2376
     components:
     - type: Transform
@@ -75082,13 +74497,6 @@ entities:
       parent: 60
     - type: Fixtures
       fixtures: {}
-  - uid: 13567
-    components:
-    - type: Transform
-      pos: -10.5,-20.5
-      parent: 60
-    - type: Fixtures
-      fixtures: {}
   - uid: 16413
     components:
     - type: Transform
@@ -75946,11 +75354,6 @@ entities:
       parent: 60
 - proto: FoodBoxDonut
   entities:
-  - uid: 1737
-    components:
-    - type: Transform
-      pos: -25.411478,-6.2389956
-      parent: 60
   - uid: 24664
     components:
     - type: Transform
@@ -76023,6 +75426,11 @@ entities:
       parent: 60
 - proto: FoodCondimentBottleHotsauce
   entities:
+  - uid: 562
+    components:
+    - type: Transform
+      pos: -13.060958,-17.89485
+      parent: 60
   - uid: 15672
     components:
     - type: Transform
@@ -76058,6 +75466,13 @@ entities:
     - type: Transform
       pos: 13.415919,-46.397263
       parent: 60
+- proto: FoodMealNachosCuban
+  entities:
+  - uid: 1765
+    components:
+    - type: Transform
+      pos: -13.415124,-18.332655
+      parent: 60
 - proto: FoodMealSashimi
   entities:
   - uid: 19185
@@ -76104,6 +75519,18 @@ entities:
     - type: Transform
       pos: 23.456995,-16.221992
       parent: 60
+- proto: FoodPieAmanita
+  entities:
+  - uid: 16123
+    components:
+    - type: Transform
+      pos: -12.626294,-18.102554
+      parent: 60
+  - uid: 16380
+    components:
+    - type: Transform
+      pos: -12.496665,-18.30331
+      parent: 60
 - proto: FoodPieBananaCream
   entities:
   - uid: 6652
@@ -76133,6 +75560,18 @@ entities:
     - type: Transform
       pos: 0.7201361,20.6325
       parent: 60
+- proto: FoodPlate
+  entities:
+  - uid: 2094
+    components:
+    - type: Transform
+      pos: -12.57701,-17.270191
+      parent: 60
+  - uid: 2095
+    components:
+    - type: Transform
+      pos: -12.483214,-17.364006
+      parent: 60
 - proto: FoodPlateSmall
   entities:
   - uid: 14388
@@ -76622,12 +76061,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 13683
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-13.5
-      parent: 60
   - uid: 13934
     components:
     - type: Transform
@@ -76807,29 +76240,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 766
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -25.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 784
-    components:
-    - type: Transform
-      pos: -27.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 793
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -34.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 947
     components:
     - type: Transform
@@ -76845,6 +76255,46 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 1122
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-2.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1129
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-16.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1135
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,-17.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1144
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-17.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1157
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -15.5,-16.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 1388
     components:
     - type: Transform
@@ -76868,14 +76318,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1700
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -31.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1776
     components:
     - type: Transform
@@ -76892,21 +76334,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 2113
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -32.5,-20.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 2120
-    components:
-    - type: Transform
-      pos: -20.5,-16.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 2203
     components:
     - type: Transform
@@ -76930,14 +76357,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 2278
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -30.5,-16.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 2366
     components:
     - type: Transform
@@ -76954,22 +76373,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 2513
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -32.5,-16.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 2569
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -22.5,-16.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 2999
     components:
     - type: Transform
@@ -77047,6 +76450,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 4080
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-6.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 4238
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-1.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 4739
     components:
     - type: Transform
@@ -77125,6 +76544,29 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 5155
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,-11.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 5429
+    components:
+    - type: Transform
+      pos: -23.5,-0.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 5430
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -23.5,-6.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 5474
     components:
     - type: Transform
@@ -77256,6 +76698,21 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 5910
+    components:
+    - type: Transform
+      pos: -29.5,-15.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 5947
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -32.5,-14.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 5950
     components:
     - type: Transform
@@ -77264,6 +76721,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 5961
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -34.5,-14.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 5967
     components:
     - type: Transform
@@ -77294,6 +76759,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 6087
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 6112
     components:
     - type: Transform
@@ -77310,14 +76783,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 6309
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,-1.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 6401
     components:
     - type: Transform
@@ -77326,14 +76791,21 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 6796
+  - uid: 6560
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-16.5
+      pos: -17.5,-15.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 6705
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -32.5,-4.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 6823
     components:
     - type: Transform
@@ -77341,6 +76813,44 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 6824
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 6830
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -22.5,-12.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 6884
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,-13.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 6886
+    components:
+    - type: Transform
+      pos: -23.5,-11.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7166
+    components:
+    - type: Transform
+      pos: -24.5,5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 7357
     components:
     - type: Transform
@@ -77361,28 +76871,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 7907
+  - uid: 8351
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -25.5,-18.5
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-2.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8212
-    components:
-    - type: Transform
-      pos: -18.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8343
-    components:
-    - type: Transform
-      pos: -31.5,-1.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
   - uid: 8386
     components:
     - type: Transform
@@ -77428,6 +76924,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 8674
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -21.5,-1.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 8919
     components:
     - type: Transform
@@ -77482,13 +76986,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 11154
-    components:
-    - type: Transform
-      pos: -6.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 11281
     components:
     - type: Transform
@@ -77638,14 +77135,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 13631
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-18.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 14217
     components:
     - type: Transform
@@ -77684,6 +77173,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 14370
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-16.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 14666
     components:
     - type: Transform
@@ -78645,27 +78142,20 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1177
+  - uid: 1656
     components:
     - type: Transform
-      pos: -16.5,9.5
+      pos: -23.5,-22.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1657
+    components:
+    - type: Transform
+      pos: -24.5,-24.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1664
-    components:
-    - type: Transform
-      pos: -22.5,-5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1744
-    components:
-    - type: Transform
-      pos: -30.5,-5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 2361
     components:
     - type: Transform
@@ -78755,13 +78245,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 5837
-    components:
-    - type: Transform
-      pos: -20.5,-22.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 5991
     components:
     - type: Transform
@@ -78804,13 +78287,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 7904
-    components:
-    - type: Transform
-      pos: -14.5,7.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 9232
     components:
     - type: Transform
@@ -79032,6 +78508,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 240
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-19.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 269
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -30.5,5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 272
     components:
     - type: Transform
@@ -79040,6 +78532,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 284
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-19.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 291
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-19.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 293
     components:
     - type: Transform
@@ -79056,6 +78564,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 295
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -27.5,5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 299
     components:
     - type: Transform
@@ -79104,6 +78620,13 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 315
+    components:
+    - type: Transform
+      pos: -23.5,-21.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 318
     components:
     - type: Transform
@@ -79112,14 +78635,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 336
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -31.5,-16.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 360
     components:
     - type: Transform
@@ -79437,6 +78952,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 617
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -16.5,-0.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 618
     components:
     - type: Transform
@@ -79453,13 +78976,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 632
+  - uid: 630
     components:
     - type: Transform
-      pos: -14.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: -24.5,-4.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 716
     components:
     - type: Transform
@@ -79475,54 +78999,13 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 781
+  - uid: 778
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,-16.5
+      pos: -23.5,-20.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 782
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -29.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 783
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -28.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 794
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -15.5,9.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 838
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -23.5,-10.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 839
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-10.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 874
     components:
     - type: Transform
@@ -79755,11 +79238,18 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 991
+  - uid: 971
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-14.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 980
+    components:
+    - type: Transform
+      pos: -15.5,7.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -79771,6 +79261,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 1022
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,-13.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 1029
     components:
     - type: Transform
@@ -80305,302 +79803,31 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1119
+  - uid: 1136
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-21.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1120
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-20.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1123
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-19.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1124
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-18.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1125
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: -22.5,-2.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1126
-    components:
-    - type: Transform
-      pos: -16.5,-17.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1127
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-17.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1129
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-16.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1130
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1131
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1132
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-14.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1134
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-12.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1135
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-13.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1137
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-12.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1138
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-11.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1139
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-11.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1140
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-10.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1141
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-10.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1142
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-9.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1143
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-9.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1144
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-8.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1145
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-8.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1146
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-7.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1147
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-7.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1149
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-6.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1151
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1152
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-4.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1153
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-4.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1154
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-3.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1155
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-3.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1156
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-2.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1157
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-2.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1158
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-1.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1159
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-1.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1160
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-24.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1161
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-19.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1163
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,0.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1164
+  - uid: 1165
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -80608,54 +79835,35 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1165
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,1.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1166
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -14.5,2.5
+      pos: -16.5,0.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 1169
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,3.5
+      pos: -13.5,-11.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 1171
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,4.5
+      pos: -15.5,8.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1172
+  - uid: 1175
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,5.5
+      pos: -15.5,4.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1173
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1176
     components:
     - type: Transform
@@ -80664,27 +79872,28 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1214
+  - uid: 1177
     components:
     - type: Transform
-      pos: -14.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: -16.5,7.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1215
+  - uid: 1210
     components:
     - type: Transform
-      pos: -16.5,8.5
+      pos: -13.5,-10.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1216
+  - uid: 1215
     components:
     - type: Transform
-      pos: -14.5,6.5
+      pos: -15.5,6.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 1218
     components:
     - type: Transform
@@ -80693,13 +79902,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1219
-    components:
-    - type: Transform
-      pos: -16.5,7.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1220
     components:
     - type: Transform
@@ -81075,6 +80277,30 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 1459
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -17.5,-16.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1466
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-19.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1467
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -17.5,-17.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 1497
     components:
     - type: Transform
@@ -81098,14 +80324,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1506
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-21.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1519
     components:
     - type: Transform
@@ -81130,6 +80348,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 1553
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -18.5,-19.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1564
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -17.5,-18.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 1588
     components:
     - type: Transform
@@ -81145,14 +80379,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1602
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-23.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1605
     components:
     - type: Transform
@@ -81185,14 +80411,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1612
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -26.5,-24.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1613
     components:
     - type: Transform
@@ -81220,11 +80438,11 @@ entities:
   - uid: 1630
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-22.5
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-22.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
   - uid: 1641
     components:
     - type: Transform
@@ -81233,30 +80451,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1663
+  - uid: 1655
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -32.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-22.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1666
+  - uid: 1658
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-10.5
+      rot: 1.5707963267948966 rad
+      pos: -18.5,-24.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1668
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,-19.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1669
     components:
     - type: Transform
@@ -81265,14 +80475,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1684
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-20.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1692
     components:
     - type: Transform
@@ -81288,14 +80490,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1702
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,-18.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1705
     components:
     - type: Transform
@@ -81320,44 +80514,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1718
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -35.5,-20.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1721
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -32.5,-7.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1724
-    components:
-    - type: Transform
-      pos: -22.5,-8.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1725
-    components:
-    - type: Transform
-      pos: -22.5,-6.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1729
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -32.5,-5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1730
     components:
     - type: Transform
@@ -81365,22 +80521,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1732
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,-17.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1734
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,-5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1747
     components:
     - type: Transform
@@ -81389,22 +80529,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1748
+  - uid: 1751
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -32.5,-17.5
+      pos: -24.5,-23.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 1752
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -31.5,-9.5
+      rot: 3.141592653589793 rad
+      pos: -24.5,-22.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 1753
     components:
     - type: Transform
@@ -81427,43 +80567,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1757
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1758
-    components:
-    - type: Transform
-      pos: -22.5,-13.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1765
-    components:
-    - type: Transform
-      pos: -22.5,-12.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1766
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1767
-    components:
-    - type: Transform
-      pos: -22.5,-11.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1769
     components:
     - type: Transform
@@ -81507,13 +80610,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1779
-    components:
-    - type: Transform
-      pos: -36.5,5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1782
     components:
     - type: Transform
@@ -81550,141 +80646,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1790
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -36.5,-18.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1791
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -24.5,-5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1793
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -37.5,-18.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1794
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -25.5,-5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1796
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -26.5,-5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1797
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,-19.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1798
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -35.5,-18.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1799
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-19.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1800
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,-17.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1804
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-12.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1805
-    components:
-    - type: Transform
-      pos: -30.5,-6.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1811
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-8.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1812
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -34.5,-20.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1813
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-13.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1816
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-11.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1819
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,3.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1823
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -29.5,-5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1825
     components:
     - type: Transform
@@ -81728,13 +80689,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1838
-    components:
-    - type: Transform
-      pos: -22.5,-10.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1839
     components:
     - type: Transform
@@ -81758,14 +80712,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1843
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-7.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1844
     components:
     - type: Transform
@@ -81782,29 +80728,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1852
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-3.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1871
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-4.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1875
-    components:
-    - type: Transform
-      pos: -38.5,-17.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1876
     components:
     - type: Transform
@@ -81902,6 +80825,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 1958
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-19.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 1961
     components:
     - type: Transform
@@ -81910,22 +80841,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1973
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,-14.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1978
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -31.5,-14.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1991
     components:
     - type: Transform
@@ -81992,6 +80907,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 2007
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,-12.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 2008
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -16.5,-2.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 2010
     components:
     - type: Transform
@@ -82084,10 +81015,11 @@ entities:
   - uid: 2108
     components:
     - type: Transform
-      pos: -36.5,-19.5
+      rot: -1.5707963267948966 rad
+      pos: -26.5,-24.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 2109
     components:
     - type: Transform
@@ -82164,22 +81096,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 2131
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -33.5,-20.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 2133
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -28.5,-10.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 2159
     components:
     - type: Transform
@@ -82188,14 +81104,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 2160
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-17.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 2161
     components:
     - type: Transform
@@ -82204,20 +81112,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 2162
-    components:
-    - type: Transform
-      pos: -18.5,-16.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 2183
-    components:
-    - type: Transform
-      pos: -22.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 2194
     components:
     - type: Transform
@@ -82952,13 +81846,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 2808
-    components:
-    - type: Transform
-      pos: -22.5,-4.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 2810
     components:
     - type: Transform
@@ -83037,13 +81924,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 2860
-    components:
-    - type: Transform
-      pos: -22.5,-3.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 2862
     components:
     - type: Transform
@@ -83106,14 +81986,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 2940
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -23.5,-3.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 2980
     components:
     - type: Transform
@@ -83273,22 +82145,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#D3FC03FF'
-  - uid: 3070
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,-7.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 3072
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-7.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 3113
     components:
     - type: Transform
@@ -83305,22 +82161,38 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 3168
+  - uid: 3172
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -28.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: -16.5,-1.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 3182
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -16.5,-3.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 3186
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -29.5,-10.5
+      rot: 3.141592653589793 rad
+      pos: -16.5,-4.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
+  - uid: 3187
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -16.5,-5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 3190
     components:
     - type: Transform
@@ -83344,6 +82216,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 3196
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -17.5,-6.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 3197
     components:
     - type: Transform
@@ -83352,6 +82232,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 3198
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -18.5,-6.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 3204
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,-6.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 3216
     components:
     - type: Transform
@@ -83868,6 +82764,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 4018
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 4023
     components:
     - type: Transform
@@ -84003,12 +82907,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 4137
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-13.5
-      parent: 60
   - uid: 4143
     components:
     - type: Transform
@@ -84088,6 +82986,68 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 4209
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -28.5,5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4216
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4217
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4218
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,4.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4220
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4235
+    components:
+    - type: Transform
+      pos: -24.5,0.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4239
+    components:
+    - type: Transform
+      pos: -24.5,2.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4281
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,-0.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 4325
     components:
     - type: Transform
@@ -84167,6 +83127,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 4504
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,-1.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4506
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,-2.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 4507
     components:
     - type: Transform
@@ -84175,6 +83151,38 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 4516
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,-3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4519
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -25.5,-3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4522
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4547
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,-3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 4550
     components:
     - type: Transform
@@ -84182,6 +83190,52 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 4554
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,-3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4555
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,-3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4562
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,-3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4566
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -32.5,-3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4567
+    components:
+    - type: Transform
+      pos: -33.5,-4.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4627
+    components:
+    - type: Transform
+      pos: -33.5,-5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 4629
     components:
     - type: Transform
@@ -84240,6 +83294,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 4686
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -29.5,5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 4725
     components:
     - type: Transform
@@ -84254,6 +83316,13 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 4754
+    components:
+    - type: Transform
+      pos: -33.5,-8.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 4836
     components:
     - type: Transform
@@ -84334,6 +83403,13 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 4898
+    components:
+    - type: Transform
+      pos: -33.5,-9.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 4908
     components:
     - type: Transform
@@ -84599,6 +83675,13 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 5010
+    components:
+    - type: Transform
+      pos: -33.5,-10.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 5012
     components:
     - type: Transform
@@ -84676,11 +83759,27 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 5224
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -32.5,-11.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 5246
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -21.5,-9.5
+      pos: -30.5,-11.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 5294
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -29.5,-11.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -84692,6 +83791,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 5313
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -28.5,-11.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 5364
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -27.5,-11.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 5392
     components:
     - type: Transform
@@ -84720,11 +83835,19 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 5425
+  - uid: 5423
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,-21.5
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-11.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 5424
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,-11.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -84744,6 +83867,37 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 5431
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-6.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 5432
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -21.5,-6.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 5436
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -22.5,-6.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 5437
+    components:
+    - type: Transform
+      pos: -23.5,-5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 5441
     components:
     - type: Transform
@@ -84815,6 +83969,21 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 5454
+    components:
+    - type: Transform
+      pos: -23.5,-3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 5456
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-4.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 5463
     components:
     - type: Transform
@@ -84877,14 +84046,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 5475
+  - uid: 5472
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -16.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: -27.5,-4.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 5487
     components:
     - type: Transform
@@ -84933,21 +84102,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 5563
+  - uid: 5562
     components:
     - type: Transform
-      pos: -16.5,-19.5
+      rot: 1.5707963267948966 rad
+      pos: -28.5,-4.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 5565
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,-5.5
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-4.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 5569
     components:
     - type: Transform
@@ -85042,6 +84212,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 5610
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,-4.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 5648
     components:
     - type: Transform
@@ -85061,15 +84239,14 @@ entities:
   - uid: 5661
     components:
     - type: Transform
-      pos: -22.5,-2.5
+      pos: -33.5,-2.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 5682
+  - uid: 5662
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -31.5,-5.5
+      pos: -33.5,-1.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -85084,8 +84261,7 @@ entities:
   - uid: 5689
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,-3.5
+      pos: -32.5,-5.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -85313,8 +84489,7 @@ entities:
   - uid: 5743
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -30.5,-3.5
+      pos: -32.5,-6.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -85329,7 +84504,7 @@ entities:
   - uid: 5754
     components:
     - type: Transform
-      pos: -25.5,-17.5
+      pos: -32.5,-7.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -85337,10 +84512,26 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -20.5,-11.5
+      pos: -32.5,-7.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
+  - uid: 5757
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -31.5,-7.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 5758
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -30.5,-7.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 5762
     components:
     - type: Transform
@@ -85365,6 +84556,30 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 5799
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-9.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 5800
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -31.5,-8.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 5810
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -30.5,-8.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 5818
     components:
     - type: Transform
@@ -85373,6 +84588,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 5825
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -29.5,-8.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 5832
     components:
     - type: Transform
@@ -85388,10 +84611,27 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 5842
+  - uid: 5835
     components:
     - type: Transform
-      pos: -21.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: -28.5,-8.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 5840
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-10.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 5841
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-11.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -85458,6 +84698,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 5909
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-15.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 5913
     components:
     - type: Transform
@@ -85482,6 +84730,13 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 5925
+    components:
+    - type: Transform
+      pos: -31.5,-12.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 5931
     components:
     - type: Transform
@@ -85489,6 +84744,20 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 5933
+    components:
+    - type: Transform
+      pos: -31.5,-13.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 5936
+    components:
+    - type: Transform
+      pos: -31.5,-14.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 5939
     components:
     - type: Transform
@@ -85524,14 +84793,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 5947
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-7.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 5948
     components:
     - type: Transform
@@ -85570,14 +84831,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 5961
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 5965
     components:
     - type: Transform
@@ -85617,6 +84870,13 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 5972
+    components:
+    - type: Transform
+      pos: -34.5,-15.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 5973
     components:
     - type: Transform
@@ -85628,8 +84888,7 @@ entities:
   - uid: 5974
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -24.5,-15.5
+      pos: -34.5,-16.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -85687,6 +84946,13 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 5983
+    components:
+    - type: Transform
+      pos: -34.5,-17.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 5984
     components:
     - type: Transform
@@ -85948,8 +85214,8 @@ entities:
   - uid: 6034
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -24.5,-10.5
+      rot: -1.5707963267948966 rad
+      pos: -33.5,-14.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -85961,14 +85227,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 6039
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -22.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 6040
     components:
     - type: Transform
@@ -85981,10 +85239,10 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -21.5,-13.5
+      pos: -31.5,-16.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
   - uid: 6045
     components:
     - type: Transform
@@ -86039,6 +85297,30 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 6065
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-17.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 6091
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-18.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 6093
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-19.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 6095
     components:
     - type: Transform
@@ -86149,6 +85431,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 6147
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -31.5,-13.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 6149
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -30.5,-13.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 6178
     components:
     - type: Transform
@@ -86192,8 +85490,8 @@ entities:
   - uid: 6208
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-5.5
+      rot: -1.5707963267948966 rad
+      pos: -29.5,-13.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -86361,6 +85659,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 6367
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,-15.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 6371
     components:
     - type: Transform
@@ -86409,11 +85715,27 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 6467
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-15.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 6542
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: -21.5,-15.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 6546
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -22.5,-15.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -86433,27 +85755,41 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 6651
+  - uid: 6704
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-12.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 6706
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-3.5
+      pos: -36.5,-19.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 6706
+    components:
+    - type: Transform
+      pos: -13.5,-15.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 6710
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-13.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-16.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 6733
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-17.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 6734
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -17.5,-17.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -86473,6 +85809,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 6761
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -18.5,-17.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 6763
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,-15.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 6778
     components:
     - type: Transform
@@ -86481,6 +85833,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#03FCD3FF'
+  - uid: 6779
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,-14.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 6790
     components:
     - type: Transform
@@ -86489,10 +85849,27 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 6794
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,-13.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 6796
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,-16.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 6798
     components:
     - type: Transform
-      pos: -31.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-12.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -86514,8 +85891,8 @@ entities:
   - uid: 6801
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: -21.5,-12.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -86527,6 +85904,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 6803
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 6804
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,-13.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 6809
     components:
     - type: Transform
@@ -86535,6 +85928,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 6819
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-13.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 6820
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -25.5,-13.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 6833
     components:
     - type: Transform
@@ -86575,19 +85984,46 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 6884
+  - uid: 6885
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,-16.5
+      rot: -1.5707963267948966 rad
+      pos: -23.5,-13.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 6887
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-1.5
+      pos: -23.5,-12.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 6888
+    components:
+    - type: Transform
+      pos: -23.5,-13.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 6889
+    components:
+    - type: Transform
+      pos: -23.5,-14.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 6971
+    components:
+    - type: Transform
+      pos: -23.5,-16.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 6972
+    components:
+    - type: Transform
+      pos: -23.5,-17.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -86599,6 +86035,27 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 6983
+    components:
+    - type: Transform
+      pos: -23.5,-18.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 6993
+    components:
+    - type: Transform
+      pos: -24.5,-15.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 7006
+    components:
+    - type: Transform
+      pos: -24.5,-16.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7012
     components:
     - type: Transform
@@ -86607,6 +86064,42 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 7032
+    components:
+    - type: Transform
+      pos: -24.5,-17.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 7033
+    components:
+    - type: Transform
+      pos: -24.5,-18.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 7041
+    components:
+    - type: Transform
+      pos: -24.5,-20.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 7043
+    components:
+    - type: Transform
+      pos: -24.5,-21.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 7048
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,-19.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7115
     components:
     - type: Transform
@@ -86626,6 +86119,14 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -53.5,48.5
       parent: 60
+  - uid: 7139
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-19.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7200
     components:
     - type: Transform
@@ -86660,10 +86161,10 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -25.5,-1.5
+      pos: -30.5,-2.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
   - uid: 7225
     components:
     - type: Transform
@@ -86672,6 +86173,38 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 7231
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-1.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7232
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-0.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7284
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,0.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7285
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7335
     components:
     - type: Transform
@@ -86731,6 +86264,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 7464
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-2.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7473
     components:
     - type: Transform
@@ -86755,6 +86296,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 7603
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-1.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7604
     components:
     - type: Transform
@@ -86763,22 +86312,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 7612
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-9.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 7647
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-9.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 7657
     components:
     - type: Transform
@@ -86840,11 +86373,10 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 7787
+  - uid: 7785
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-14.5
+      pos: -38.5,-17.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -87096,14 +86628,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -52.5,48.5
       parent: 60
-  - uid: 8203
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-12.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 8204
     components:
     - type: Transform
@@ -87126,14 +86650,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 8230
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,-2.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 8242
     components:
     - type: Transform
@@ -87142,26 +86658,10 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 8244
+  - uid: 8249
     components:
     - type: Transform
-      pos: -25.5,-16.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8246
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8253
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -32.5,-15.5
+      pos: -38.5,-18.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -87173,46 +86673,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 8258
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-8.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8269
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-23.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8270
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -26.5,-3.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8274
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-6.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8277
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-14.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 8292
     components:
     - type: Transform
@@ -87221,11 +86681,10 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 8336
+  - uid: 8338
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-2.5
+      pos: -36.5,-20.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -87245,6 +86704,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 8428
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,-3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 8436
     components:
     - type: Transform
@@ -87252,14 +86719,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 8508
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-2.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 8533
     components:
     - type: Transform
@@ -87317,10 +86776,11 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 8792
+  - uid: 8672
     components:
     - type: Transform
-      pos: -16.5,6.5
+      rot: 3.141592653589793 rad
+      pos: -20.5,-0.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -87352,14 +86812,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 8922
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -32.5,-1.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 8945
     components:
     - type: Transform
@@ -87395,6 +86847,13 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 9030
+    components:
+    - type: Transform
+      pos: -15.5,5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 9042
     components:
     - type: Transform
@@ -87411,22 +86870,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 9111
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-22.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 9149
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-21.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 9151
     components:
     - type: Transform
@@ -87470,14 +86913,6 @@ entities:
     - type: Transform
       pos: -53.5,15.5
       parent: 60
-  - uid: 9488
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -29.5,-3.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 9609
     components:
     - type: Transform
@@ -87643,14 +87078,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9681
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-4.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 10310
     components:
     - type: Transform
@@ -87658,22 +87085,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 10585
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-6.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 10676
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-9.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 10695
     components:
     - type: Transform
@@ -87714,14 +87125,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 11371
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -33.5,-1.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 11379
     components:
     - type: Transform
@@ -87972,6 +87375,30 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 13149
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 13158
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -32.5,5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 13159
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 13206
     components:
     - type: Transform
@@ -88025,6 +87452,22 @@ entities:
       rot: 3.141592653589793 rad
       pos: 23.5,3.5
       parent: 60
+  - uid: 13296
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -34.5,5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 13383
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -35.5,5.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 13490
     components:
     - type: Transform
@@ -88269,18 +87712,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 13643
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-13.5
-      parent: 60
-  - uid: 13645
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-13.5
-      parent: 60
   - uid: 13651
     components:
     - type: Transform
@@ -88305,30 +87736,13 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 13674
+  - uid: 13692
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,-21.5
+      pos: -23.5,-1.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 13675
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,-20.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 13676
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,-19.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 13806
     components:
     - type: Transform
@@ -93374,14 +92788,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 21410
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -32.5,-11.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 21412
     components:
     - type: Transform
@@ -95144,22 +94550,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -54.5,51.5
       parent: 60
-  - uid: 23647
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-4.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 23652
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-3.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 23977
     components:
     - type: Transform
@@ -95168,46 +94558,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 24128
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-17.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 24130
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 24131
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 24132
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,-18.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 24135
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-16.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 24357
     components:
     - type: Transform
@@ -96580,14 +95930,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 499
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-13.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 508
     components:
     - type: Transform
@@ -96610,14 +95952,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 840
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,-10.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 877
     components:
     - type: Transform
@@ -96663,6 +95997,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 973
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-14.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 1036
     components:
     - type: Transform
@@ -96756,50 +96098,11 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1114
+  - uid: 1172
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -14.5,-22.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1115
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-24.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1116
-    components:
-    - type: Transform
-      pos: -24.5,-24.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1128
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-14.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1148
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1150
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-6.5
+      pos: -16.5,9.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -96895,14 +96198,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1579
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -18.5,-18.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1608
     components:
     - type: Transform
@@ -96910,29 +96205,13 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1610
+  - uid: 1648
     components:
     - type: Transform
-      pos: -23.5,-22.5
+      pos: -20.5,-22.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1665
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1708
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -34.5,-18.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1714
     components:
     - type: Transform
@@ -96948,22 +96227,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1719
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-14.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1727
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -32.5,-18.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1756
     components:
     - type: Transform
@@ -96979,53 +96242,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1781
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,-3.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1785
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,-5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1814
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -33.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1820
-    components:
-    - type: Transform
       pos: -15.5,3.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1830
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-9.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1834
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -30.5,-9.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1848
     components:
     - type: Transform
@@ -97042,14 +96266,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 2105
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -30.5,-10.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 2127
     components:
     - type: Transform
@@ -97058,14 +96274,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 2182
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -30.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 2276
     components:
     - type: Transform
@@ -97158,14 +96366,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 2578
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,-11.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 2693
     components:
     - type: Transform
@@ -97451,11 +96651,11 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 4220
+  - uid: 4234
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -31.5,-11.5
+      rot: 1.5707963267948966 rad
+      pos: -23.5,-2.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -97489,6 +96689,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 4553
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,7.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 4561
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-4.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 4630
     components:
     - type: Transform
@@ -97497,6 +96713,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 4710
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,-7.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 4834
     components:
     - type: Transform
@@ -97537,14 +96761,51 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 5472
+  - uid: 5020
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-5.5
+      pos: -19.5,-12.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 5235
+    components:
+    - type: Transform
+      pos: -31.5,-11.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 5368
+    components:
+    - type: Transform
+      pos: -26.5,-11.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 5425
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,-3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 5428
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,-3.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 5438
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,-4.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 5476
     components:
     - type: Transform
@@ -97561,11 +96822,11 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 5562
+  - uid: 5563
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,0.5
+      rot: 3.141592653589793 rad
+      pos: -30.5,-3.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -97575,6 +96836,30 @@ entities:
       rot: 3.141592653589793 rad
       pos: -49.5,7.5
       parent: 60
+  - uid: 5660
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -18.5,-15.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 5682
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,-4.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 5688
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -32.5,-8.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 5725
     components:
     - type: Transform
@@ -97638,6 +96923,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 5842
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -32.5,-12.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 5847
     components:
     - type: Transform
@@ -97646,6 +96939,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 5849
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,-15.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 5865
     components:
     - type: Transform
@@ -97692,6 +96993,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 5935
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,-6.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 5942
     components:
     - type: Transform
@@ -97709,11 +97018,10 @@ entities:
   - uid: 5971
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -30.5,-14.5
+      pos: -15.5,9.5
       parent: 60
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 6005
     components:
     - type: Transform
@@ -97768,6 +97076,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 6039
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -32.5,-13.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 6109
     components:
     - type: Transform
@@ -97815,11 +97131,11 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 6333
+  - uid: 6307
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -18.5,-24.5
+      pos: -28.5,-13.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -97837,6 +97153,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 6582
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -17.5,-19.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 6660
     components:
     - type: Transform
@@ -97859,27 +97183,42 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 7285
+  - uid: 6825
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -36.5,-20.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 7464
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -38.5,-18.5
+      pos: -24.5,-13.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 7603
+  - uid: 6828
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -16.5,3.5
+      pos: -24.5,-14.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 6890
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,-15.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 6992
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,-19.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7045
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,-19.5
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -97899,19 +97238,11 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 7902
+  - uid: 7904
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -31.5,-3.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8030
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-7.5
+      pos: -36.5,5.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -97945,14 +97276,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 8228
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,-3.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 8241
     components:
     - type: Transform
@@ -97961,21 +97284,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 8245
-    components:
-    - type: Transform
-      pos: -24.5,-3.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8248
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,-20.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 8260
     components:
     - type: Transform
@@ -98031,14 +97339,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 9148
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -19.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 9233
     components:
     - type: Transform
@@ -98207,11 +97507,11 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 13673
+  - uid: 13693
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,-22.5
+      rot: -1.5707963267948966 rad
+      pos: -24.5,1.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -99088,14 +98388,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 21408
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -31.5,-7.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 21416
     components:
     - type: Transform
@@ -99282,14 +98574,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -58.5,39.5
       parent: 60
-  - uid: 24127
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-18.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 24658
     components:
     - type: Transform
@@ -100163,6 +99447,28 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 238
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,-19.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 1720
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 258
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-19.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 1720
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 275
     components:
     - type: Transform
@@ -100187,40 +99493,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 777
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -19.5,-20.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 148
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 778
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -33.5,-18.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 231
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 792
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -15.5,-5.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 1960
-      - 4709
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 910
     components:
     - type: Transform
@@ -100238,9 +99510,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -8.5,-23.5
       parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 57
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 946
@@ -100251,15 +99520,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1133
+  - uid: 972
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -15.5,-13.5
+      pos: -20.5,8.5
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 4709
+      - 21634
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1385
@@ -100300,9 +99568,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -20.5,-23.5
       parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 57
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1660
@@ -100312,7 +99577,7 @@ entities:
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 21507
+      - 11559
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1682
@@ -100325,19 +99590,15 @@ entities:
       - 8516
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1731
+  - uid: 1721
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -19.5,-5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1780
-    components:
-    - type: Transform
-      pos: -20.5,8.5
+      pos: -28.5,-16.5
       parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 982
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1787
@@ -100349,50 +99610,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21612
-      - 12
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1845
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -27.5,-10.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 5933
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1966
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-14.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 148
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1971
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -32.5,-14.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 231
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1983
-    components:
-    - type: Transform
-      pos: -28.5,-4.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 178
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1996
@@ -100489,6 +99706,17 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#D3FC03FF'
+  - uid: 3493
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -19.5,-2.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 13697
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 3567
     components:
     - type: Transform
@@ -100543,17 +99771,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 5364
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -26.5,-16.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 3204
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 5412
     components:
     - type: Transform
@@ -100664,7 +99881,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21612
-      - 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5954
@@ -100720,6 +99936,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -29.5,-23.5
       parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 11559
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 6032
@@ -100729,13 +99948,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 6203
-    components:
-    - type: Transform
-      pos: -22.5,-1.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 6300
     components:
     - type: Transform
@@ -100819,12 +100031,78 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 7916
+  - uid: 7649
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -33.5,-9.5
+      pos: -30.5,1.5
       parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8352
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7650
+    components:
+    - type: Transform
+      pos: -33.5,-0.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8283
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7656
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -29.5,-7.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8295
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7684
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-20.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8326
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7685
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,-12.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8296
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7741
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,-19.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8297
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 8030
+    components:
+    - type: Transform
+      pos: -18.5,-14.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 13971
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 8087
@@ -100862,14 +100140,6 @@ entities:
       - 21595
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 8267
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -33.5,-5.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 8388
     components:
     - type: Transform
@@ -100879,7 +100149,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21612
-      - 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 8619
@@ -100993,24 +100262,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 10586
-    components:
-    - type: Transform
-      pos: -27.5,-0.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 23925
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 10678
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -19.5,-9.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 11973
     components:
     - type: Transform
@@ -101124,14 +100375,23 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 13800
+  - uid: 13667
     components:
     - type: Transform
-      pos: -30.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: -32.5,-6.5
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 23926
+      - 8212
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 13695
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -25.5,1.5
+      parent: 60
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 14302
@@ -101568,17 +100828,6 @@ entities:
       - 21270
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 21407
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -15.5,0.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 1960
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 22876
     components:
     - type: Transform
@@ -101658,22 +100907,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 24129
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-18.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 24136
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-15.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 24834
     components:
     - type: Transform
@@ -101782,16 +101015,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 157
-    components:
-    - type: Transform
-      pos: -33.5,-14.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 231
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 223
     components:
     - type: Transform
@@ -101837,9 +101060,6 @@ entities:
     - type: Transform
       pos: -19.5,-23.5
       parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 57
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 629
@@ -101858,38 +101078,15 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 779
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,-19.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 231
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 788
+  - uid: 842
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -15.5,-6.5
+      pos: -11.5,-14.5
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 1960
-      - 4709
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 841
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -25.5,-10.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 5933
+      - 1720
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 871
@@ -101905,9 +101102,6 @@ entities:
     - type: Transform
       pos: -10.5,-23.5
       parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 57
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 912
@@ -101932,17 +101126,6 @@ entities:
       - 12751
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1136
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -15.5,-14.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 4709
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1246
     components:
     - type: Transform
@@ -101990,42 +101173,7 @@ entities:
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 21507
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1659
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -19.5,-18.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 148
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1739
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -19.5,-7.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1750
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -19.5,-11.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1768
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -33.5,-11.5
-      parent: 60
+      - 11559
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1771
@@ -102037,28 +101185,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21612
-      - 12
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1974
-    components:
-    - type: Transform
-      pos: -19.5,-14.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 148
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 2009
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,-4.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 178
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2026
@@ -102092,6 +101218,16 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 2508
+    components:
+    - type: Transform
+      pos: -13.5,-9.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 1720
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 2563
     components:
     - type: Transform
@@ -102115,7 +101251,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21612
-      - 12
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2821
@@ -102189,12 +101324,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 4218
+  - uid: 4057
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -33.5,-7.5
+      pos: -20.5,0.5
       parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 13697
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 4502
@@ -102250,17 +101387,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 5688
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -26.5,-18.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 3204
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 5738
     components:
     - type: Transform
@@ -102322,6 +101448,9 @@ entities:
     - type: Transform
       pos: -30.5,-23.5
       parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 11559
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 6015
@@ -102341,7 +101470,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21612
-      - 12
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 6028
@@ -102360,6 +101488,38 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 6097
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,-12.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8212
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 6098
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,-18.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8326
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 6136
+    components:
+    - type: Transform
+      pos: -28.5,-12.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8296
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 6290
     components:
     - type: Transform
@@ -102376,6 +101536,28 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 6308
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,-19.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 982
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 6333
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,-14.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8297
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 6474
     components:
     - type: Transform
@@ -102403,6 +101585,17 @@ entities:
       - 8483
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 7164
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -27.5,-8.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8295
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7177
     components:
     - type: Transform
@@ -102446,6 +101639,24 @@ entities:
       - 24769
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 7612
+    components:
+    - type: Transform
+      pos: -29.5,-0.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 8352
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 7647
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -24.5,-0.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7686
     components:
     - type: Transform
@@ -102454,22 +101665,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 7811
+  - uid: 7918
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-1.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 7901
-    components:
-    - type: Transform
-      pos: -25.5,-0.5
+      pos: -25.5,-3.5
       parent: 60
     - type: DeviceNetwork
       deviceLists:
-      - 23925
+      - 8283
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 8137
@@ -102555,17 +101758,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 9155
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -15.5,2.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 1960
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 9160
     components:
     - type: Transform
@@ -102736,12 +101928,17 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 13754
+  - uid: 13623
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-13.5
+      rot: -1.5707963267948966 rad
+      pos: -18.5,-12.5
       parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 13971
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 14434
     components:
     - type: Transform
@@ -103125,17 +102322,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21270
-  - uid: 21411
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -34.5,-1.5
-      parent: 60
-    - type: DeviceNetwork
-      deviceLists:
-      - 23926
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 22906
     components:
     - type: Transform
@@ -103386,16 +102572,26 @@ entities:
       parent: 60
 - proto: Girder
   entities:
+  - uid: 150
+    components:
+    - type: Transform
+      pos: -24.5,-6.5
+      parent: 60
+  - uid: 184
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -17.5,4.5
+      parent: 60
   - uid: 5747
     components:
     - type: Transform
       pos: -60.5,-9.5
       parent: 60
-  - uid: 11368
+  - uid: 9041
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -18.5,2.5
+      pos: -15.5,0.5
       parent: 60
   - uid: 19105
     components:
@@ -103459,11 +102655,6 @@ entities:
       parent: 60
 - proto: Grille
   entities:
-  - uid: 8
-    components:
-    - type: Transform
-      pos: -24.5,-7.5
-      parent: 60
   - uid: 17
     components:
     - type: Transform
@@ -103489,10 +102680,10 @@ entities:
     - type: Transform
       pos: 50.5,19.5
       parent: 60
-  - uid: 137
+  - uid: 152
     components:
     - type: Transform
-      pos: -24.5,-8.5
+      pos: -22.5,-4.5
       parent: 60
   - uid: 200
     components:
@@ -103509,30 +102700,44 @@ entities:
     - type: Transform
       pos: 46.5,-8.5
       parent: 60
-  - uid: 235
+  - uid: 231
     components:
     - type: Transform
-      pos: -23.5,-12.5
+      pos: -19.5,-10.5
       parent: 60
-  - uid: 244
+  - uid: 237
     components:
     - type: Transform
-      pos: -32.5,-17.5
+      pos: -20.5,-10.5
       parent: 60
-  - uid: 258
+  - uid: 267
     components:
     - type: Transform
-      pos: -25.5,-7.5
+      pos: -21.5,-19.5
       parent: 60
-  - uid: 270
+  - uid: 336
     components:
     - type: Transform
-      pos: -29.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-2.5
       parent: 60
-  - uid: 284
+  - uid: 342
     components:
     - type: Transform
-      pos: -17.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-3.5
+      parent: 60
+  - uid: 352
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-1.5
+      parent: 60
+  - uid: 356
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-0.5
       parent: 60
   - uid: 369
     components:
@@ -103614,10 +102819,11 @@ entities:
     - type: Transform
       pos: 38.5,-15.5
       parent: 60
-  - uid: 538
+  - uid: 549
     components:
     - type: Transform
-      pos: -5.5,-21.5
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-21.5
       parent: 60
   - uid: 571
     components:
@@ -103669,6 +102875,22 @@ entities:
     - type: Transform
       pos: 6.5,-18.5
       parent: 60
+  - uid: 751
+    components:
+    - type: Transform
+      pos: -21.5,-18.5
+      parent: 60
+  - uid: 766
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-12.5
+      parent: 60
+  - uid: 784
+    components:
+    - type: Transform
+      pos: -17.5,-10.5
+      parent: 60
   - uid: 808
     components:
     - type: Transform
@@ -103679,31 +102901,6 @@ entities:
     - type: Transform
       pos: -2.5,8.5
       parent: 60
-  - uid: 836
-    components:
-    - type: Transform
-      pos: -17.5,-7.5
-      parent: 60
-  - uid: 837
-    components:
-    - type: Transform
-      pos: -17.5,-16.5
-      parent: 60
-  - uid: 842
-    components:
-    - type: Transform
-      pos: -20.5,-10.5
-      parent: 60
-  - uid: 843
-    components:
-    - type: Transform
-      pos: -20.5,-6.5
-      parent: 60
-  - uid: 895
-    components:
-    - type: Transform
-      pos: -4.5,-17.5
-      parent: 60
   - uid: 949
     components:
     - type: Transform
@@ -103714,16 +102911,6 @@ entities:
     - type: Transform
       pos: -72.5,-26.5
       parent: 60
-  - uid: 963
-    components:
-    - type: Transform
-      pos: -35.5,-10.5
-      parent: 60
-  - uid: 979
-    components:
-    - type: Transform
-      pos: -32.5,-10.5
-      parent: 60
   - uid: 1072
     components:
     - type: Transform
@@ -103739,20 +102926,11 @@ entities:
     - type: Transform
       pos: -67.5,0.5
       parent: 60
-  - uid: 1122
+  - uid: 1145
     components:
     - type: Transform
-      pos: -28.5,-7.5
-      parent: 60
-  - uid: 1162
-    components:
-    - type: Transform
-      pos: -35.5,-11.5
-      parent: 60
-  - uid: 1174
-    components:
-    - type: Transform
-      pos: -28.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-21.5
       parent: 60
   - uid: 1184
     components:
@@ -103764,16 +102942,6 @@ entities:
     - type: Transform
       pos: 38.5,57.5
       parent: 60
-  - uid: 1201
-    components:
-    - type: Transform
-      pos: -26.5,-7.5
-      parent: 60
-  - uid: 1209
-    components:
-    - type: Transform
-      pos: -27.5,-7.5
-      parent: 60
   - uid: 1233
     components:
     - type: Transform
@@ -103814,15 +102982,11 @@ entities:
     - type: Transform
       pos: -5.5,7.5
       parent: 60
-  - uid: 1292
+  - uid: 1293
     components:
     - type: Transform
-      pos: -5.5,-19.5
-      parent: 60
-  - uid: 1297
-    components:
-    - type: Transform
-      pos: -9.5,-10.5
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-13.5
       parent: 60
   - uid: 1330
     components:
@@ -103854,71 +103018,6 @@ entities:
     - type: Transform
       pos: 9.5,-15.5
       parent: 60
-  - uid: 1477
-    components:
-    - type: Transform
-      pos: -23.5,-16.5
-      parent: 60
-  - uid: 1480
-    components:
-    - type: Transform
-      pos: -23.5,-14.5
-      parent: 60
-  - uid: 1528
-    components:
-    - type: Transform
-      pos: -32.5,-6.5
-      parent: 60
-  - uid: 1529
-    components:
-    - type: Transform
-      pos: -35.5,-9.5
-      parent: 60
-  - uid: 1532
-    components:
-    - type: Transform
-      pos: -35.5,-5.5
-      parent: 60
-  - uid: 1536
-    components:
-    - type: Transform
-      pos: -29.5,-11.5
-      parent: 60
-  - uid: 1537
-    components:
-    - type: Transform
-      pos: -35.5,-6.5
-      parent: 60
-  - uid: 1540
-    components:
-    - type: Transform
-      pos: -29.5,-9.5
-      parent: 60
-  - uid: 1541
-    components:
-    - type: Transform
-      pos: -17.5,-11.5
-      parent: 60
-  - uid: 1542
-    components:
-    - type: Transform
-      pos: -35.5,-7.5
-      parent: 60
-  - uid: 1545
-    components:
-    - type: Transform
-      pos: -17.5,-10.5
-      parent: 60
-  - uid: 1562
-    components:
-    - type: Transform
-      pos: -24.5,-9.5
-      parent: 60
-  - uid: 1571
-    components:
-    - type: Transform
-      pos: -29.5,-14.5
-      parent: 60
   - uid: 1683
     components:
     - type: Transform
@@ -103964,45 +103063,43 @@ entities:
     - type: Transform
       pos: 73.5,-32.5
       parent: 60
+  - uid: 1699
+    components:
+    - type: Transform
+      pos: -28.5,-1.5
+      parent: 60
+  - uid: 1724
+    components:
+    - type: Transform
+      pos: -22.5,-2.5
+      parent: 60
+  - uid: 1840
+    components:
+    - type: Transform
+      pos: -29.5,-1.5
+      parent: 60
+  - uid: 1901
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-14.5
+      parent: 60
   - uid: 1911
     components:
     - type: Transform
       pos: 30.5,31.5
       parent: 60
-  - uid: 1927
+  - uid: 1919
     components:
     - type: Transform
-      pos: -17.5,-19.5
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-10.5
       parent: 60
-  - uid: 1928
+  - uid: 1925
     components:
     - type: Transform
-      pos: -33.5,-21.5
-      parent: 60
-  - uid: 1929
-    components:
-    - type: Transform
-      pos: -34.5,-21.5
-      parent: 60
-  - uid: 1930
-    components:
-    - type: Transform
-      pos: -35.5,-20.5
-      parent: 60
-  - uid: 1931
-    components:
-    - type: Transform
-      pos: -17.5,-18.5
-      parent: 60
-  - uid: 1932
-    components:
-    - type: Transform
-      pos: -19.5,-21.5
-      parent: 60
-  - uid: 1933
-    components:
-    - type: Transform
-      pos: -32.5,-21.5
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-9.5
       parent: 60
   - uid: 1984
     components:
@@ -104019,6 +103116,12 @@ entities:
     - type: Transform
       pos: -56.5,17.5
       parent: 60
+  - uid: 2115
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-15.5
+      parent: 60
   - uid: 2135
     components:
     - type: Transform
@@ -104174,11 +103277,6 @@ entities:
     - type: Transform
       pos: 60.5,-35.5
       parent: 60
-  - uid: 2861
-    components:
-    - type: Transform
-      pos: -22.5,-2.5
-      parent: 60
   - uid: 2877
     components:
     - type: Transform
@@ -104219,6 +103317,12 @@ entities:
     - type: Transform
       pos: -62.5,15.5
       parent: 60
+  - uid: 3072
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-19.5
+      parent: 60
   - uid: 3079
     components:
     - type: Transform
@@ -104569,6 +103673,12 @@ entities:
     - type: Transform
       pos: -11.5,-38.5
       parent: 60
+  - uid: 4017
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -28.5,-21.5
+      parent: 60
   - uid: 4038
     components:
     - type: Transform
@@ -104599,11 +103709,6 @@ entities:
     - type: Transform
       pos: -36.5,-25.5
       parent: 60
-  - uid: 4078
-    components:
-    - type: Transform
-      pos: -34.5,-17.5
-      parent: 60
   - uid: 4089
     components:
     - type: Transform
@@ -104619,11 +103724,6 @@ entities:
     - type: Transform
       pos: 32.5,-59.5
       parent: 60
-  - uid: 4121
-    components:
-    - type: Transform
-      pos: -4.5,-18.5
-      parent: 60
   - uid: 4131
     components:
     - type: Transform
@@ -104639,6 +103739,12 @@ entities:
     - type: Transform
       pos: 32.5,-15.5
       parent: 60
+  - uid: 4147
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -27.5,-21.5
+      parent: 60
   - uid: 4295
     components:
     - type: Transform
@@ -104954,11 +104060,6 @@ entities:
     - type: Transform
       pos: -3.5,-73.5
       parent: 60
-  - uid: 5235
-    components:
-    - type: Transform
-      pos: -27.5,-2.5
-      parent: 60
   - uid: 5245
     components:
     - type: Transform
@@ -105069,11 +104170,6 @@ entities:
     - type: Transform
       pos: -66.5,4.5
       parent: 60
-  - uid: 5799
-    components:
-    - type: Transform
-      pos: -18.5,-1.5
-      parent: 60
   - uid: 5816
     components:
     - type: Transform
@@ -105109,11 +104205,6 @@ entities:
     - type: Transform
       pos: 54.5,-33.5
       parent: 60
-  - uid: 6147
-    components:
-    - type: Transform
-      pos: -18.5,-0.5
-      parent: 60
   - uid: 6151
     components:
     - type: Transform
@@ -105349,21 +104440,11 @@ entities:
     - type: Transform
       pos: 46.5,-43.5
       parent: 60
-  - uid: 6803
-    components:
-    - type: Transform
-      pos: -23.5,-9.5
-      parent: 60
   - uid: 6812
     components:
     - type: Transform
       pos: 17.5,29.5
       parent: 60
-  - uid: 6824
-    components:
-    - type: Transform
-      pos: -23.5,-11.5
-      parent: 60
   - uid: 6831
     components:
     - type: Transform
@@ -105899,26 +104980,23 @@ entities:
     - type: Transform
       pos: -46.5,-4.5
       parent: 60
-  - uid: 8251
+  - uid: 8231
     components:
     - type: Transform
-      pos: -25.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: -25.5,-12.5
+      parent: 60
+  - uid: 8232
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,-12.5
       parent: 60
   - uid: 8262
     components:
     - type: Transform
       pos: 7.5,63.5
       parent: 60
-  - uid: 8337
-    components:
-    - type: Transform
-      pos: -29.5,-12.5
-      parent: 60
-  - uid: 8339
-    components:
-    - type: Transform
-      pos: -30.5,-2.5
-      parent: 60
   - uid: 8367
     components:
     - type: Transform
@@ -105944,16 +105022,6 @@ entities:
     - type: Transform
       pos: -81.5,-26.5
       parent: 60
-  - uid: 8437
-    components:
-    - type: Transform
-      pos: -17.5,-20.5
-      parent: 60
-  - uid: 8442
-    components:
-    - type: Transform
-      pos: -35.5,-18.5
-      parent: 60
   - uid: 8561
     components:
     - type: Transform
@@ -106274,11 +105342,6 @@ entities:
     - type: Transform
       pos: 24.5,3.5
       parent: 60
-  - uid: 10621
-    components:
-    - type: Transform
-      pos: -18.5,0.5
-      parent: 60
   - uid: 10702
     components:
     - type: Transform
@@ -106299,26 +105362,11 @@ entities:
     - type: Transform
       pos: 42.5,-20.5
       parent: 60
-  - uid: 11127
-    components:
-    - type: Transform
-      pos: -19.5,-17.5
-      parent: 60
   - uid: 11150
     components:
     - type: Transform
       pos: -25.5,27.5
       parent: 60
-  - uid: 11282
-    components:
-    - type: Transform
-      pos: -17.5,-5.5
-      parent: 60
-  - uid: 11336
-    components:
-    - type: Transform
-      pos: -17.5,-6.5
-      parent: 60
   - uid: 11341
     components:
     - type: Transform
@@ -106404,11 +105452,6 @@ entities:
     - type: Transform
       pos: 56.5,-27.5
       parent: 60
-  - uid: 11865
-    components:
-    - type: Transform
-      pos: -13.5,-13.5
-      parent: 60
   - uid: 12023
     components:
     - type: Transform
@@ -106434,16 +105477,6 @@ entities:
     - type: Transform
       pos: 40.5,-69.5
       parent: 60
-  - uid: 12191
-    components:
-    - type: Transform
-      pos: -8.5,-16.5
-      parent: 60
-  - uid: 12193
-    components:
-    - type: Transform
-      pos: -13.5,-16.5
-      parent: 60
   - uid: 12271
     components:
     - type: Transform
@@ -106889,6 +105922,12 @@ entities:
     - type: Transform
       pos: 52.5,18.5
       parent: 60
+  - uid: 13478
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-16.5
+      parent: 60
   - uid: 13484
     components:
     - type: Transform
@@ -106899,6 +105938,12 @@ entities:
     - type: Transform
       pos: 58.5,30.5
       parent: 60
+  - uid: 13567
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-17.5
+      parent: 60
   - uid: 13572
     components:
     - type: Transform
@@ -106909,56 +105954,22 @@ entities:
     - type: Transform
       pos: -25.5,29.5
       parent: 60
-  - uid: 13664
+  - uid: 13676
     components:
     - type: Transform
-      pos: -9.5,-20.5
-      parent: 60
-  - uid: 13665
-    components:
-    - type: Transform
-      pos: -7.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: -21.5,-17.5
       parent: 60
   - uid: 13680
     components:
     - type: Transform
       pos: 7.5,-80.5
       parent: 60
-  - uid: 13690
-    components:
-    - type: Transform
-      pos: -13.5,-19.5
-      parent: 60
   - uid: 13738
     components:
     - type: Transform
       pos: -3.5,63.5
       parent: 60
-  - uid: 13758
-    components:
-    - type: Transform
-      pos: -7.5,-16.5
-      parent: 60
-  - uid: 13763
-    components:
-    - type: Transform
-      pos: -6.5,-12.5
-      parent: 60
-  - uid: 13764
-    components:
-    - type: Transform
-      pos: -5.5,-14.5
-      parent: 60
-  - uid: 13765
-    components:
-    - type: Transform
-      pos: -6.5,-13.5
-      parent: 60
-  - uid: 13785
-    components:
-    - type: Transform
-      pos: -8.5,-10.5
-      parent: 60
   - uid: 13811
     components:
     - type: Transform
@@ -106974,11 +105985,6 @@ entities:
     - type: Transform
       pos: 7.5,18.5
       parent: 60
-  - uid: 13818
-    components:
-    - type: Transform
-      pos: -13.5,-14.5
-      parent: 60
   - uid: 13819
     components:
     - type: Transform
@@ -107629,11 +106635,6 @@ entities:
     - type: Transform
       pos: -51.5,15.5
       parent: 60
-  - uid: 15900
-    components:
-    - type: Transform
-      pos: -28.5,-9.5
-      parent: 60
   - uid: 15993
     components:
     - type: Transform
@@ -107889,16 +106890,6 @@ entities:
     - type: Transform
       pos: 0.5,22.5
       parent: 60
-  - uid: 16995
-    components:
-    - type: Transform
-      pos: -9.5,-17.5
-      parent: 60
-  - uid: 16996
-    components:
-    - type: Transform
-      pos: -9.5,-16.5
-      parent: 60
   - uid: 17034
     components:
     - type: Transform
@@ -108289,11 +107280,6 @@ entities:
     - type: Transform
       pos: 5.5,0.5
       parent: 60
-  - uid: 17993
-    components:
-    - type: Transform
-      pos: -13.5,-15.5
-      parent: 60
   - uid: 17994
     components:
     - type: Transform
@@ -108359,11 +107345,6 @@ entities:
     - type: Transform
       pos: 4.5,4.5
       parent: 60
-  - uid: 18100
-    components:
-    - type: Transform
-      pos: -12.5,-0.5
-      parent: 60
   - uid: 18137
     components:
     - type: Transform
@@ -108404,36 +107385,11 @@ entities:
     - type: Transform
       pos: -9.5,-4.5
       parent: 60
-  - uid: 18525
-    components:
-    - type: Transform
-      pos: -13.5,-5.5
-      parent: 60
-  - uid: 18526
-    components:
-    - type: Transform
-      pos: -13.5,-4.5
-      parent: 60
-  - uid: 18527
-    components:
-    - type: Transform
-      pos: -13.5,-3.5
-      parent: 60
-  - uid: 18682
-    components:
-    - type: Transform
-      pos: -7.5,-10.5
-      parent: 60
   - uid: 18694
     components:
     - type: Transform
       pos: 13.5,-80.5
       parent: 60
-  - uid: 18768
-    components:
-    - type: Transform
-      pos: -10.5,-10.5
-      parent: 60
   - uid: 18777
     components:
     - type: Transform
@@ -109729,11 +108685,6 @@ entities:
     - type: Transform
       pos: 37.5,51.5
       parent: 60
-  - uid: 21200
-    components:
-    - type: Transform
-      pos: -17.5,-14.5
-      parent: 60
   - uid: 21218
     components:
     - type: Transform
@@ -112544,103 +111495,46 @@ entities:
       parent: 60
 - proto: GunSafeDisabler
   entities:
-  - uid: 5201
+  - uid: 2792
     components:
     - type: Transform
-      anchored: True
-      pos: -24.5,-20.5
+      pos: -29.5,-9.5
       parent: 60
-    - type: Physics
-      bodyType: Static
 - proto: GunSafeLaserCarbine
   entities:
-  - uid: 6206
+  - uid: 1142
     components:
-    - type: MetaData
-      desc: A standard-issue Nanotrasen storage unit, containing 4 laser carbines.
     - type: Transform
-      anchored: True
-      pos: -26.5,1.5
+      pos: -29.5,-6.5
       parent: 60
-    - type: Physics
-      bodyType: Static
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14673
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 6308
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: GunSafePistolMk58
   entities:
-  - uid: 1561
+  - uid: 974
     components:
-    - type: MetaData
-      desc: A standard-issue Nanotrasen storage unit, containing 4 Mk58 pistols.
     - type: Transform
-      anchored: True
-      pos: -28.5,-1.5
+      pos: -30.5,-9.5
       parent: 60
-    - type: Physics
-      bodyType: Static
 - proto: GunSafeRifleLecter
   entities:
-  - uid: 10682
+  - uid: 121
     components:
-    - type: MetaData
-      desc: A standard-issue Nanotrasen storage unit, containing 2 Lecter combat rifles.
     - type: Transform
-      anchored: True
-      pos: -28.5,0.5
+      pos: -27.5,-6.5
       parent: 60
-    - type: Physics
-      bodyType: Static
 - proto: GunSafeShotgunKammerer
   entities:
-  - uid: 6367
+  - uid: 79
     components:
-    - type: MetaData
-      desc: A standard-issue Nanotrasen storage unit, containing 2 Kammerer shotguns.
     - type: Transform
-      anchored: True
-      pos: -25.5,1.5
+      pos: -30.5,-6.5
       parent: 60
-    - type: Physics
-      bodyType: Static
 - proto: GunSafeSubMachineGunDrozd
   entities:
-  - uid: 1968
+  - uid: 937
     components:
-    - type: MetaData
-      desc: A standard-issue Nanotrasen storage unit, containing 2 Drozd submachine guns.
     - type: Transform
-      anchored: True
-      pos: -28.5,-0.5
+      pos: -28.5,-6.5
       parent: 60
-    - type: Physics
-      bodyType: Static
 - proto: HandheldGPSBasic
   entities:
   - uid: 3712
@@ -112697,19 +111591,6 @@ entities:
     - type: Transform
       pos: 37.473488,15.559563
       parent: 60
-- proto: HarmonicaInstrument
-  entities:
-  - uid: 1862
-    components:
-    - type: Transform
-      parent: 1861
-    - type: Physics
-      canCollide: False
-  - uid: 13657
-    components:
-    - type: Transform
-      pos: -7.494558,-11.436351
-      parent: 60
 - proto: HarpInstrument
   entities:
   - uid: 13264
@@ -112885,6 +111766,13 @@ entities:
     - type: Transform
       pos: 5.5,-29.5
       parent: 60
+- proto: HolopadCommandHos
+  entities:
+  - uid: 8225
+    components:
+    - type: Transform
+      pos: -29.5,1.5
+      parent: 60
 - proto: HolopadCommandQm
   entities:
   - uid: 24063
@@ -113102,17 +111990,24 @@ entities:
       parent: 60
 - proto: HolopadSecurityArmory
   entities:
-  - uid: 23653
+  - uid: 8419
     components:
     - type: Transform
-      pos: -26.5,0.5
+      pos: -30.5,-7.5
+      parent: 60
+- proto: HolopadSecurityBreakroom
+  entities:
+  - uid: 8226
+    components:
+    - type: Transform
+      pos: -33.5,-4.5
       parent: 60
 - proto: HolopadSecurityBrig
   entities:
-  - uid: 13584
+  - uid: 8337
     components:
     - type: Transform
-      pos: -26.5,-5.5
+      pos: -18.5,-13.5
       parent: 60
 - proto: HolopadSecurityCourtroom
   entities:
@@ -113130,17 +112025,17 @@ entities:
       parent: 60
 - proto: HolopadSecurityFront
   entities:
-  - uid: 17958
+  - uid: 8421
     components:
     - type: Transform
-      pos: -25.5,-19.5
+      pos: -23.5,-19.5
       parent: 60
 - proto: HolopadSecurityInterrogation
   entities:
-  - uid: 13966
+  - uid: 8261
     components:
     - type: Transform
-      pos: -32.5,-1.5
+      pos: -33.5,-18.5
       parent: 60
 - proto: HolopadSecurityLawyer
   entities:
@@ -113149,19 +112044,26 @@ entities:
     - type: Transform
       pos: -50.5,-18.5
       parent: 60
-- proto: HolopadSecurityPerma
+- proto: HolopadSecurityLockerRoom
   entities:
-  - uid: 24035
+  - uid: 13741
     components:
     - type: Transform
-      pos: -10.5,-14.5
+      pos: -21.5,-2.5
+      parent: 60
+- proto: HolopadSecurityPerma
+  entities:
+  - uid: 1576
+    components:
+    - type: Transform
+      pos: -12.5,-15.5
       parent: 60
 - proto: HolopadSecurityWarden
   entities:
-  - uid: 13971
+  - uid: 7661
     components:
     - type: Transform
-      pos: -26.5,-10.5
+      pos: -28.5,-17.5
       parent: 60
 - proto: HolopadServiceBar
   entities:
@@ -113231,11 +112133,6 @@ entities:
     - type: Transform
       pos: 31.5,-17.5
       parent: 60
-  - uid: 13445
-    components:
-    - type: Transform
-      pos: -10.5,-20.5
-      parent: 60
   - uid: 15497
     components:
     - type: Transform
@@ -113248,11 +112145,6 @@ entities:
     - type: Transform
       pos: 9.5,3.5
       parent: 60
-  - uid: 13607
-    components:
-    - type: Transform
-      pos: -9.77185,-12.8355055
-      parent: 60
   - uid: 13984
     components:
     - type: Transform
@@ -113277,6 +112169,11 @@ entities:
     - type: Transform
       pos: -59.5,-24.5
       parent: 60
+  - uid: 175
+    components:
+    - type: Transform
+      pos: -14.5,-12.5
+      parent: 60
   - uid: 286
     components:
     - type: Transform
@@ -113287,6 +112184,16 @@ entities:
     - type: Transform
       pos: 35.5,-36.5
       parent: 60
+  - uid: 1148
+    components:
+    - type: Transform
+      pos: -15.5,-14.5
+      parent: 60
+  - uid: 1870
+    components:
+    - type: Transform
+      pos: -15.5,-12.5
+      parent: 60
   - uid: 2450
     components:
     - type: Transform
@@ -113357,6 +112264,11 @@ entities:
     - type: Transform
       pos: 28.5,-26.5
       parent: 60
+  - uid: 6365
+    components:
+    - type: Transform
+      pos: -14.5,-14.5
+      parent: 60
   - uid: 6814
     components:
     - type: Transform
@@ -113377,12 +112289,6 @@ entities:
     - type: Transform
       pos: 33.5,-33.5
       parent: 60
-  - uid: 11834
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -11.5,-13.5
-      parent: 60
   - uid: 12687
     components:
     - type: Transform
@@ -113393,12 +112299,6 @@ entities:
     - type: Transform
       pos: -58.5,-24.5
       parent: 60
-  - uid: 13613
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,-13.5
-      parent: 60
 - proto: IDComputerCircuitboard
   entities:
   - uid: 15555
@@ -113705,6 +112605,12 @@ entities:
       parent: 60
 - proto: JanitorServiceLight
   entities:
+  - uid: 3638
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -24.5,-14.5
+      parent: 60
   - uid: 11167
     components:
     - type: Transform
@@ -113760,25 +112666,16 @@ entities:
       parent: 60
 - proto: JetpackSecurityFilled
   entities:
-  - uid: 1904
+  - uid: 1830
     components:
     - type: Transform
-      parent: 1864
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 5430
+      pos: -25.687586,0.74123275
+      parent: 60
+  - uid: 1831
     components:
     - type: Transform
-      parent: 5313
-    - type: Physics
-      canCollide: False
-  - uid: 6707
-    components:
-    - type: Transform
-      parent: 1906
-    - type: Physics
-      canCollide: False
+      pos: -25.39592,0.52233076
+      parent: 60
 - proto: KitchenElectricGrill
   entities:
   - uid: 2227
@@ -113791,17 +112688,19 @@ entities:
     - type: Transform
       pos: 26.5,-30.5
       parent: 60
+- proto: KitchenKnife
+  entities:
+  - uid: 76
+    components:
+    - type: Transform
+      pos: -15.477559,-8.663001
+      parent: 60
 - proto: KitchenMicrowave
   entities:
-  - uid: 356
+  - uid: 363
     components:
     - type: Transform
-      pos: -25.5,-14.5
-      parent: 60
-  - uid: 367
-    components:
-    - type: Transform
-      pos: -12.5,-13.5
+      pos: -14.5,-8.5
       parent: 60
   - uid: 2048
     components:
@@ -113835,6 +112734,11 @@ entities:
       parent: 60
 - proto: KitchenReagentGrinder
   entities:
+  - uid: 1572
+    components:
+    - type: Transform
+      pos: -15.5,-10.5
+      parent: 60
   - uid: 2304
     components:
     - type: Transform
@@ -113850,11 +112754,6 @@ entities:
     - type: Transform
       pos: 30.5,-26.5
       parent: 60
-  - uid: 16132
-    components:
-    - type: Transform
-      pos: -12.5,-14.5
-      parent: 60
   - uid: 19161
     components:
     - type: Transform
@@ -113906,11 +112805,6 @@ entities:
       parent: 60
     - type: Physics
       canCollide: True
-  - uid: 7033
-    components:
-    - type: Transform
-      pos: -22.385181,-0.05140546
-      parent: 60
   - uid: 7638
     components:
     - type: Transform
@@ -114030,10 +112924,10 @@ entities:
       parent: 60
 - proto: LampInterrogator
   entities:
-  - uid: 9051
+  - uid: 13966
     components:
     - type: Transform
-      pos: -32.48209,0.70187116
+      pos: -33.50869,-19.067099
       parent: 60
 - proto: Lantern
   entities:
@@ -114430,110 +113324,6 @@ entities:
     - type: Transform
       pos: -4.5,15.5
       parent: 60
-- proto: LockerEvidence
-  entities:
-  - uid: 1534
-    components:
-    - type: MetaData
-      name: evidence locker (Cell 4)
-    - type: Transform
-      anchored: True
-      pos: -23.5,-8.5
-      parent: 60
-    - type: Physics
-      bodyType: Static
-    - type: Label
-      currentLabel: Cell 4
-    - type: NameModifier
-      baseName: evidence locker
-  - uid: 1564
-    components:
-    - type: MetaData
-      name: evidence locker (Cell 3)
-    - type: Transform
-      anchored: True
-      pos: -23.5,-7.5
-      parent: 60
-    - type: Physics
-      bodyType: Static
-    - type: Label
-      currentLabel: Cell 3
-    - type: NameModifier
-      baseName: evidence locker
-  - uid: 1568
-    components:
-    - type: MetaData
-      name: evidence locker (Cell 2)
-    - type: Transform
-      anchored: True
-      pos: -29.5,-8.5
-      parent: 60
-    - type: Physics
-      bodyType: Static
-    - type: Label
-      currentLabel: Cell 2
-    - type: NameModifier
-      baseName: evidence locker
-  - uid: 1569
-    components:
-    - type: MetaData
-      name: evidence locker (Cell 1)
-    - type: Transform
-      anchored: True
-      pos: -29.5,-7.5
-      parent: 60
-    - type: Physics
-      bodyType: Static
-    - type: Label
-      currentLabel: Cell 1
-    - type: NameModifier
-      baseName: evidence locker
-  - uid: 13610
-    components:
-    - type: Transform
-      pos: -8.5,-17.5
-      parent: 60
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.6495836
-        - 6.2055764
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-  - uid: 13622
-    components:
-    - type: Transform
-      pos: -7.5,-17.5
-      parent: 60
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.6495836
-        - 6.2055764
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
 - proto: LockerFreezer
   entities:
   - uid: 2623
@@ -114559,19 +113349,6 @@ entities:
         - 0
         - 0
         - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 2619
-          - 19882
-          - 21020
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: LockerFreezerVaultFilled
   entities:
   - uid: 2252
@@ -114604,24 +113381,12 @@ entities:
         - 0
         - 0
         - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 5207
-          - 4641
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-- proto: LockerHeadOfSecurityFilledHardsuit
+- proto: LockerHeadOfSecurityFilled
   entities:
-  - uid: 5456
+  - uid: 985
     components:
     - type: Transform
-      pos: -20.5,1.5
+      pos: -29.5,2.5
       parent: 60
 - proto: LockerMedicalFilled
   entities:
@@ -114671,6 +113436,62 @@ entities:
     - type: Transform
       pos: 49.5,-16.5
       parent: 60
+- proto: LockerPrisoner
+  entities:
+  - uid: 2166
+    components:
+    - type: Transform
+      pos: -20.5,-11.5
+      parent: 60
+- proto: LockerPrisoner2
+  entities:
+  - uid: 2244
+    components:
+    - type: Transform
+      pos: -19.5,-11.5
+      parent: 60
+- proto: LockerPrisoner3
+  entities:
+  - uid: 1584
+    components:
+    - type: Transform
+      pos: -17.5,-11.5
+      parent: 60
+- proto: LockerPrisoner4
+  entities:
+  - uid: 1639
+    components:
+    - type: Transform
+      pos: -17.5,-12.5
+      parent: 60
+- proto: LockerPrisoner5
+  entities:
+  - uid: 1579
+    components:
+    - type: Transform
+      pos: -17.5,-13.5
+      parent: 60
+- proto: LockerPrisoner6
+  entities:
+  - uid: 8255
+    components:
+    - type: Transform
+      pos: -17.5,-14.5
+      parent: 60
+- proto: LockerPrisoner7
+  entities:
+  - uid: 2278
+    components:
+    - type: Transform
+      pos: -20.5,-13.5
+      parent: 60
+- proto: LockerPrisoner8
+  entities:
+  - uid: 2861
+    components:
+    - type: Transform
+      pos: -20.5,-15.5
+      parent: 60
 - proto: LockerQuarterMasterFilled
   entities:
   - uid: 15570
@@ -114703,17 +113524,6 @@ entities:
         - 0
         - 0
         - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 17673
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: LockerSalvageSpecialistFilledHardsuit
   entities:
   - uid: 215
@@ -114750,54 +113560,36 @@ entities:
       parent: 60
 - proto: LockerSecurityFilled
   entities:
-  - uid: 357
+  - uid: 1225
     components:
     - type: Transform
-      anchored: True
-      pos: -24.5,-17.5
+      pos: -21.5,1.5
       parent: 60
-    - type: Physics
-      bodyType: Static
-  - uid: 364
+  - uid: 1482
     components:
     - type: Transform
-      anchored: True
-      pos: -24.5,-18.5
+      pos: -18.5,-1.5
       parent: 60
-    - type: Physics
-      bodyType: Static
-  - uid: 491
+  - uid: 1549
     components:
     - type: Transform
-      anchored: True
-      pos: -24.5,-16.5
+      pos: -18.5,-0.5
       parent: 60
-    - type: Physics
-      bodyType: Static
-  - uid: 541
+  - uid: 6156
     components:
     - type: Transform
-      anchored: True
-      pos: -28.5,-16.5
+      pos: -21.5,-1.5
       parent: 60
-    - type: Physics
-      bodyType: Static
-  - uid: 552
+  - uid: 8989
     components:
     - type: Transform
-      anchored: True
-      pos: -28.5,-17.5
+      pos: -21.5,0.5
       parent: 60
-    - type: Physics
-      bodyType: Static
-  - uid: 562
+  - uid: 9147
     components:
     - type: Transform
-      anchored: True
-      pos: -28.5,-18.5
+      pos: -21.5,-0.5
       parent: 60
-    - type: Physics
-      bodyType: Static
 - proto: LockerSyndicatePersonal
   entities:
   - uid: 9113
@@ -114823,21 +113615,6 @@ entities:
         - 0
         - 0
         - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 9114
-          - 9115
-          - 9116
-          - 9117
-          - 9118
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: LockerWallMedicalFilled
   entities:
   - uid: 8969
@@ -114845,16 +113622,13 @@ entities:
     - type: Transform
       pos: 29.5,-18.5
       parent: 60
-- proto: LockerWardenFilledHardsuit
+- proto: LockerWardenFilled
   entities:
-  - uid: 1560
+  - uid: 8281
     components:
     - type: Transform
-      anchored: True
-      pos: -28.5,-11.5
+      pos: -29.5,-18.5
       parent: 60
-    - type: Physics
-      bodyType: Static
 - proto: LockerWeldingSuppliesFilled
   entities:
   - uid: 3316
@@ -115120,29 +113894,29 @@ entities:
     - type: Transform
       pos: -51.5,-4.5
       parent: 60
-- proto: MagazineLightRifle
+- proto: MagazineLightRifleIncendiary
   entities:
-  - uid: 1863
+  - uid: 1138
     components:
     - type: Transform
-      pos: -24.619633,1.6028056
+      pos: -26.673944,-6.3476434
       parent: 60
-  - uid: 5840
+  - uid: 1547
     components:
     - type: Transform
-      pos: -24.246445,1.6150734
+      pos: -26.37181,-6.331765
       parent: 60
 - proto: MagazinePistolSubMachineGunTopMounted
   entities:
-  - uid: 1902
+  - uid: 8215
     components:
     - type: Transform
-      pos: -21.416431,-0.15709138
+      pos: -29.675177,0.49813566
       parent: 60
-  - uid: 8002
+  - uid: 8221
     components:
     - type: Transform
-      pos: -21.416431,-0.15709138
+      pos: -29.435595,0.3834729
       parent: 60
 - proto: MaintenanceFluffSpawner
   entities:
@@ -115151,6 +113925,16 @@ entities:
     - type: Transform
       pos: 32.5,14.5
       parent: 60
+  - uid: 1562
+    components:
+    - type: Transform
+      pos: -17.5,-5.5
+      parent: 60
+  - uid: 4011
+    components:
+    - type: Transform
+      pos: -30.5,4.5
+      parent: 60
   - uid: 4521
     components:
     - type: Transform
@@ -115176,11 +113960,6 @@ entities:
     - type: Transform
       pos: -64.5,2.5
       parent: 60
-  - uid: 8448
-    components:
-    - type: Transform
-      pos: -20.5,5.5
-      parent: 60
   - uid: 8999
     components:
     - type: Transform
@@ -115213,6 +113992,11 @@ entities:
       parent: 60
 - proto: MaintenancePlantSpawner
   entities:
+  - uid: 989
+    components:
+    - type: Transform
+      pos: -15.5,-3.5
+      parent: 60
   - uid: 16997
     components:
     - type: Transform
@@ -115357,18 +114141,6 @@ entities:
     - type: Transform
       pos: 51.428207,-36.33008
       parent: 60
-- proto: MatterBinStockPart
-  entities:
-  - uid: 9463
-    components:
-    - type: Transform
-      pos: -45.371063,-10.326076
-      parent: 60
-  - uid: 9476
-    components:
-    - type: Transform
-      pos: -45.51169,-10.154201
-      parent: 60
 - proto: MechEquipmentGrabberSmall
   entities:
   - uid: 25380
@@ -115383,6 +114155,16 @@ entities:
     - type: Transform
       pos: 30.5,-16.5
       parent: 60
+  - uid: 764
+    components:
+    - type: Transform
+      pos: -18.5,-8.5
+      parent: 60
+  - uid: 844
+    components:
+    - type: Transform
+      pos: -17.5,-9.5
+      parent: 60
   - uid: 8750
     components:
     - type: Transform
@@ -115465,11 +114247,6 @@ entities:
     - type: Transform
       pos: 29.57766,-48.642044
       parent: 60
-  - uid: 8710
-    components:
-    - type: Transform
-      pos: -20.43703,-13.469859
-      parent: 60
   - uid: 12332
     components:
     - type: Transform
@@ -115492,26 +114269,21 @@ entities:
       parent: 60
 - proto: MedkitOxygenFilled
   entities:
+  - uid: 431
+    components:
+    - type: Transform
+      pos: -19.705336,-8.250802
+      parent: 60
   - uid: 8530
     components:
     - type: Transform
       pos: 24.473473,-44.545494
       parent: 60
-  - uid: 11551
-    components:
-    - type: Transform
-      pos: -20.327656,-13.344859
-      parent: 60
   - uid: 21361
     components:
     - type: Transform
       pos: 47.612705,-11.90759
       parent: 60
-  - uid: 24142
-    components:
-    - type: Transform
-      pos: -5.4432654,-18.418339
-      parent: 60
 - proto: MedkitRadiationFilled
   entities:
   - uid: 5882
@@ -115521,6 +114293,11 @@ entities:
       parent: 60
 - proto: MedkitToxinFilled
   entities:
+  - uid: 491
+    components:
+    - type: Transform
+      pos: -19.350992,-8.469703
+      parent: 60
   - uid: 5556
     components:
     - type: Transform
@@ -115538,21 +114315,47 @@ entities:
       parent: 60
 - proto: MicroManipulatorStockPart
   entities:
+  - uid: 6272
+    components:
+    - type: Transform
+      rot: 0.00019908661488443613 rad
+      pos: 18.263704,-44.683575
+      parent: 60
   - uid: 9425
     components:
     - type: Transform
       pos: -45.038364,-10.503761
       parent: 60
+  - uid: 9463
+    components:
+    - type: Transform
+      pos: -45.371063,-10.326076
+      parent: 60
   - uid: 9474
     components:
     - type: Transform
       pos: -66.53229,9.621169
       parent: 60
+  - uid: 9476
+    components:
+    - type: Transform
+      pos: -45.51169,-10.154201
+      parent: 60
   - uid: 13014
     components:
     - type: Transform
       pos: -44.96024,-10.316261
       parent: 60
+  - uid: 13015
+    components:
+    - type: Transform
+      pos: -67.444885,9.609138
+      parent: 60
+  - uid: 13017
+    components:
+    - type: Transform
+      pos: -67.61676,9.687263
+      parent: 60
   - uid: 19181
     components:
     - type: Transform
@@ -115563,6 +114366,16 @@ entities:
     - type: Transform
       pos: 23.430836,21.558159
       parent: 60
+  - uid: 19183
+    components:
+    - type: Transform
+      pos: 23.618336,21.636284
+      parent: 60
+  - uid: 19184
+    components:
+    - type: Transform
+      pos: 23.743336,21.526909
+      parent: 60
 - proto: MicrophoneInstrument
   entities:
   - uid: 17203
@@ -115580,12 +114393,22 @@ entities:
       parent: 60
 - proto: Mirror
   entities:
+  - uid: 233
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 60
   - uid: 5019
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-11.5
       parent: 60
+  - uid: 9155
+    components:
+    - type: Transform
+      pos: -6.5,-18.5
+      parent: 60
   - uid: 21757
     components:
     - type: Transform
@@ -115627,10 +114450,17 @@ entities:
       parent: 60
 - proto: MopBucketFull
   entities:
-  - uid: 13720
+  - uid: 1931
     components:
     - type: Transform
-      pos: -10.5,-19.5
+      pos: -12.5,-10.5
+      parent: 60
+- proto: MopItem
+  entities:
+  - uid: 1930
+    components:
+    - type: Transform
+      pos: -12.5,-10.5
       parent: 60
 - proto: Morgue
   entities:
@@ -115706,6 +114536,11 @@ entities:
         - 0
         - 0
         - 0
+  - uid: 1638
+    components:
+    - type: Transform
+      pos: -20.5,-8.5
+      parent: 60
   - uid: 9166
     components:
     - type: Transform
@@ -116030,6 +114865,11 @@ entities:
     - type: Transform
       pos: 50.5,-1.5
       parent: 60
+  - uid: 13734
+    components:
+    - type: Transform
+      pos: -15.5,1.5
+      parent: 60
   - uid: 15248
     components:
     - type: Transform
@@ -116242,6 +115082,11 @@ entities:
     - type: Transform
       pos: 49.5,-1.5
       parent: 60
+  - uid: 13735
+    components:
+    - type: Transform
+      pos: -15.5,2.5
+      parent: 60
   - uid: 15246
     components:
     - type: Transform
@@ -116297,13 +115142,6 @@ entities:
     - type: Transform
       pos: -57.5,16.5
       parent: 60
-- proto: PackPaperRolling
-  entities:
-  - uid: 11151
-    components:
-    - type: Transform
-      pos: -10.628071,-18.30077
-      parent: 60
 - proto: PaintingAmogusTriptych
   entities:
   - uid: 23383
@@ -116421,70 +115259,15 @@ entities:
       parent: 60
 - proto: Paper
   entities:
-  - uid: 307
-    components:
-    - type: Transform
-      pos: -32.531956,-11.310459
-      parent: 60
   - uid: 934
     components:
     - type: Transform
       pos: -10.55104,-28.480585
       parent: 60
-  - uid: 1908
+  - uid: 8403
     components:
     - type: Transform
-      pos: -32.54758,-11.279209
-      parent: 60
-  - uid: 1913
-    components:
-    - type: Transform
-      pos: -32.563206,-11.310459
-      parent: 60
-  - uid: 2098
-    components:
-    - type: Transform
-      pos: -32.603565,-7.312026
-      parent: 60
-  - uid: 5368
-    components:
-    - type: Transform
-      pos: -20.412611,-11.27935
-      parent: 60
-  - uid: 5424
-    components:
-    - type: Transform
-      pos: -20.506361,-11.294975
-      parent: 60
-  - uid: 6648
-    components:
-    - type: Transform
-      pos: -20.459486,-7.320634
-      parent: 60
-  - uid: 6683
-    components:
-    - type: Transform
-      pos: -32.603565,-7.280776
-      parent: 60
-  - uid: 6819
-    components:
-    - type: Transform
-      pos: -20.475111,-11.294975
-      parent: 60
-  - uid: 7166
-    components:
-    - type: Transform
-      pos: -20.475111,-7.320634
-      parent: 60
-  - uid: 8264
-    components:
-    - type: Transform
-      pos: -32.55669,-7.280776
-      parent: 60
-  - uid: 8278
-    components:
-    - type: Transform
-      pos: -20.475111,-7.336259
+      pos: -28.72569,0.5517118
       parent: 60
   - uid: 8760
     components:
@@ -116758,6 +115541,12 @@ entities:
     - type: Transform
       pos: 4.5,-31.5
       parent: 60
+  - uid: 15569
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -33.5,-20.5
+      parent: 60
 - proto: PaperBin5
   entities:
   - uid: 4255
@@ -116780,11 +115569,6 @@ entities:
     - type: Transform
       pos: -44.5,-7.5
       parent: 60
-  - uid: 11372
-    components:
-    - type: Transform
-      pos: -32.5,-0.5
-      parent: 60
   - uid: 16451
     components:
     - type: Transform
@@ -116950,31 +115734,11 @@ entities:
     - type: Transform
       pos: -10.316665,-28.324335
       parent: 60
-  - uid: 1856
-    components:
-    - type: Transform
-      pos: -32.416065,-7.437026
-      parent: 60
-  - uid: 1903
-    components:
-    - type: Transform
-      pos: -32.375706,-11.576084
-      parent: 60
   - uid: 4668
     components:
     - type: Transform
       pos: 6.7427726,-42.739647
       parent: 60
-  - uid: 5428
-    components:
-    - type: Transform
-      pos: -20.584486,-11.451225
-      parent: 60
-  - uid: 6041
-    components:
-    - type: Transform
-      pos: -20.539515,-7.482237
-      parent: 60
   - uid: 9088
     components:
     - type: Transform
@@ -116985,6 +115749,12 @@ entities:
     - type: Transform
       pos: 44.706337,13.771817
       parent: 60
+  - uid: 15845
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -33.444183,-20.432625
+      parent: 60
   - uid: 16986
     components:
     - type: Transform
@@ -117005,16 +115775,6 @@ entities:
     - type: Transform
       pos: -35.320312,19.746838
       parent: 60
-  - uid: 18215
-    components:
-    - type: Transform
-      pos: -32.5,-0.5
-      parent: 60
-  - uid: 18462
-    components:
-    - type: Transform
-      pos: -31.435102,-20.467825
-      parent: 60
   - uid: 23152
     components:
     - type: Transform
@@ -117391,6 +116151,18 @@ entities:
     - type: Transform
       pos: 68.494286,-27.490837
       parent: 60
+- proto: PortableFlasher
+  entities:
+  - uid: 1805
+    components:
+    - type: Transform
+      anchored: False
+      pos: -25.5,1.5
+      parent: 60
+    - type: TriggerOnProximity
+      enabled: False
+    - type: Physics
+      bodyType: Dynamic
 - proto: PortableGeneratorJrPacman
   entities:
   - uid: 4003
@@ -117433,11 +116205,6 @@ entities:
     - type: Transform
       pos: 24.5,19.5
       parent: 60
-  - uid: 21392
-    components:
-    - type: Transform
-      pos: -32.5,3.5
-      parent: 60
   - uid: 21677
     components:
     - type: Transform
@@ -117470,6 +116237,11 @@ entities:
       parent: 60
 - proto: PortableGeneratorPacman
   entities:
+  - uid: 856
+    components:
+    - type: Transform
+      pos: -32.5,2.5
+      parent: 60
   - uid: 8063
     components:
     - type: Transform
@@ -117768,13 +116540,6 @@ entities:
     - type: Transform
       pos: -52.5,10.5
       parent: 60
-- proto: PosterContrabandRevolver
-  entities:
-  - uid: 4754
-    components:
-    - type: Transform
-      pos: -24.5,2.5
-      parent: 60
 - proto: PosterContrabandRIPBadger
   entities:
   - uid: 799
@@ -117839,6 +116604,14 @@ entities:
     - type: Transform
       pos: 6.5,-3.5
       parent: 7536
+- proto: PosterContrabandTheBigGasTruth
+  entities:
+  - uid: 6206
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -22.5,4.5
+      parent: 60
 - proto: PosterContrabandTools
   entities:
   - uid: 6314
@@ -117853,11 +116626,6 @@ entities:
     - type: Transform
       pos: 35.5,-9.5
       parent: 60
-  - uid: 8419
-    components:
-    - type: Transform
-      pos: -33.49567,-12.27123
-      parent: 60
 - proto: PosterContrabandVoteWeh
   entities:
   - uid: 9082
@@ -117884,6 +116652,12 @@ entities:
     - type: Transform
       pos: 8.5,-35.5
       parent: 60
+  - uid: 6702
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -17.5,2.5
+      parent: 60
 - proto: PosterLegit50thAnniversaryVintageReprint
   entities:
   - uid: 9565
@@ -117898,6 +116672,12 @@ entities:
       parent: 60
 - proto: PosterLegitAnatomyPoster
   entities:
+  - uid: 12
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-8.5
+      parent: 60
   - uid: 4556
     components:
     - type: Transform
@@ -117910,6 +116690,11 @@ entities:
       parent: 60
 - proto: PosterLegitBlessThisSpess
   entities:
+  - uid: 6714
+    components:
+    - type: Transform
+      pos: -8.5,-11.5
+      parent: 60
   - uid: 18208
     components:
     - type: Transform
@@ -117970,13 +116755,6 @@ entities:
     - type: Transform
       pos: -26.5,-25.5
       parent: 60
-- proto: PosterLegitEnlist
-  entities:
-  - uid: 8452
-    components:
-    - type: Transform
-      pos: -23.5,-17.5
-      parent: 60
 - proto: PosterLegitFoamForceAd
   entities:
   - uid: 3980
@@ -118010,6 +116788,12 @@ entities:
     - type: Transform
       pos: 5.5,-52.5
       parent: 60
+  - uid: 8327
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,1.5
+      parent: 60
   - uid: 16097
     components:
     - type: Transform
@@ -118044,13 +116828,6 @@ entities:
     - type: Transform
       pos: 9.5,-32.5
       parent: 60
-- proto: PosterLegitIonRifle
-  entities:
-  - uid: 8453
-    components:
-    - type: Transform
-      pos: -28.5,2.5
-      parent: 60
 - proto: PosterLegitJustAWeekAway
   entities:
   - uid: 3093
@@ -118206,16 +116983,22 @@ entities:
       parent: 60
 - proto: PosterLegitReportCrimes
   entities:
+  - uid: 1642
+    components:
+    - type: Transform
+      pos: -26.5,-21.5
+      parent: 60
+  - uid: 1668
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,2.5
+      parent: 60
   - uid: 4697
     components:
     - type: Transform
       pos: -2.5,-43.5
       parent: 60
-  - uid: 8420
-    components:
-    - type: Transform
-      pos: -22.5,-21.5
-      parent: 60
   - uid: 16151
     components:
     - type: Transform
@@ -118226,11 +117009,6 @@ entities:
     - type: Transform
       pos: 37.5,19.5
       parent: 60
-  - uid: 21397
-    components:
-    - type: Transform
-      pos: -22.5,-25.5
-      parent: 60
 - proto: PosterLegitSafetyEyeProtection
   entities:
   - uid: 14043
@@ -118328,6 +117106,14 @@ entities:
     - type: Transform
       pos: -60.5,3.5
       parent: 60
+- proto: PosterLegitSecWatch
+  entities:
+  - uid: 12193
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-17.5
+      parent: 60
 - proto: PosterLegitSpaceCops
   entities:
   - uid: 1458
@@ -118335,11 +117121,6 @@ entities:
     - type: Transform
       pos: 14.5,-18.5
       parent: 60
-  - uid: 8506
-    components:
-    - type: Transform
-      pos: -33.5,1.5
-      parent: 60
 - proto: PosterLegitTheOwl
   entities:
   - uid: 7897
@@ -118347,6 +117128,22 @@ entities:
     - type: Transform
       pos: 45.5,-43.5
       parent: 60
+- proto: PosterLegitThereIsNoGasGiant
+  entities:
+  - uid: 6174
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,2.5
+      parent: 60
+- proto: PosterLegitTyrone
+  entities:
+  - uid: 13715
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,6.5
+      parent: 60
 - proto: PosterLegitUeNo
   entities:
   - uid: 25310
@@ -118361,11 +117158,6 @@ entities:
     - type: Transform
       pos: -13.5,19.5
       parent: 60
-  - uid: 17251
-    components:
-    - type: Transform
-      pos: -22.5,6.5
-      parent: 60
   - uid: 17252
     components:
     - type: Transform
@@ -118410,11 +117202,6 @@ entities:
     - type: Transform
       pos: -1.5,-2.5
       parent: 60
-  - uid: 8434
-    components:
-    - type: Transform
-      pos: -23.5,-21.5
-      parent: 60
   - uid: 9006
     components:
     - type: Transform
@@ -118567,12 +117354,6 @@ entities:
     - type: Transform
       pos: -1.5,-75.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 4540
 - proto: PottedPlant4
   entities:
   - uid: 15519
@@ -118650,22 +117431,26 @@ entities:
       parent: 60
 - proto: PottedPlantRandom
   entities:
+  - uid: 1862
+    components:
+    - type: Transform
+      pos: -38.5,-24.5
+      parent: 60
   - uid: 2774
     components:
     - type: Transform
       pos: 24.5,-22.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
   - uid: 2905
     components:
     - type: Transform
       pos: 37.5,-22.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
+  - uid: 4190
+    components:
+    - type: Transform
+      pos: -30.5,-12.5
+      parent: 60
   - uid: 4678
     components:
     - type: Transform
@@ -118686,14 +117471,6 @@ entities:
     - type: Transform
       pos: 2.5,-69.5
       parent: 60
-  - uid: 5438
-    components:
-    - type: Transform
-      pos: -38.5,-24.5
-      parent: 60
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
   - uid: 6411
     components:
     - type: Transform
@@ -118709,9 +117486,6 @@ entities:
     - type: Transform
       pos: 45.5,-29.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
   - uid: 7422
     components:
     - type: Transform
@@ -118727,14 +117501,16 @@ entities:
     - type: Transform
       pos: -1.5,-64.5
       parent: 60
+  - uid: 8329
+    components:
+    - type: Transform
+      pos: -24.5,-12.5
+      parent: 60
   - uid: 9098
     components:
     - type: Transform
       pos: -2.5,11.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
   - uid: 11530
     components:
     - type: Transform
@@ -118750,73 +117526,46 @@ entities:
     - type: Transform
       pos: -24.5,26.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
   - uid: 17381
     components:
     - type: Transform
       pos: -63.5,21.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
   - uid: 17382
     components:
     - type: Transform
       pos: -63.5,25.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
   - uid: 18837
     components:
     - type: Transform
       pos: -21.5,9.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
   - uid: 18838
     components:
     - type: Transform
       pos: -22.5,21.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
   - uid: 18839
     components:
     - type: Transform
       pos: -28.5,21.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
   - uid: 19095
     components:
     - type: Transform
       pos: 15.5,28.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
   - uid: 19144
     components:
     - type: Transform
       pos: 24.5,17.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
   - uid: 19891
     components:
     - type: Transform
       pos: 19.5,6.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot {}
   - uid: 21017
     components:
     - type: Transform
@@ -118842,11 +117591,6 @@ entities:
     - type: Transform
       pos: -113.5,2.5
       parent: 60
-  - uid: 23892
-    components:
-    - type: Transform
-      pos: -17.5,0.5
-      parent: 60
   - uid: 24018
     components:
     - type: Transform
@@ -118954,6 +117698,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,15.5
       parent: 60
+  - uid: 15403
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -32.5,-1.5
+      parent: 60
   - uid: 15698
     components:
     - type: Transform
@@ -118994,11 +117744,6 @@ entities:
       parent: 60
     - type: Physics
       canCollide: False
-  - uid: 21154
-    components:
-    - type: Transform
-      pos: -18.5,-13.5
-      parent: 60
   - uid: 23114
     components:
     - type: Transform
@@ -119018,35 +117763,24 @@ entities:
       parent: 60
 - proto: PoweredDimSmallLight
   entities:
+  - uid: 1868
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,2.5
+      parent: 60
   - uid: 8504
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 19.5,-16.5
       parent: 60
-  - uid: 8601
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -12.5,-10.5
-      parent: 60
   - uid: 10314
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 12.5,34.5
       parent: 60
-  - uid: 11366
-    components:
-    - type: Transform
-      pos: -21.5,5.5
-      parent: 60
-  - uid: 11945
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,2.5
-      parent: 60
   - uid: 14228
     components:
     - type: Transform
@@ -119335,12 +118069,6 @@ entities:
       parent: 60
 - proto: Poweredlight
   entities:
-  - uid: 6
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-17.5
-      parent: 60
   - uid: 126
     components:
     - type: Transform
@@ -119377,6 +118105,17 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 367
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -15.5,-15.5
+      parent: 60
+  - uid: 515
+    components:
+    - type: Transform
+      pos: -25.5,-2.5
+      parent: 60
   - uid: 663
     components:
     - type: Transform
@@ -119391,6 +118130,11 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 1217
+    components:
+    - type: Transform
+      pos: -18.5,-8.5
+      parent: 60
   - uid: 1295
     components:
     - type: Transform
@@ -119406,11 +118150,10 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 1584
+  - uid: 1908
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -18.5,-15.5
+      pos: -13.5,-8.5
       parent: 60
   - uid: 2106
     components:
@@ -119418,6 +118161,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -6.5,15.5
       parent: 60
+  - uid: 2113
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -37.5,-24.5
+      parent: 60
   - uid: 2117
     components:
     - type: Transform
@@ -119512,6 +118261,18 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 2808
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -18.5,-15.5
+      parent: 60
+  - uid: 2860
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,-11.5
+      parent: 60
   - uid: 3057
     components:
     - type: Transform
@@ -119562,10 +118323,22 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,-4.5
       parent: 60
+  - uid: 3180
+    components:
+    - type: Transform
+      pos: -28.5,-6.5
+      parent: 60
   - uid: 3224
     components:
     - type: Transform
-      pos: -28.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -28.5,-9.5
+      parent: 60
+  - uid: 3676
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,-16.5
       parent: 60
   - uid: 3691
     components:
@@ -119575,6 +118348,12 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 4078
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -25.5,1.5
+      parent: 60
   - uid: 4106
     components:
     - type: Transform
@@ -119582,17 +118361,6 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 4234
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -24.5,-17.5
-      parent: 60
-  - uid: 4281
-    components:
-    - type: Transform
-      pos: -23.5,-3.5
-      parent: 60
   - uid: 4358
     components:
     - type: Transform
@@ -119669,11 +118437,6 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 5610
-    components:
-    - type: Transform
-      pos: -6.5,-20.5
-      parent: 60
   - uid: 5748
     components:
     - type: Transform
@@ -119816,7 +118579,8 @@ entities:
   - uid: 6797
     components:
     - type: Transform
-      pos: -29.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: -20.5,-3.5
       parent: 60
   - uid: 6915
     components:
@@ -119843,12 +118607,6 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 7232
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-12.5
-      parent: 60
   - uid: 7632
     components:
     - type: Transform
@@ -119869,11 +118627,27 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 47.5,-13.5
       parent: 60
-  - uid: 7906
+  - uid: 7747
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: -34.5,-14.5
+      parent: 60
+  - uid: 7793
+    components:
+    - type: Transform
+      pos: -26.5,-11.5
+      parent: 60
+  - uid: 7907
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,-20.5
+      parent: 60
+  - uid: 7917
+    components:
+    - type: Transform
+      pos: -33.5,0.5
       parent: 60
   - uid: 8041
     components:
@@ -119881,6 +118655,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 35.5,-31.5
       parent: 60
+  - uid: 8214
+    components:
+    - type: Transform
+      pos: -31.5,-22.5
+      parent: 60
   - uid: 8219
     components:
     - type: Transform
@@ -119896,10 +118675,28 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 8352
+  - uid: 8230
     components:
     - type: Transform
-      pos: -24.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -26.5,-20.5
+      parent: 60
+  - uid: 8245
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -32.5,-9.5
+      parent: 60
+  - uid: 8284
+    components:
+    - type: Transform
+      pos: -31.5,-2.5
+      parent: 60
+  - uid: 8290
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,-24.5
       parent: 60
   - uid: 8390
     components:
@@ -119936,23 +118733,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -38.5,-8.5
       parent: 60
-  - uid: 8571
+  - uid: 8771
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -36.5,-2.5
+      pos: -36.5,4.5
       parent: 60
-  - uid: 8572
+  - uid: 8922
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -28.5,-17.5
-      parent: 60
-  - uid: 8576
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,4.5
+      rot: 3.141592653589793 rad
+      pos: -19.5,-24.5
       parent: 60
   - uid: 9163
     components:
@@ -120030,20 +118821,6 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 10672
-    components:
-    - type: Transform
-      pos: -23.5,-22.5
-      parent: 60
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 10674
-    components:
-    - type: Transform
-      pos: -29.5,-22.5
-      parent: 60
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 10687
     components:
     - type: Transform
@@ -120202,16 +118979,11 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 11694
+  - uid: 12191
     components:
     - type: Transform
-      pos: -21.5,-18.5
-      parent: 60
-  - uid: 11726
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -11.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-20.5
       parent: 60
   - uid: 12224
     components:
@@ -120278,6 +119050,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 10.5,20.5
       parent: 60
+  - uid: 13698
+    components:
+    - type: Transform
+      pos: -30.5,-11.5
+      parent: 60
+  - uid: 13769
+    components:
+    - type: Transform
+      pos: -9.5,-12.5
+      parent: 60
   - uid: 13904
     components:
     - type: Transform
@@ -120292,6 +119074,29 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 13929
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -34.5,-6.5
+      parent: 60
+  - uid: 14086
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -36.5,-2.5
+      parent: 60
+  - uid: 14225
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,-20.5
+      parent: 60
+  - uid: 14356
+    components:
+    - type: Transform
+      pos: -19.5,1.5
+      parent: 60
   - uid: 14734
     components:
     - type: Transform
@@ -120448,12 +119253,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,41.5
       parent: 60
-  - uid: 15443
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,-11.5
-      parent: 60
   - uid: 15574
     components:
     - type: Transform
@@ -120830,22 +119629,11 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 21504
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-2.5
-      parent: 60
   - uid: 21703
     components:
     - type: Transform
       pos: -46.5,-15.5
       parent: 60
-  - uid: 21764
-    components:
-    - type: Transform
-      pos: -33.5,-13.5
-      parent: 60
   - uid: 21990
     components:
     - type: Transform
@@ -121061,12 +119849,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 55.5,46.5
       parent: 60
-  - uid: 23836
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-8.5
-      parent: 60
   - uid: 24109
     components:
     - type: Transform
@@ -121364,22 +120146,6 @@ entities:
       parent: 60
 - proto: PoweredSmallLight
   entities:
-  - uid: 313
-    components:
-    - type: Transform
-      pos: -20.5,-9.5
-      parent: 60
-  - uid: 314
-    components:
-    - type: Transform
-      pos: -20.5,-5.5
-      parent: 60
-  - uid: 769
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -12.5,-20.5
-      parent: 60
   - uid: 1211
     components:
     - type: Transform
@@ -121395,10 +120161,16 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 1657
+  - uid: 1764
     components:
     - type: Transform
-      pos: -32.5,-5.5
+      rot: 3.141592653589793 rad
+      pos: -7.5,-17.5
+      parent: 60
+  - uid: 1863
+    components:
+    - type: Transform
+      pos: -27.5,5.5
       parent: 60
   - uid: 2819
     components:
@@ -121428,6 +120200,18 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 4188
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,-20.5
+      parent: 60
+  - uid: 4203
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,-7.5
+      parent: 60
   - uid: 4293
     components:
     - type: Transform
@@ -121493,11 +120277,6 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 7139
-    components:
-    - type: Transform
-      pos: -32.5,-9.5
-      parent: 60
   - uid: 7186
     components:
     - type: Transform
@@ -121574,6 +120353,11 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 8898
+    components:
+    - type: Transform
+      pos: -14.5,-5.5
+      parent: 60
   - uid: 9170
     components:
     - type: Transform
@@ -121593,6 +120377,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 12.5,-17.5
       parent: 60
+  - uid: 10035
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-19.5
+      parent: 60
   - uid: 10587
     components:
     - type: Transform
@@ -121656,6 +120446,12 @@ entities:
       parent: 7536
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 13139
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,4.5
+      parent: 60
   - uid: 13194
     components:
     - type: Transform
@@ -121765,11 +120561,6 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 17960
-    components:
-    - type: Transform
-      pos: -32.5,0.5
-      parent: 60
   - uid: 18629
     components:
     - type: Transform
@@ -121995,14 +120786,6 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 24138
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-18.5
-      parent: 60
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 24235
     components:
     - type: Transform
@@ -122054,18 +120837,6 @@ entities:
       powerLoad: 0
 - proto: PoweredWarmSmallLight
   entities:
-  - uid: 1728
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -18.5,-3.5
-      parent: 60
-  - uid: 7031
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-0.5
-      parent: 60
   - uid: 8523
     components:
     - type: Transform
@@ -122143,6 +120914,12 @@ entities:
     - type: Transform
       pos: -12.5,-50.5
       parent: 60
+  - uid: 13933
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,0.5
+      parent: 60
 - proto: Protolathe
   entities:
   - uid: 7081
@@ -122159,11 +120936,22 @@ entities:
       parent: 60
 - proto: Rack
   entities:
+  - uid: 547
+    components:
+    - type: Transform
+      pos: -17.5,-5.5
+      parent: 60
   - uid: 958
     components:
     - type: Transform
       pos: 29.5,-10.5
       parent: 60
+  - uid: 963
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -18.5,5.5
+      parent: 60
   - uid: 1372
     components:
     - type: Transform
@@ -122174,20 +120962,15 @@ entities:
     - type: Transform
       pos: 56.5,-15.5
       parent: 60
-  - uid: 1558
-    components:
-    - type: Transform
-      pos: -27.5,1.5
-      parent: 60
   - uid: 1677
     components:
     - type: Transform
       pos: -31.5,-30.5
       parent: 60
-  - uid: 1907
+  - uid: 1823
     components:
     - type: Transform
-      pos: -22.5,-20.5
+      pos: -25.5,0.5
       parent: 60
   - uid: 2174
     components:
@@ -122227,7 +121010,7 @@ entities:
   - uid: 3843
     components:
     - type: Transform
-      pos: -20.5,5.5
+      pos: -30.5,4.5
       parent: 60
   - uid: 3970
     components:
@@ -122299,11 +121082,6 @@ entities:
     - type: Transform
       pos: -67.5,12.5
       parent: 60
-  - uid: 5849
-    components:
-    - type: Transform
-      pos: -28.5,1.5
-      parent: 60
   - uid: 6049
     components:
     - type: Transform
@@ -122440,6 +121218,11 @@ entities:
     - type: Transform
       pos: 45.5,-1.5
       parent: 60
+  - uid: 14079
+    components:
+    - type: Transform
+      pos: -24.5,-7.5
+      parent: 60
   - uid: 14119
     components:
     - type: Transform
@@ -122644,13 +121427,6 @@ entities:
     - type: Transform
       pos: -59.482983,1.5744543
       parent: 60
-- proto: RagItem
-  entities:
-  - uid: 5841
-    components:
-    - type: Transform
-      pos: -10.329648,-18.87202
-      parent: 60
 - proto: Railing
   entities:
   - uid: 732
@@ -122665,6 +121441,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -8.5,-26.5
       parent: 60
+  - uid: 1706
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-17.5
+      parent: 60
   - uid: 6486
     components:
     - type: Transform
@@ -122713,6 +121495,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 24.5,-16.5
       parent: 60
+  - uid: 8335
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-18.5
+      parent: 60
+  - uid: 13690
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-19.5
+      parent: 60
+  - uid: 13691
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-20.5
+      parent: 60
   - uid: 16130
     components:
     - type: Transform
@@ -122927,6 +121727,11 @@ entities:
     - type: Transform
       pos: 13.5,-33.5
       parent: 60
+  - uid: 13598
+    components:
+    - type: Transform
+      pos: -20.5,3.5
+      parent: 60
 - proto: RandomDrinkGlass
   entities:
   - uid: 6385
@@ -122965,6 +121770,11 @@ entities:
     - type: Transform
       pos: 55.5,-5.5
       parent: 60
+  - uid: 1989
+    components:
+    - type: Transform
+      pos: -9.5,-13.5
+      parent: 60
   - uid: 5302
     components:
     - type: Transform
@@ -123076,10 +121886,10 @@ entities:
     - type: Transform
       pos: 12.5,-44.5
       parent: 60
-  - uid: 7164
+  - uid: 5201
     components:
     - type: Transform
-      pos: -11.5,-17.5
+      pos: -7.5,-15.5
       parent: 60
   - uid: 9094
     components:
@@ -123091,11 +121901,6 @@ entities:
     - type: Transform
       pos: -29.5,-33.5
       parent: 60
-  - uid: 13701
-    components:
-    - type: Transform
-      pos: -12.5,-12.5
-      parent: 60
   - uid: 18010
     components:
     - type: Transform
@@ -123138,6 +121943,18 @@ entities:
       parent: 60
 - proto: RandomPosterLegit
   entities:
+  - uid: 855
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,6.5
+      parent: 60
+  - uid: 1871
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,4.5
+      parent: 60
   - uid: 2574
     components:
     - type: Transform
@@ -123168,6 +121985,17 @@ entities:
     - type: Transform
       pos: 59.5,-29.5
       parent: 60
+  - uid: 4121
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-11.5
+      parent: 60
+  - uid: 5234
+    components:
+    - type: Transform
+      pos: -8.5,-21.5
+      parent: 60
   - uid: 6468
     components:
     - type: Transform
@@ -123193,6 +122021,34 @@ entities:
     - type: Transform
       pos: 18.5,-12.5
       parent: 60
+  - uid: 13766
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,6.5
+      parent: 60
+  - uid: 14076
+    components:
+    - type: Transform
+      pos: -13.5,-21.5
+      parent: 60
+  - uid: 14586
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-10.5
+      parent: 60
+  - uid: 14587
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-18.5
+      parent: 60
+  - uid: 14588
+    components:
+    - type: Transform
+      pos: -33.5,-21.5
+      parent: 60
   - uid: 15192
     components:
     - type: Transform
@@ -123213,6 +122069,18 @@ entities:
     - type: Transform
       pos: -46.5,26.5
       parent: 60
+  - uid: 16994
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -18.5,-4.5
+      parent: 60
+  - uid: 17474
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.5,-15.5
+      parent: 60
   - uid: 18003
     components:
     - type: Transform
@@ -123575,10 +122443,15 @@ entities:
     - type: Transform
       pos: -3.5,-66.5
       parent: 60
-  - uid: 7661
+  - uid: 8228
     components:
     - type: Transform
-      pos: -37.5,-24.5
+      pos: -32.5,-24.5
+      parent: 60
+  - uid: 8251
+    components:
+    - type: Transform
+      pos: -31.5,-4.5
       parent: 60
   - uid: 11241
     components:
@@ -123602,6 +122475,11 @@ entities:
       parent: 60
 - proto: RandomVendingSnacks
   entities:
+  - uid: 3070
+    components:
+    - type: Transform
+      pos: -31.5,-24.5
+      parent: 60
   - uid: 6320
     components:
     - type: Transform
@@ -123622,6 +122500,13 @@ entities:
     - type: Transform
       pos: 8.5,-19.5
       parent: 60
+- proto: RandomWoodenSupport
+  entities:
+  - uid: 6203
+    components:
+    - type: Transform
+      pos: -20.5,5.5
+      parent: 60
 - proto: RCD
   entities:
   - uid: 1912
@@ -123711,16 +122596,6 @@ entities:
       parent: 60
 - proto: ReinforcedPlasmaWindow
   entities:
-  - uid: 1574
-    components:
-    - type: Transform
-      pos: -27.5,-2.5
-      parent: 60
-  - uid: 1575
-    components:
-    - type: Transform
-      pos: -25.5,-2.5
-      parent: 60
   - uid: 6985
     components:
     - type: Transform
@@ -123958,51 +122833,16 @@ entities:
       parent: 60
 - proto: ReinforcedWindow
   entities:
-  - uid: 13
+  - uid: 10
     components:
     - type: Transform
-      pos: -23.5,-12.5
-      parent: 60
-  - uid: 25
-    components:
-    - type: Transform
-      pos: -32.5,-21.5
-      parent: 60
-  - uid: 130
-    components:
-    - type: Transform
-      pos: -34.5,-17.5
-      parent: 60
-  - uid: 143
-    components:
-    - type: Transform
-      pos: -33.5,-21.5
+      pos: -25.5,-12.5
       parent: 60
   - uid: 209
     components:
     - type: Transform
       pos: 7.5,-18.5
       parent: 60
-  - uid: 236
-    components:
-    - type: Transform
-      pos: -29.5,-12.5
-      parent: 60
-  - uid: 239
-    components:
-    - type: Transform
-      pos: -35.5,-18.5
-      parent: 60
-  - uid: 240
-    components:
-    - type: Transform
-      pos: -19.5,-21.5
-      parent: 60
-  - uid: 249
-    components:
-    - type: Transform
-      pos: -29.5,-11.5
-      parent: 60
   - uid: 256
     components:
     - type: Transform
@@ -124013,16 +122853,6 @@ entities:
     - type: Transform
       pos: 57.5,-6.5
       parent: 60
-  - uid: 267
-    components:
-    - type: Transform
-      pos: -17.5,-20.5
-      parent: 60
-  - uid: 295
-    components:
-    - type: Transform
-      pos: -17.5,-7.5
-      parent: 60
   - uid: 320
     components:
     - type: Transform
@@ -124098,10 +122928,10 @@ entities:
     - type: Transform
       pos: 20.5,1.5
       parent: 60
-  - uid: 501
+  - uid: 493
     components:
     - type: Transform
-      pos: -5.5,-21.5
+      pos: -29.5,-12.5
       parent: 60
   - uid: 524
     components:
@@ -124113,26 +122943,6 @@ entities:
     - type: Transform
       pos: 5.5,7.5
       parent: 60
-  - uid: 546
-    components:
-    - type: Transform
-      pos: -4.5,-18.5
-      parent: 60
-  - uid: 556
-    components:
-    - type: Transform
-      pos: -13.5,-3.5
-      parent: 60
-  - uid: 559
-    components:
-    - type: Transform
-      pos: -13.5,-4.5
-      parent: 60
-  - uid: 560
-    components:
-    - type: Transform
-      pos: -13.5,-5.5
-      parent: 60
   - uid: 563
     components:
     - type: Transform
@@ -124203,16 +123013,6 @@ entities:
     - type: Transform
       pos: 5.5,-19.5
       parent: 60
-  - uid: 787
-    components:
-    - type: Transform
-      pos: -12.5,-0.5
-      parent: 60
-  - uid: 796
-    components:
-    - type: Transform
-      pos: -17.5,-5.5
-      parent: 60
   - uid: 797
     components:
     - type: Transform
@@ -124223,25 +123023,70 @@ entities:
     - type: Transform
       pos: -17.5,11.5
       parent: 60
-  - uid: 844
+  - uid: 813
     components:
     - type: Transform
-      pos: -17.5,-6.5
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-21.5
       parent: 60
-  - uid: 986
+  - uid: 845
     components:
     - type: Transform
-      pos: -28.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-21.5
       parent: 60
-  - uid: 1022
+  - uid: 993
     components:
     - type: Transform
-      pos: -27.5,-7.5
+      rot: 1.5707963267948966 rad
+      pos: -21.5,-17.5
       parent: 60
-  - uid: 1168
+  - uid: 1126
     components:
     - type: Transform
-      pos: -26.5,-7.5
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-3.5
+      parent: 60
+  - uid: 1131
+    components:
+    - type: Transform
+      pos: -17.5,-10.5
+      parent: 60
+  - uid: 1133
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-2.5
+      parent: 60
+  - uid: 1139
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-1.5
+      parent: 60
+  - uid: 1140
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-0.5
+      parent: 60
+  - uid: 1156
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-13.5
+      parent: 60
+  - uid: 1158
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-14.5
+      parent: 60
+  - uid: 1174
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,-10.5
       parent: 60
   - uid: 1192
     components:
@@ -124258,11 +123103,6 @@ entities:
     - type: Transform
       pos: -8.5,-32.5
       parent: 60
-  - uid: 1217
-    components:
-    - type: Transform
-      pos: -17.5,-11.5
-      parent: 60
   - uid: 1337
     components:
     - type: Transform
@@ -124288,45 +123128,26 @@ entities:
     - type: Transform
       pos: 2.5,-36.5
       parent: 60
-  - uid: 1462
+  - uid: 1474
     components:
     - type: Transform
-      pos: -23.5,-14.5
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-10.5
       parent: 60
-  - uid: 1464
+  - uid: 1550
     components:
     - type: Transform
-      pos: -29.5,-16.5
+      pos: -21.5,-18.5
       parent: 60
-  - uid: 1469
+  - uid: 1551
     components:
     - type: Transform
-      pos: -29.5,-14.5
+      pos: -21.5,-19.5
       parent: 60
-  - uid: 1478
+  - uid: 1552
     components:
     - type: Transform
-      pos: -23.5,-16.5
-      parent: 60
-  - uid: 1488
-    components:
-    - type: Transform
-      pos: -24.5,-7.5
-      parent: 60
-  - uid: 1527
-    components:
-    - type: Transform
-      pos: -17.5,-10.5
-      parent: 60
-  - uid: 1547
-    components:
-    - type: Transform
-      pos: -28.5,-8.5
-      parent: 60
-  - uid: 1553
-    components:
-    - type: Transform
-      pos: -25.5,-7.5
+      pos: -22.5,-2.5
       parent: 60
   - uid: 1676
     components:
@@ -124338,40 +123159,39 @@ entities:
     - type: Transform
       pos: -25.5,-25.5
       parent: 60
-  - uid: 1846
+  - uid: 1813
     components:
     - type: Transform
-      pos: -22.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-12.5
       parent: 60
-  - uid: 1857
+  - uid: 1836
     components:
     - type: Transform
-      pos: -24.5,-8.5
+      pos: -28.5,-1.5
       parent: 60
-  - uid: 1918
+  - uid: 1838
     components:
     - type: Transform
-      pos: -23.5,-11.5
+      pos: -29.5,-1.5
       parent: 60
-  - uid: 1925
+  - uid: 1916
     components:
     - type: Transform
-      pos: -35.5,-5.5
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-16.5
       parent: 60
   - uid: 1926
     components:
     - type: Transform
-      pos: -35.5,-11.5
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-10.5
       parent: 60
-  - uid: 1934
+  - uid: 1927
     components:
     - type: Transform
-      pos: -17.5,-19.5
-      parent: 60
-  - uid: 2004
-    components:
-    - type: Transform
-      pos: -17.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-9.5
       parent: 60
   - uid: 2057
     components:
@@ -124383,6 +123203,12 @@ entities:
     - type: Transform
       pos: -9.5,-33.5
       parent: 60
+  - uid: 2112
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-15.5
+      parent: 60
   - uid: 2139
     components:
     - type: Transform
@@ -124768,11 +123594,6 @@ entities:
     - type: Transform
       pos: 39.5,-21.5
       parent: 60
-  - uid: 4200
-    components:
-    - type: Transform
-      pos: -32.5,-17.5
-      parent: 60
   - uid: 4301
     components:
     - type: Transform
@@ -124928,11 +123749,6 @@ entities:
     - type: Transform
       pos: -21.5,-53.5
       parent: 60
-  - uid: 5020
-    components:
-    - type: Transform
-      pos: -24.5,-9.5
-      parent: 60
   - uid: 5035
     components:
     - type: Transform
@@ -125403,11 +124219,6 @@ entities:
     - type: Transform
       pos: 45.5,-25.5
       parent: 60
-  - uid: 7043
-    components:
-    - type: Transform
-      pos: -18.5,-0.5
-      parent: 60
   - uid: 7068
     components:
     - type: Transform
@@ -125788,16 +124599,6 @@ entities:
     - type: Transform
       pos: -65.5,14.5
       parent: 60
-  - uid: 7900
-    components:
-    - type: Transform
-      pos: -18.5,-1.5
-      parent: 60
-  - uid: 7909
-    components:
-    - type: Transform
-      pos: -20.5,-6.5
-      parent: 60
   - uid: 8039
     components:
     - type: Transform
@@ -125808,16 +124609,6 @@ entities:
     - type: Transform
       pos: 30.5,-25.5
       parent: 60
-  - uid: 8261
-    components:
-    - type: Transform
-      pos: -20.5,-10.5
-      parent: 60
-  - uid: 8268
-    components:
-    - type: Transform
-      pos: -7.5,-20.5
-      parent: 60
   - uid: 8361
     components:
     - type: Transform
@@ -125833,26 +124624,6 @@ entities:
     - type: Transform
       pos: 52.5,18.5
       parent: 60
-  - uid: 8445
-    components:
-    - type: Transform
-      pos: -35.5,-7.5
-      parent: 60
-  - uid: 8479
-    components:
-    - type: Transform
-      pos: -35.5,-10.5
-      parent: 60
-  - uid: 8520
-    components:
-    - type: Transform
-      pos: -28.5,-9.5
-      parent: 60
-  - uid: 8577
-    components:
-    - type: Transform
-      pos: -18.5,0.5
-      parent: 60
   - uid: 8780
     components:
     - type: Transform
@@ -125898,11 +124669,6 @@ entities:
     - type: Transform
       pos: 23.5,-3.5
       parent: 60
-  - uid: 8947
-    components:
-    - type: Transform
-      pos: -23.5,-9.5
-      parent: 60
   - uid: 8953
     components:
     - type: Transform
@@ -125913,16 +124679,6 @@ entities:
     - type: Transform
       pos: -66.5,-19.5
       parent: 60
-  - uid: 9034
-    components:
-    - type: Transform
-      pos: -32.5,-10.5
-      parent: 60
-  - uid: 9041
-    components:
-    - type: Transform
-      pos: -5.5,-19.5
-      parent: 60
   - uid: 9231
     components:
     - type: Transform
@@ -126003,6 +124759,12 @@ entities:
     - type: Transform
       pos: -35.5,14.5
       parent: 60
+  - uid: 9488
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-17.5
+      parent: 60
   - uid: 9514
     components:
     - type: Transform
@@ -126028,11 +124790,6 @@ entities:
     - type: Transform
       pos: -53.5,-9.5
       parent: 60
-  - uid: 10578
-    components:
-    - type: Transform
-      pos: -4.5,-17.5
-      parent: 60
   - uid: 10582
     components:
     - type: Transform
@@ -126043,46 +124800,6 @@ entities:
     - type: Transform
       pos: 22.5,3.5
       parent: 60
-  - uid: 10685
-    components:
-    - type: Transform
-      pos: -17.5,-9.5
-      parent: 60
-  - uid: 10686
-    components:
-    - type: Transform
-      pos: -19.5,-17.5
-      parent: 60
-  - uid: 10828
-    components:
-    - type: Transform
-      pos: -17.5,-18.5
-      parent: 60
-  - uid: 11097
-    components:
-    - type: Transform
-      pos: -34.5,-21.5
-      parent: 60
-  - uid: 11098
-    components:
-    - type: Transform
-      pos: -35.5,-20.5
-      parent: 60
-  - uid: 11128
-    components:
-    - type: Transform
-      pos: -35.5,-6.5
-      parent: 60
-  - uid: 11129
-    components:
-    - type: Transform
-      pos: -32.5,-6.5
-      parent: 60
-  - uid: 11338
-    components:
-    - type: Transform
-      pos: -35.5,-9.5
-      parent: 60
   - uid: 11438
     components:
     - type: Transform
@@ -126723,6 +125440,12 @@ entities:
     - type: Transform
       pos: -9.5,6.5
       parent: 60
+  - uid: 13789
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-19.5
+      parent: 60
   - uid: 13813
     components:
     - type: Transform
@@ -126828,6 +125551,11 @@ entities:
     - type: Transform
       pos: -37.5,27.5
       parent: 60
+  - uid: 14697
+    components:
+    - type: Transform
+      pos: -22.5,-4.5
+      parent: 60
   - uid: 14732
     components:
     - type: Transform
@@ -127103,11 +125831,23 @@ entities:
     - type: Transform
       pos: 52.5,35.5
       parent: 60
+  - uid: 15443
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -28.5,-21.5
+      parent: 60
   - uid: 15491
     components:
     - type: Transform
       pos: -15.5,31.5
       parent: 60
+  - uid: 15553
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -27.5,-21.5
+      parent: 60
   - uid: 15577
     components:
     - type: Transform
@@ -127618,16 +126358,6 @@ entities:
     - type: Transform
       pos: 39.5,-15.5
       parent: 60
-  - uid: 18822
-    components:
-    - type: Transform
-      pos: -17.5,-16.5
-      parent: 60
-  - uid: 18857
-    components:
-    - type: Transform
-      pos: -29.5,-9.5
-      parent: 60
   - uid: 18901
     components:
     - type: Transform
@@ -128281,6 +127011,13 @@ entities:
     - type: Transform
       pos: 41.440662,-10.344523
       parent: 60
+- proto: RubberStampDenied
+  entities:
+  - uid: 8223
+    components:
+    - type: Transform
+      pos: -28.298395,0.72891724
+      parent: 60
 - proto: RubberStampMime
   entities:
   - uid: 7243
@@ -128339,21 +127076,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 13.5,-14.5
       parent: 60
-  - uid: 8291
-    components:
-    - type: Transform
-      pos: -35.5,-8.5
-      parent: 60
-  - uid: 9043
-    components:
-    - type: Transform
-      pos: -17.5,-8.5
-      parent: 60
-  - uid: 9048
-    components:
-    - type: Transform
-      pos: -27.5,-21.5
-      parent: 60
   - uid: 15599
     components:
     - type: Transform
@@ -128439,11 +127161,6 @@ entities:
     - type: Transform
       pos: 2.5,-4.5
       parent: 60
-  - uid: 24433
-    components:
-    - type: Transform
-      pos: -11.5,-21.5
-      parent: 60
   - uid: 24436
     components:
     - type: Transform
@@ -128534,10 +127251,10 @@ entities:
       parent: 60
 - proto: SecurityTechFab
   entities:
-  - uid: 2581
+  - uid: 8418
     components:
     - type: Transform
-      pos: -26.5,-0.5
+      pos: -27.5,-9.5
       parent: 60
     - type: TechnologyDatabase
       supportedDisciplines:
@@ -128547,6 +127264,11 @@ entities:
       - CivilianServices
 - proto: SeedExtractor
   entities:
+  - uid: 149
+    components:
+    - type: Transform
+      pos: -14.5,-11.5
+      parent: 60
   - uid: 5380
     components:
     - type: Transform
@@ -128562,11 +127284,6 @@ entities:
     - type: Transform
       pos: 32.5,-29.5
       parent: 60
-  - uid: 13698
-    components:
-    - type: Transform
-      pos: -9.5,-11.5
-      parent: 60
 - proto: ShardGlass
   entities:
   - uid: 3457
@@ -128763,6 +127480,11 @@ entities:
       parent: 60
 - proto: SheetSteel
   entities:
+  - uid: 1168
+    components:
+    - type: Transform
+      pos: -26.554775,-9.3233185
+      parent: 60
   - uid: 2314
     components:
     - type: Transform
@@ -128849,11 +127571,6 @@ entities:
     - type: Transform
       pos: -120.32988,15.381494
       parent: 60
-  - uid: 23914
-    components:
-    - type: Transform
-      pos: -27.436367,-6.432194
-      parent: 60
   - uid: 24665
     components:
     - type: Transform
@@ -129105,11 +127822,6 @@ entities:
     - type: Transform
       pos: -12.5,-52.5
       parent: 60
-  - uid: 8678
-    components:
-    - type: Transform
-      pos: -13.5,-19.5
-      parent: 60
   - uid: 9167
     components:
     - type: Transform
@@ -129467,6 +128179,16 @@ entities:
       parent: 60
 - proto: SignalButton
   entities:
+  - uid: 2399
+    components:
+    - type: Transform
+      pos: -7.5,-18.5
+      parent: 60
+    - type: DeviceLinkSource
+      linkedPorts:
+        9158:
+        - - Pressed
+          - DoorBolt
   - uid: 2770
     components:
     - type: Transform
@@ -129535,6 +128257,37 @@ entities:
         7728:
         - - Pressed
           - Toggle
+  - uid: 13644
+    components:
+    - type: MetaData
+      name: open inner entrance
+    - type: Transform
+      pos: -29.684803,-14.48136
+      parent: 60
+    - type: DeviceLinkSource
+      linkedPorts:
+        67:
+        - - Pressed
+          - Open
+        51:
+        - - Pressed
+          - Open
+    - type: Label
+  - uid: 14364
+    components:
+    - type: MetaData
+      name: open outer entrance
+    - type: Transform
+      pos: -29.345129,-14.48136
+      parent: 60
+    - type: DeviceLinkSource
+      linkedPorts:
+        72:
+        - - Pressed
+          - Open
+        25:
+        - - Pressed
+          - Open
   - uid: 14913
     components:
     - type: Transform
@@ -130072,191 +128825,22 @@ entities:
         24785:
         - - Pressed
           - Toggle
+- proto: SignalSwitch
+  entities:
+  - uid: 14073
+    components:
+    - type: Transform
+      pos: -28.5,-10.5
+      parent: 60
+    - type: DeviceLinkSource
+      linkedPorts:
+        3638:
+        - - On
+          - On
+        - - Off
+          - Off
 - proto: SignalSwitchDirectional
   entities:
-  - uid: 1580
-    components:
-    - type: MetaData
-      name: Cell 2 Blast Door Switch
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.502918,-9.625589
-      parent: 60
-    - type: SignalSwitch
-      state: True
-    - type: DeviceLinkSource
-      linkedPorts:
-        1638:
-        - - On
-          - Open
-        - - Off
-          - Close
-        1639:
-        - - Off
-          - Close
-        - - On
-          - Open
-        1640:
-        - - On
-          - Open
-        - - Off
-          - Close
-  - uid: 1583
-    components:
-    - type: MetaData
-      name: Cell 4 Blast Door Switch
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -25.502918,-9.625589
-      parent: 60
-    - type: SignalSwitch
-      state: True
-    - type: DeviceLinkSource
-      linkedPorts:
-        1293:
-        - - On
-          - Open
-        - - Off
-          - Close
-        1238:
-        - - Off
-          - Close
-        - - On
-          - Open
-        1257:
-        - - On
-          - Open
-        - - Off
-          - Close
-  - uid: 1624
-    components:
-    - type: MetaData
-      name: Cell 3 Blast Door Switch
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -25.502918,-9.222812
-      parent: 60
-    - type: SignalSwitch
-      state: True
-    - type: DeviceLinkSource
-      linkedPorts:
-        1354:
-        - - On
-          - Open
-        - - Off
-          - Close
-        1384:
-        - - On
-          - Open
-        - - Off
-          - Close
-        1652:
-        - - On
-          - Open
-        - - Off
-          - Close
-  - uid: 1699
-    components:
-    - type: MetaData
-      name: Cell 1 Blast Door Switch
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.502918,-9.222812
-      parent: 60
-    - type: SignalSwitch
-      state: True
-    - type: DeviceLinkSource
-      linkedPorts:
-        1653:
-        - - On
-          - Open
-        - - Off
-          - Close
-        1655:
-        - - On
-          - Open
-        - - Off
-          - Close
-        1656:
-        - - On
-          - Open
-        - - Off
-          - Close
-  - uid: 2103
-    components:
-    - type: MetaData
-      name: Interior Door Open/Close
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -31.496037,-18.715696
-      parent: 60
-    - type: DeviceLinkSource
-      linkedPorts:
-        1919:
-        - - On
-          - Open
-        - - Off
-          - Close
-  - uid: 4506
-    components:
-    - type: MetaData
-      name: Inner Windoor Switch
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -32.5,-6.5
-      parent: 60
-    - type: DeviceLinkSource
-      linkedPorts:
-        5825:
-        - - On
-          - Open
-        - - Off
-          - Close
-  - uid: 5758
-    components:
-    - type: MetaData
-      name: Inner Windoor Switch
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-10.5
-      parent: 60
-    - type: DeviceLinkSource
-      linkedPorts:
-        1530:
-        - - On
-          - Open
-        - - Off
-          - Close
-  - uid: 5835
-    components:
-    - type: MetaData
-      name: Inner Windoor Switch
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-6.5
-      parent: 60
-    - type: DeviceLinkSource
-      linkedPorts:
-        4201:
-        - - On
-          - Open
-        - - Off
-          - Close
-  - uid: 6307
-    components:
-    - type: MetaData
-      name: Inner Windoor Switch
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -32.5,-10.5
-      parent: 60
-    - type: DeviceLinkSource
-      linkedPorts:
-        1485:
-        - - On
-          - Open
-        - - Off
-          - Close
   - uid: 7563
     components:
     - type: Transform
@@ -130283,48 +128867,6 @@ entities:
           - On
         - - Off
           - Off
-  - uid: 8221
-    components:
-    - type: MetaData
-      name: Window Blast Doors
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,-2.5
-      parent: 60
-    - type: SignalSwitch
-      state: True
-    - type: DeviceLinkSource
-      linkedPorts:
-        1681:
-        - - On
-          - Open
-        - - Off
-          - Close
-        10622:
-        - - On
-          - Open
-        - - Off
-          - Close
-        5432:
-        - - On
-          - Open
-        - - Off
-          - Close
-  - uid: 8349
-    components:
-    - type: MetaData
-      name: Exterior Door Open/Close
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -31.502981,-20.229586
-      parent: 60
-    - type: DeviceLinkSource
-      linkedPorts:
-        8297:
-        - - On
-          - Open
-        - - Off
-          - Close
   - uid: 8433
     components:
     - type: MetaData
@@ -130410,61 +128952,6 @@ entities:
           - Open
         - - Off
           - Close
-  - uid: 8670
-    components:
-    - type: MetaData
-      name: Exterior Door Open/Close
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.498095,-20.215696
-      parent: 60
-    - type: DeviceLinkSource
-      linkedPorts:
-        242:
-        - - On
-          - Open
-        - - Off
-          - Close
-        8454:
-        - - On
-          - Open
-        - - Off
-          - Close
-  - uid: 8677
-    components:
-    - type: MetaData
-      name: Bathroom Privacy Shutter
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-18.5
-      parent: 60
-    - type: DeviceLinkSource
-      linkedPorts:
-        8678:
-        - - On
-          - Open
-        - - Off
-          - Close
-  - uid: 8908
-    components:
-    - type: MetaData
-      name: Interior Door Open/Close
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.498095,-18.722641
-      parent: 60
-    - type: DeviceLinkSource
-      linkedPorts:
-        243:
-        - - On
-          - Open
-        - - Off
-          - Close
-        245:
-        - - On
-          - Open
-        - - Off
-          - Close
   - uid: 9309
     components:
     - type: Transform
@@ -130651,28 +129138,6 @@ entities:
           - Open
         - - Off
           - Close
-  - uid: 16433
-    components:
-    - type: MetaData
-      name: Window Blast Doors
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -17.5,-15.5
-      parent: 60
-    - type: SignalSwitch
-      state: True
-    - type: DeviceLinkSource
-      linkedPorts:
-        16425:
-        - - On
-          - Open
-        - - Off
-          - Close
-        14167:
-        - - On
-          - Open
-        - - Off
-          - Close
   - uid: 17957
     components:
     - type: MetaData
@@ -130792,6 +129257,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,-7.5
       parent: 60
+    - type: DeviceLinkSource
+      linkedPorts:
+        24350:
+        - - On
+          - On
+        - - Off
+          - Off
   - uid: 19837
     components:
     - type: MetaData
@@ -130947,10 +129419,17 @@ entities:
       parent: 60
 - proto: SignArmory
   entities:
-  - uid: 7684
+  - uid: 8227
     components:
     - type: Transform
-      pos: -28.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: -31.5,-5.5
+      parent: 60
+  - uid: 8240
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -31.5,-10.5
       parent: 60
 - proto: SignAtmos
   entities:
@@ -131121,6 +129600,14 @@ entities:
     - type: Transform
       pos: -54.5,18.5
       parent: 60
+- proto: SignDetective
+  entities:
+  - uid: 8681
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,-25.5
+      parent: 60
 - proto: SignDirectionalAtmos
   entities:
   - uid: 2633
@@ -131174,11 +129661,11 @@ entities:
     - type: Transform
       pos: 14.499228,-0.7112777
       parent: 60
-  - uid: 13768
+  - uid: 14591
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -21.502625,-21.297903
+      pos: -21.504086,-21.285238
       parent: 60
   - uid: 18964
     components:
@@ -131186,20 +129673,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-21.5
       parent: 60
-- proto: SignDirectionalBrig
-  entities:
-  - uid: 13668
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,-21.5
-      parent: 60
-  - uid: 13669
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,-21.5
-      parent: 60
 - proto: SignDirectionalChapel
   entities:
   - uid: 228
@@ -131214,12 +129687,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.500059,-21.285631
       parent: 60
-  - uid: 13769
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.495151,-20.889297
-      parent: 60
   - uid: 13772
     components:
     - type: Transform
@@ -131279,12 +129746,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -17.5,22.5
       parent: 60
-  - uid: 17998
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.495151,-20.670547
-      parent: 60
   - uid: 21188
     components:
     - type: Transform
@@ -131329,12 +129790,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 14.5,6.5
       parent: 60
-  - uid: 11437
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.495151,-21.092422
-      parent: 60
   - uid: 13770
     components:
     - type: Transform
@@ -131396,6 +129851,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 18.5,26.5
       parent: 60
+  - uid: 14618
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -21.49791,-21.717638
+      parent: 60
 - proto: SignDirectionalFood
   entities:
   - uid: 19443
@@ -131406,12 +129867,6 @@ entities:
       parent: 60
 - proto: SignDirectionalGravity
   entities:
-  - uid: 711
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.495151,-21.295547
-      parent: 60
   - uid: 17999
     components:
     - type: Transform
@@ -131425,6 +129880,12 @@ entities:
       parent: 60
 - proto: SignDirectionalHop
   entities:
+  - uid: 14589
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -21.5,-21.5
+      parent: 60
   - uid: 19444
     components:
     - type: Transform
@@ -131454,7 +129915,7 @@ entities:
       parent: 60
 - proto: SignDirectionalJanitor
   entities:
-  - uid: 19445
+  - uid: 6762
     components:
     - type: Transform
       pos: -3.5,-21.5
@@ -131473,20 +129934,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -3.496961,-21.281797
       parent: 60
-  - uid: 20998
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.493379,-20.45811
-      parent: 60
 - proto: SignDirectionalMed
   entities:
-  - uid: 544
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.495151,-21.717422
-      parent: 60
   - uid: 2651
     components:
     - type: Transform
@@ -131537,30 +129986,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5056667,-21.711515
       parent: 60
-  - uid: 932
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-21.5
-      parent: 60
-  - uid: 5155
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -35.5,-21.5
-      parent: 60
   - uid: 5600
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,8.5
       parent: 60
-  - uid: 13776
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.497252,-21.723017
-      parent: 60
   - uid: 13777
     components:
     - type: Transform
@@ -131587,16 +130018,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 30.494003,-21.737762
       parent: 60
-  - uid: 8249
-    components:
-    - type: Transform
-      pos: -13.5,6.5
-      parent: 60
   - uid: 8250
     components:
     - type: Transform
       pos: -35.5,6.5
       parent: 60
+  - uid: 9015
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,6.5
+      parent: 60
   - uid: 11422
     components:
     - type: Transform
@@ -131734,6 +130166,12 @@ entities:
       parent: 60
 - proto: SignDisposalSpace
   entities:
+  - uid: 2104
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-4.5
+      parent: 60
   - uid: 6143
     components:
     - type: Transform
@@ -131786,11 +130224,6 @@ entities:
     - type: Transform
       pos: -58.5,10.5
       parent: 60
-  - uid: 13975
-    components:
-    - type: Transform
-      pos: -31.5,1.5
-      parent: 60
   - uid: 16067
     components:
     - type: Transform
@@ -131958,6 +130391,11 @@ entities:
     - type: Transform
       pos: 2.5,-38.5
       parent: 60
+  - uid: 14368
+    components:
+    - type: Transform
+      pos: -25.5,-1.5
+      parent: 60
 - proto: SignExamroom
   entities:
   - uid: 4284
@@ -131994,11 +130432,26 @@ entities:
     - type: Transform
       pos: -60.5,5.5
       parent: 60
-- proto: SignGravity
+- proto: SignGenpop
   entities:
-  - uid: 18000
+  - uid: 2131
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-13.5
+      parent: 60
+- proto: SignGravity
+  entities:
+  - uid: 1219
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,6.5
+      parent: 60
+  - uid: 11369
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -13.5,4.5
       parent: 60
 - proto: SignHead
@@ -132017,10 +130470,11 @@ entities:
       parent: 60
 - proto: SignInterrogation
   entities:
-  - uid: 8957
+  - uid: 112
     components:
     - type: Transform
-      pos: -32.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: -33.5,-15.5
       parent: 60
 - proto: SignJanitor
   entities:
@@ -132141,18 +130595,6 @@ entities:
     - type: Transform
       pos: -43.5,10.5
       parent: 60
-- proto: SignPrison
-  entities:
-  - uid: 13670
-    components:
-    - type: Transform
-      pos: -9.5,-21.5
-      parent: 60
-  - uid: 13789
-    components:
-    - type: Transform
-      pos: -6.5,-14.5
-      parent: 60
 - proto: SignRadiationMed
   entities:
   - uid: 15579
@@ -132264,24 +130706,12 @@ entities:
       parent: 60
 - proto: SignRedFour
   entities:
-  - uid: 1642
-    components:
-    - type: Transform
-      pos: -20.5,-10.5
-      parent: 60
   - uid: 13856
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -44.5,21.5
       parent: 60
-- proto: SignRedOne
-  entities:
-  - uid: 1817
-    components:
-    - type: Transform
-      pos: -32.5,-6.5
-      parent: 60
 - proto: SignRedSix
   entities:
   - uid: 7111
@@ -132291,11 +130721,6 @@ entities:
       parent: 60
 - proto: SignRedThree
   entities:
-  - uid: 1773
-    components:
-    - type: Transform
-      pos: -20.5,-6.5
-      parent: 60
   - uid: 7514
     components:
     - type: Transform
@@ -132303,11 +130728,6 @@ entities:
       parent: 60
 - proto: SignRedTwo
   entities:
-  - uid: 1634
-    components:
-    - type: Transform
-      pos: -32.5,-10.5
-      parent: 60
   - uid: 8156
     components:
     - type: Transform
@@ -132419,11 +130839,6 @@ entities:
       parent: 60
 - proto: SignSecureMedRed
   entities:
-  - uid: 3505
-    components:
-    - type: Transform
-      pos: -26.5,2.5
-      parent: 60
   - uid: 8174
     components:
     - type: Transform
@@ -132455,15 +130870,16 @@ entities:
       parent: 7536
 - proto: SignSecurity
   entities:
-  - uid: 835
+  - uid: 707
     components:
     - type: Transform
-      pos: -35.5,-17.5
+      rot: -1.5707963267948966 rad
+      pos: -35.5,1.5
       parent: 60
-  - uid: 8527
+  - uid: 1758
     components:
     - type: Transform
-      pos: -17.5,-21.5
+      pos: -25.5,-21.5
       parent: 60
 - proto: SignServer
   entities:
@@ -132514,6 +130930,14 @@ entities:
     - type: Transform
       pos: -121.5,16.5
       parent: 60
+- proto: SignSomethingOld
+  entities:
+  - uid: 9176
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -17.5,-2.5
+      parent: 60
 - proto: SignSpace
   entities:
   - uid: 1451
@@ -132551,11 +130975,6 @@ entities:
     - type: Transform
       pos: -46.5,-35.5
       parent: 60
-  - uid: 13741
-    components:
-    - type: Transform
-      pos: -13.5,-10.5
-      parent: 60
   - uid: 16247
     components:
     - type: Transform
@@ -132712,12 +131131,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 20.5,12.5
       parent: 60
-  - uid: 16994
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-19.5
-      parent: 60
   - uid: 24307
     components:
     - type: Transform
@@ -132732,6 +131145,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 32.5,-36.5
       parent: 60
+- proto: SinkStemlessWater
+  entities:
+  - uid: 10034
+    components:
+    - type: Transform
+      pos: -6.5,-19.5
+      parent: 60
 - proto: SinkWide
   entities:
   - uid: 1789
@@ -132746,12 +131166,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 35.5,-33.5
       parent: 60
-  - uid: 12356
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-12.5
-      parent: 60
   - uid: 12931
     components:
     - type: Transform
@@ -132938,6 +131352,13 @@ entities:
     - type: Transform
       pos: -24.372612,-29.105206
       parent: 60
+- proto: Soap
+  entities:
+  - uid: 2121
+    components:
+    - type: Transform
+      pos: -7.455665,-20.516632
+      parent: 60
 - proto: SoapNT
   entities:
   - uid: 18057
@@ -135056,12 +133477,6 @@ entities:
       parent: 60
 - proto: SolidSecretDoor
   entities:
-  - uid: 3180
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-19.5
-      parent: 60
   - uid: 5307
     components:
     - type: Transform
@@ -135096,6 +133511,12 @@ entities:
       parent: 60
     - type: SpamEmitSound
       enabled: False
+  - uid: 9043
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-15.5
+      parent: 60
 - proto: SpawnMechRipley
   entities:
   - uid: 25379
@@ -135117,6 +133538,18 @@ entities:
     - type: Transform
       pos: -43.5,3.5
       parent: 60
+- proto: SpawnMobButterfly
+  entities:
+  - uid: 4153
+    components:
+    - type: Transform
+      pos: -20.5,-19.5
+      parent: 60
+  - uid: 8244
+    components:
+    - type: Transform
+      pos: -20.5,-18.5
+      parent: 60
 - proto: SpawnMobCat
   entities:
   - uid: 2142
@@ -135161,10 +133594,10 @@ entities:
       parent: 60
 - proto: SpawnMobMcGriff
   entities:
-  - uid: 2806
+  - uid: 1292
     components:
     - type: Transform
-      pos: -25.5,-11.5
+      pos: -27.5,-20.5
       parent: 60
 - proto: SpawnMobMonkeyPunpun
   entities:
@@ -135221,10 +133654,10 @@ entities:
       parent: 60
 - proto: SpawnMobShiva
   entities:
-  - uid: 1989
+  - uid: 13669
     components:
     - type: Transform
-      pos: -20.5,0.5
+      pos: -30.5,-0.5
       parent: 60
 - proto: SpawnMobSlothPaperwork
   entities:
@@ -135392,10 +133825,10 @@ entities:
       parent: 60
 - proto: SpawnPointHeadOfSecurity
   entities:
-  - uid: 2095
+  - uid: 1834
     components:
     - type: Transform
-      pos: -21.5,0.5
+      pos: -29.5,1.5
       parent: 60
 - proto: SpawnPointJanitor
   entities:
@@ -135535,7 +133968,7 @@ entities:
       parent: 60
 - proto: SpawnPointObserver
   entities:
-  - uid: 2018
+  - uid: 6173
     components:
     - type: Transform
       pos: 0.5,-23.5
@@ -135653,57 +134086,57 @@ entities:
       parent: 60
 - proto: SpawnPointSecurityCadet
   entities:
-  - uid: 1981
+  - uid: 1384
     components:
     - type: Transform
-      pos: -30.5,-19.5
+      pos: -20.5,-2.5
       parent: 60
-  - uid: 1990
+  - uid: 4108
     components:
     - type: Transform
-      pos: -25.5,-20.5
+      pos: -34.5,-0.5
       parent: 60
-  - uid: 2007
+  - uid: 4191
     components:
     - type: Transform
-      pos: -27.5,-20.5
+      pos: -32.5,-0.5
       parent: 60
-  - uid: 2008
+  - uid: 11753
     components:
     - type: Transform
-      pos: -22.5,-19.5
+      pos: -19.5,-2.5
       parent: 60
 - proto: SpawnPointSecurityOfficer
   entities:
-  - uid: 1987
+  - uid: 130
     components:
     - type: Transform
-      pos: -27.5,-18.5
+      pos: -19.5,-0.5
       parent: 60
-  - uid: 2011
+  - uid: 1794
     components:
     - type: Transform
-      pos: -27.5,-17.5
+      pos: -20.5,0.5
       parent: 60
-  - uid: 2012
+  - uid: 8683
     components:
     - type: Transform
-      pos: -25.5,-18.5
+      pos: -19.5,-1.5
       parent: 60
-  - uid: 2015
+  - uid: 13729
     components:
     - type: Transform
-      pos: -27.5,-16.5
+      pos: -20.5,-1.5
       parent: 60
-  - uid: 3773
+  - uid: 13758
     components:
     - type: Transform
-      pos: -25.5,-16.5
+      pos: -20.5,-0.5
       parent: 60
-  - uid: 8449
+  - uid: 13763
     components:
     - type: Transform
-      pos: -25.5,-17.5
+      pos: -19.5,0.5
       parent: 60
 - proto: SpawnPointServiceWorker
   entities:
@@ -135763,10 +134196,10 @@ entities:
       parent: 60
 - proto: SpawnPointWarden
   entities:
-  - uid: 1980
+  - uid: 7909
     components:
     - type: Transform
-      pos: -26.5,-11.5
+      pos: -28.5,-18.5
       parent: 60
 - proto: SpawnVendingMachineRestockFoodDrink
   entities:
@@ -135930,20 +134363,38 @@ entities:
       parent: 60
 - proto: StationMap
   entities:
+  - uid: 1162
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-18.5
+      parent: 60
+  - uid: 1910
+    components:
+    - type: Transform
+      pos: -29.5,-21.5
+      parent: 60
+  - uid: 2097
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-7.5
+      parent: 60
   - uid: 7693
     components:
     - type: Transform
       pos: 12.5,-21.5
       parent: 60
-  - uid: 10829
+  - uid: 8948
     components:
     - type: Transform
-      pos: -29.5,-21.5
+      pos: -11.5,-21.5
       parent: 60
-  - uid: 18699
+  - uid: 11365
     components:
     - type: Transform
-      pos: -22.5,10.5
+      rot: 3.141592653589793 rad
+      pos: -22.5,6.5
       parent: 60
   - uid: 18700
     components:
@@ -135992,6 +134443,42 @@ entities:
     - type: Transform
       pos: 10.5,5.5
       parent: 60
+  - uid: 1557
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-0.5
+      parent: 60
+  - uid: 1634
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -19.5,-13.5
+      parent: 60
+  - uid: 2418
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -19.5,-14.5
+      parent: 60
+  - uid: 13881
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-1.5
+      parent: 60
+  - uid: 14354
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,-0.5
+      parent: 60
+  - uid: 14355
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,-1.5
+      parent: 60
   - uid: 24012
     components:
     - type: Transform
@@ -136035,51 +134522,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 26.5,-16.5
       parent: 60
-  - uid: 341
-    components:
-    - type: Transform
-      pos: -27.5,-5.5
-      parent: 60
-  - uid: 352
-    components:
-    - type: Transform
-      pos: -25.5,-5.5
-      parent: 60
-  - uid: 363
+  - uid: 538
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -25.5,-18.5
-      parent: 60
-  - uid: 492
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -27.5,-16.5
-      parent: 60
-  - uid: 707
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -27.5,-18.5
-      parent: 60
-  - uid: 1633
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -25.5,-16.5
-      parent: 60
-  - uid: 1868
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -27.5,-17.5
-      parent: 60
-  - uid: 1869
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -25.5,-17.5
+      pos: -10.5,-15.5
       parent: 60
   - uid: 3165
     components:
@@ -136109,29 +134556,12 @@ entities:
     - type: Transform
       pos: -44.5,-6.5
       parent: 60
-  - uid: 9015
-    components:
-    - type: Transform
-      pos: -34.5,-14.5
-      parent: 60
-  - uid: 11384
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,-16.5
-      parent: 60
   - uid: 14541
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -28.5,18.5
       parent: 60
-  - uid: 15553
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.200602,-14.474741
-      parent: 60
   - uid: 19731
     components:
     - type: Transform
@@ -136367,12 +134797,22 @@ entities:
     - type: Transform
       pos: -59.5,36.5
       parent: 60
-- proto: Stunbaton
+- proto: StrangePill
   entities:
-  - uid: 5429
+  - uid: 14358
     components:
     - type: Transform
-      pos: -28.512793,-20.483536
+      pos: -19.757706,3.218784
+      parent: 60
+  - uid: 14359
+    components:
+    - type: Transform
+      pos: -21.719927,4.9571967
+      parent: 60
+  - uid: 16060
+    components:
+    - type: Transform
+      pos: -19.272694,4.6689363
       parent: 60
 - proto: SubstationBasic
   entities:
@@ -136631,10 +135071,25 @@ entities:
       parent: 60
 - proto: SuitStorageEVAPrisoner
   entities:
-  - uid: 10603
+  - uid: 143
     components:
     - type: Transform
-      pos: -5.5,-17.5
+      pos: -22.5,-10.5
+      parent: 60
+  - uid: 1134
+    components:
+    - type: Transform
+      pos: -24.5,-10.5
+      parent: 60
+  - uid: 1625
+    components:
+    - type: Transform
+      pos: -24.5,-9.5
+      parent: 60
+  - uid: 1822
+    components:
+    - type: Transform
+      pos: -22.5,-9.5
       parent: 60
 - proto: SuitStorageEVASyndicate
   entities:
@@ -136643,104 +135098,46 @@ entities:
     - type: Transform
       pos: -12.5,-3.5
       parent: 7536
+- proto: SuitStorageHOS
+  entities:
+  - uid: 1845
+    components:
+    - type: Transform
+      pos: -27.5,1.5
+      parent: 60
 - proto: SuitStorageSec
   entities:
-  - uid: 1864
+  - uid: 1773
     components:
     - type: Transform
-      pos: -24.5,-0.5
+      pos: -23.5,-0.5
       parent: 60
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1462
-        moles:
-        - 1.606311
-        - 6.042789
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 1904
-  - uid: 1906
+  - uid: 1781
     components:
     - type: Transform
-      pos: -24.5,-1.5
+      pos: -23.5,0.5
       parent: 60
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14673
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 6707
-  - uid: 5313
+  - uid: 1785
     components:
     - type: Transform
-      pos: -24.5,0.5
+      pos: -23.5,1.5
+      parent: 60
+  - uid: 1796
+    components:
+    - type: Transform
+      pos: -23.5,2.5
+      parent: 60
+  - uid: 1798
+    components:
+    - type: Transform
+      pos: -23.5,3.5
       parent: 60
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1465
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 5430
 - proto: SuitStorageWarden
   entities:
-  - uid: 5909
+  - uid: 2940
     components:
     - type: Transform
-      pos: -24.5,-12.5
+      pos: -26.5,-19.5
       parent: 60
 - proto: SurveillanceCameraCommand
   entities:
@@ -136831,17 +135228,6 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: HoP Office
-  - uid: 21083
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-15.5
-      parent: 60
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraCommand
-      nameSet: True
-      id: Bridge Bridge
   - uid: 23361
     components:
     - type: Transform
@@ -136993,17 +135379,6 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: AI Sat Tunnel
-  - uid: 24275
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-6.5
-      parent: 60
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraCommand
-      nameSet: True
-      id: Captain's Room Exterior
   - uid: 24276
     components:
     - type: Transform
@@ -137026,17 +135401,6 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: AI Core Station Entrance
-  - uid: 24286
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-10.5
-      parent: 60
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraCommand
-      nameSet: True
-      id: Captain's Bathroom
   - uid: 24717
     components:
     - type: Transform
@@ -137113,6 +135477,17 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Arrival Engineering Closet
+  - uid: 1651
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,5.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: grav
   - uid: 2439
     components:
     - type: Transform
@@ -137134,16 +135509,6 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Telecomms Entrance
-  - uid: 12138
-    components:
-    - type: Transform
-      pos: -8.5,2.5
-      parent: 60
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraEngineering
-      nameSet: True
-      id: Grav Gen
   - uid: 12295
     components:
     - type: Transform
@@ -137488,6 +135853,28 @@ entities:
       id: CE Bedroom
 - proto: SurveillanceCameraGeneral
   entities:
+  - uid: 1962
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,9.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Library south hall
+  - uid: 1967
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -38.5,7.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Science front north hall
   - uid: 7157
     components:
     - type: Transform
@@ -137498,7 +135885,7 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Smoking Area
-  - uid: 8424
+  - uid: 14229
     components:
     - type: Transform
       pos: -27.5,7.5
@@ -137507,29 +135894,61 @@ entities:
       setupAvailableNetworks:
       - SurveillanceCameraGeneral
       nameSet: True
-      id: North Security Hall
-  - uid: 8676
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,-22.5
-      parent: 60
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: South Security Hall
-  - uid: 13967
+      id: Security north hall
+  - uid: 14371
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -14.5,4.5
+      pos: -36.5,-4.5
       parent: 60
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraGeneral
       nameSet: True
-      id: Ext Grav Gen
+      id: Security west hall
+  - uid: 14372
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-12.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Bridge front hall
+  - uid: 14373
+    components:
+    - type: Transform
+      pos: -11.5,-24.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Genpop hall
+  - uid: 14376
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-22.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Security south hall
+  - uid: 14377
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -36.5,-17.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Security southwest hall
   - uid: 17468
     components:
     - type: Transform
@@ -138251,10 +136670,10 @@ entities:
       parent: 60
 - proto: SurveillanceCameraRouterSecurity
   entities:
-  - uid: 5848
+  - uid: 1846
     components:
     - type: Transform
-      pos: -22.5,1.5
+      pos: -27.5,-0.5
       parent: 60
 - proto: SurveillanceCameraRouterService
   entities:
@@ -138425,6 +136844,12 @@ entities:
       id: RD Room
 - proto: SurveillanceCameraSecurity
   entities:
+  - uid: 1214
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -29.5,-18.5
+      parent: 60
   - uid: 4274
     components:
     - type: Transform
@@ -138436,70 +136861,6 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Lawyer Office
-  - uid: 6705
-    components:
-    - type: Transform
-      pos: -21.5,-20.5
-      parent: 60
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Security East Entrance
-  - uid: 6779
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-18.5
-      parent: 60
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Security West Entrance
-  - uid: 8428
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-5.5
-      parent: 60
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Cell 1
-  - uid: 8717
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -19.5,-9.5
-      parent: 60
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Cell 4
-  - uid: 8956
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-9.5
-      parent: 60
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Cell 2
-  - uid: 9011
-    components:
-    - type: Transform
-      pos: -20.5,-1.5
-      parent: 60
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: HoS Office
   - uid: 9507
     components:
     - type: Transform
@@ -138511,71 +136872,80 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Courthouse
-  - uid: 11339
+  - uid: 14085
     components:
     - type: Transform
-      pos: -25.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: -34.5,-4.5
       parent: 60
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraSecurity
       nameSet: True
-      id: Warden's Office
-  - uid: 11663
+      id: North reception
+  - uid: 14167
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -19.5,-5.5
-      parent: 60
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Cell 3
-  - uid: 13098
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,1.5
+      pos: -30.5,-9.5
       parent: 60
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Armory
-  - uid: 13658
+  - uid: 14224
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -11.5,-13.5
+      rot: 1.5707963267948966 rad
+      pos: -27.5,-0.5
       parent: 60
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraSecurity
       nameSet: True
-      id: Perma Brig
-  - uid: 14229
+      id: HOS office
+  - uid: 14226
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -18.5,-3.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Locker room
+  - uid: 14227
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -34.5,0.5
+      pos: -31.5,-11.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Front
+  - uid: 14363
+    components:
+    - type: Transform
+      pos: -33.5,-20.5
       parent: 60
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Interrogation
-  - uid: 21042
+  - uid: 14367
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,-22.5
+      pos: -25.5,-0.5
       parent: 60
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraSecurity
       nameSet: True
-      id: Perma Entrance
+      id: EVA storage
   - uid: 21180
     components:
     - type: Transform
@@ -138587,16 +136957,6 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Detective Office
-  - uid: 24294
-    components:
-    - type: Transform
-      pos: -7.5,-18.5
-      parent: 60
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Perma Brig Locker Room
 - proto: SurveillanceCameraService
   entities:
   - uid: 21079
@@ -138871,20 +137231,8 @@ entities:
       parent: 60
     - type: Tag
       tags: []
-- proto: SyringeInaprovaline
-  entities:
-  - uid: 14618
-    components:
-    - type: Transform
-      pos: -19.265156,-13.438609
-      parent: 60
 - proto: Table
   entities:
-  - uid: 20
-    components:
-    - type: Transform
-      pos: -31.5,-20.5
-      parent: 60
   - uid: 78
     components:
     - type: Transform
@@ -138895,25 +137243,10 @@ entities:
     - type: Transform
       pos: 9.5,-36.5
       parent: 60
-  - uid: 146
+  - uid: 239
     components:
     - type: Transform
-      pos: -12.5,-14.5
-      parent: 60
-  - uid: 233
-    components:
-    - type: Transform
-      pos: -21.5,-18.5
-      parent: 60
-  - uid: 246
-    components:
-    - type: Transform
-      pos: -34.5,-5.5
-      parent: 60
-  - uid: 269
-    components:
-    - type: Transform
-      pos: -18.5,-9.5
+      pos: -26.5,-9.5
       parent: 60
   - uid: 328
     components:
@@ -138930,11 +137263,6 @@ entities:
     - type: Transform
       pos: 0.5,17.5
       parent: 60
-  - uid: 721
-    components:
-    - type: Transform
-      pos: -27.5,-9.5
-      parent: 60
   - uid: 730
     components:
     - type: Transform
@@ -138945,16 +137273,23 @@ entities:
     - type: Transform
       pos: -5.5,-28.5
       parent: 60
-  - uid: 764
+  - uid: 769
     components:
     - type: Transform
-      pos: -25.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: -33.5,-20.5
       parent: 60
   - uid: 825
     components:
     - type: Transform
       pos: 39.5,-10.5
       parent: 60
+  - uid: 841
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -33.5,-19.5
+      parent: 60
   - uid: 857
     components:
     - type: Transform
@@ -138965,40 +137300,20 @@ entities:
     - type: Transform
       pos: -66.5,6.5
       parent: 60
-  - uid: 1549
+  - uid: 1119
     components:
     - type: Transform
       pos: -26.5,-6.5
       parent: 60
-  - uid: 1550
-    components:
-    - type: Transform
-      pos: -27.5,-6.5
-      parent: 60
-  - uid: 1572
-    components:
-    - type: Transform
-      pos: -25.5,-6.5
-      parent: 60
-  - uid: 1635
-    components:
-    - type: Transform
-      pos: -26.5,-20.5
-      parent: 60
   - uid: 1678
     components:
     - type: Transform
       pos: 9.5,-51.5
       parent: 60
-  - uid: 1914
+  - uid: 1717
     components:
     - type: Transform
-      pos: -28.5,-20.5
-      parent: 60
-  - uid: 1917
-    components:
-    - type: Transform
-      pos: -21.5,-20.5
+      pos: -34.5,-8.5
       parent: 60
   - uid: 1920
     components:
@@ -139191,11 +137506,21 @@ entities:
     - type: Transform
       pos: 27.5,-11.5
       parent: 60
+  - uid: 5848
+    components:
+    - type: Transform
+      pos: -18.5,-3.5
+      parent: 60
   - uid: 5927
     components:
     - type: Transform
       pos: 17.5,-45.5
       parent: 60
+  - uid: 6117
+    components:
+    - type: Transform
+      pos: -18.5,-2.5
+      parent: 60
   - uid: 6313
     components:
     - type: Transform
@@ -139301,6 +137626,11 @@ entities:
     - type: Transform
       pos: 54.5,-44.5
       parent: 60
+  - uid: 8259
+    components:
+    - type: Transform
+      pos: -32.5,-1.5
+      parent: 60
   - uid: 8301
     components:
     - type: Transform
@@ -139311,30 +137641,11 @@ entities:
     - type: Transform
       pos: -58.5,-17.5
       parent: 60
-  - uid: 8466
+  - uid: 8347
     components:
     - type: Transform
-      pos: -30.5,-20.5
-      parent: 60
-  - uid: 8607
-    components:
-    - type: Transform
-      pos: -33.5,-2.5
-      parent: 60
-  - uid: 8712
-    components:
-    - type: Transform
-      pos: -32.5,-0.5
-      parent: 60
-  - uid: 8713
-    components:
-    - type: Transform
-      pos: -31.5,-19.5
-      parent: 60
-  - uid: 8720
-    components:
-    - type: Transform
-      pos: -21.5,-19.5
+      rot: 3.141592653589793 rad
+      pos: -34.5,-7.5
       parent: 60
   - uid: 8756
     components:
@@ -139366,21 +137677,11 @@ entities:
     - type: Transform
       pos: -44.5,-10.5
       parent: 60
-  - uid: 9159
-    components:
-    - type: Transform
-      pos: -31.5,-18.5
-      parent: 60
   - uid: 9171
     components:
     - type: Transform
       pos: 40.5,-10.5
       parent: 60
-  - uid: 9223
-    components:
-    - type: Transform
-      pos: -34.5,-9.5
-      parent: 60
   - uid: 9440
     components:
     - type: Transform
@@ -139451,11 +137752,6 @@ entities:
     - type: Transform
       pos: 49.5,18.5
       parent: 60
-  - uid: 10680
-    components:
-    - type: Transform
-      pos: -18.5,-5.5
-      parent: 60
   - uid: 11103
     components:
     - type: Transform
@@ -139556,21 +137852,11 @@ entities:
     - type: Transform
       pos: 24.5,-0.5
       parent: 60
-  - uid: 13296
-    components:
-    - type: Transform
-      pos: -18.5,-13.5
-      parent: 60
   - uid: 13498
     components:
     - type: Transform
       pos: 48.5,9.5
       parent: 60
-  - uid: 13620
-    components:
-    - type: Transform
-      pos: -12.5,-13.5
-      parent: 60
   - uid: 13649
     components:
     - type: Transform
@@ -139586,16 +137872,6 @@ entities:
     - type: Transform
       pos: 6.5,15.5
       parent: 60
-  - uid: 13691
-    components:
-    - type: Transform
-      pos: -7.5,-11.5
-      parent: 60
-  - uid: 13767
-    components:
-    - type: Transform
-      pos: -32.5,0.5
-      parent: 60
   - uid: 13874
     components:
     - type: Transform
@@ -139701,11 +137977,6 @@ entities:
     - type: Transform
       pos: -38.5,19.5
       parent: 60
-  - uid: 17474
-    components:
-    - type: Transform
-      pos: -34.5,-15.5
-      parent: 60
   - uid: 17656
     components:
     - type: Transform
@@ -139891,11 +138162,6 @@ entities:
     - type: Transform
       pos: 30.5,-5.5
       parent: 60
-  - uid: 21018
-    components:
-    - type: Transform
-      pos: -5.5,-18.5
-      parent: 60
   - uid: 21027
     components:
     - type: Transform
@@ -139941,21 +138207,6 @@ entities:
     - type: Transform
       pos: 47.5,12.5
       parent: 60
-  - uid: 23645
-    components:
-    - type: Transform
-      pos: -19.5,-13.5
-      parent: 60
-  - uid: 23648
-    components:
-    - type: Transform
-      pos: -34.5,-2.5
-      parent: 60
-  - uid: 23656
-    components:
-    - type: Transform
-      pos: -20.5,-13.5
-      parent: 60
   - uid: 23665
     components:
     - type: Transform
@@ -140148,6 +138399,11 @@ entities:
     - type: Transform
       pos: 46.5,-16.5
       parent: 60
+  - uid: 270
+    components:
+    - type: Transform
+      pos: -19.5,-8.5
+      parent: 60
   - uid: 1489
     components:
     - type: Transform
@@ -140287,6 +138543,11 @@ entities:
     - type: Transform
       pos: -63.5,9.5
       parent: 60
+  - uid: 711
+    components:
+    - type: Transform
+      pos: -33.5,-17.5
+      parent: 60
   - uid: 828
     components:
     - type: Transform
@@ -140307,15 +138568,45 @@ entities:
     - type: Transform
       pos: 7.5,-26.5
       parent: 60
-  - uid: 1647
+  - uid: 1468
     components:
     - type: Transform
-      pos: -24.5,-14.5
+      pos: -26.5,-14.5
       parent: 60
-  - uid: 1870
+  - uid: 1645
     components:
     - type: Transform
-      pos: -25.5,-14.5
+      pos: -28.5,-14.5
+      parent: 60
+  - uid: 1653
+    components:
+    - type: Transform
+      pos: -35.5,0.5
+      parent: 60
+  - uid: 1659
+    components:
+    - type: Transform
+      pos: -35.5,-0.5
+      parent: 60
+  - uid: 1664
+    components:
+    - type: Transform
+      pos: -35.5,-1.5
+      parent: 60
+  - uid: 1666
+    components:
+    - type: Transform
+      pos: -27.5,-14.5
+      parent: 60
+  - uid: 1938
+    components:
+    - type: Transform
+      pos: -34.5,-17.5
+      parent: 60
+  - uid: 2092
+    components:
+    - type: Transform
+      pos: -25.5,-16.5
       parent: 60
   - uid: 2212
     components:
@@ -140427,11 +138718,6 @@ entities:
     - type: Transform
       pos: 15.5,-33.5
       parent: 60
-  - uid: 5983
-    components:
-    - type: Transform
-      pos: -24.5,1.5
-      parent: 60
   - uid: 6158
     components:
     - type: Transform
@@ -140457,26 +138743,6 @@ entities:
     - type: Transform
       pos: -109.5,13.5
       parent: 60
-  - uid: 6972
-    components:
-    - type: Transform
-      pos: -32.5,-7.5
-      parent: 60
-  - uid: 7014
-    components:
-    - type: Transform
-      pos: -20.5,-7.5
-      parent: 60
-  - uid: 7045
-    components:
-    - type: Transform
-      pos: -32.5,-11.5
-      parent: 60
-  - uid: 7048
-    components:
-    - type: Transform
-      pos: -23.5,-10.5
-      parent: 60
   - uid: 7084
     components:
     - type: Transform
@@ -140517,15 +138783,21 @@ entities:
     - type: Transform
       pos: -112.5,13.5
       parent: 60
-  - uid: 7649
+  - uid: 7787
     components:
     - type: Transform
-      pos: -20.5,-11.5
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-18.5
       parent: 60
-  - uid: 7650
+  - uid: 8002
     components:
     - type: Transform
-      pos: -29.5,-10.5
+      pos: -31.5,-8.5
+      parent: 60
+  - uid: 8328
+    components:
+    - type: Transform
+      pos: -25.5,-17.5
       parent: 60
   - uid: 8393
     components:
@@ -140814,6 +139086,11 @@ entities:
     - type: Transform
       pos: -43.5,4.5
       parent: 60
+  - uid: 14230
+    components:
+    - type: Transform
+      pos: -19.5,5.5
+      parent: 60
 - proto: TableWood
   entities:
   - uid: 271
@@ -140821,26 +139098,82 @@ entities:
     - type: Transform
       pos: 25.5,-15.5
       parent: 60
-  - uid: 1733
+  - uid: 335
     components:
     - type: Transform
-      pos: -20.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-8.5
       parent: 60
-  - uid: 1745
+  - uid: 1164
     components:
     - type: Transform
-      pos: -21.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-9.5
       parent: 60
-  - uid: 1847
+  - uid: 1633
     components:
     - type: Transform
-      pos: -22.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-8.5
+      parent: 60
+  - uid: 1640
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-10.5
+      parent: 60
+  - uid: 1850
+    components:
+    - type: Transform
+      pos: -28.5,0.5
+      parent: 60
+  - uid: 1864
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-13.5
+      parent: 60
+  - uid: 1883
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-13.5
+      parent: 60
+  - uid: 1902
+    components:
+    - type: Transform
+      pos: -11.5,-13.5
+      parent: 60
+  - uid: 1903
+    components:
+    - type: Transform
+      pos: -29.5,0.5
+      parent: 60
+  - uid: 2012
+    components:
+    - type: Transform
+      pos: -12.5,-18.5
+      parent: 60
+  - uid: 2015
+    components:
+    - type: Transform
+      pos: -12.5,-17.5
       parent: 60
   - uid: 2022
     components:
     - type: Transform
       pos: -25.5,-28.5
       parent: 60
+  - uid: 2098
+    components:
+    - type: Transform
+      pos: -13.5,-18.5
+      parent: 60
+  - uid: 2100
+    components:
+    - type: Transform
+      pos: -13.5,-17.5
+      parent: 60
   - uid: 2254
     components:
     - type: Transform
@@ -140887,6 +139220,12 @@ entities:
     - type: Transform
       pos: -8.5,-44.5
       parent: 60
+  - uid: 4137
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,0.5
+      parent: 60
   - uid: 4162
     components:
     - type: Transform
@@ -141260,161 +139599,41 @@ entities:
     - type: Transform
       pos: 24.5,0.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 17633
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
   - uid: 18890
     components:
     - type: Transform
       pos: 22.5,0.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 18891
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
   - uid: 18893
     components:
     - type: Transform
       pos: 25.5,-0.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 18907
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
   - uid: 18909
     components:
     - type: Transform
       pos: 24.5,2.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 19008
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
   - uid: 19009
     components:
     - type: Transform
       pos: 25.5,2.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 19039
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
   - uid: 19040
     components:
     - type: Transform
       pos: 22.5,2.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 19041
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
   - uid: 19091
     components:
     - type: Transform
       pos: 21.5,2.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 19092
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
   - uid: 19096
     components:
     - type: Transform
       pos: 21.5,-0.5
       parent: 60
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 19097
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
   - uid: 19168
     components:
     - type: Transform
@@ -141567,11 +139786,6 @@ entities:
     - type: Transform
       pos: -55.5,-12.5
       parent: 60
-  - uid: 8749
-    components:
-    - type: Transform
-      pos: -30.5,-2.5
-      parent: 60
   - uid: 9492
     components:
     - type: Transform
@@ -141631,14 +139845,14 @@ entities:
     - type: Transform
       pos: 19.5,14.5
       parent: 60
-  - uid: 13726
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -12.5,-20.5
-      parent: 60
 - proto: ToiletEmpty
   entities:
+  - uid: 1646
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-20.5
+      parent: 60
   - uid: 4323
     components:
     - type: Transform
@@ -141664,6 +139878,13 @@ entities:
     - type: Transform
       pos: -38.574116,19.53669
       parent: 60
+- proto: ToolboxArtisticFilled
+  entities:
+  - uid: 1386
+    components:
+    - type: Transform
+      pos: -7.5486703,-17.067814
+      parent: 60
 - proto: ToolboxElectricalFilled
   entities:
   - uid: 19
@@ -141868,6 +140089,13 @@ entities:
     - type: Transform
       pos: 7.651234,15.67023
       parent: 60
+- proto: Truncheon
+  entities:
+  - uid: 560
+    components:
+    - type: Transform
+      pos: -26.429714,-9.636036
+      parent: 60
 - proto: TubaInstrument
   entities:
   - uid: 17380
@@ -141875,6 +140103,27 @@ entities:
     - type: Transform
       pos: 25.5,-13.5
       parent: 60
+- proto: TurnstileGenpopEnter
+  entities:
+  - uid: 13624
+    components:
+    - type: Transform
+      pos: -17.5,-16.5
+      parent: 60
+- proto: TurnstileGenpopLeave
+  entities:
+  - uid: 8271
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-14.5
+      parent: 60
+  - uid: 13631
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,-16.5
+      parent: 60
 - proto: TwoWayLever
   entities:
   - uid: 938
@@ -142603,6 +140852,13 @@ entities:
     - type: Transform
       pos: 21.5,-40.5
       parent: 60
+- proto: VendingMachineDonut
+  entities:
+  - uid: 1257
+    components:
+    - type: Transform
+      pos: -30.5,-4.5
+      parent: 60
 - proto: VendingMachineEngiDrobe
   entities:
   - uid: 7637
@@ -142661,6 +140917,13 @@ entities:
       parent: 60
 - proto: VendingMachineMedical
   entities:
+  - uid: 550
+    components:
+    - type: Transform
+      pos: -17.5,-8.5
+      parent: 60
+    - type: AccessReader
+      access: []
   - uid: 4139
     components:
     - type: Transform
@@ -142685,13 +140948,6 @@ entities:
     - type: Transform
       pos: 32.5,-30.5
       parent: 60
-- proto: VendingMachineRestockDonut
-  entities:
-  - uid: 11369
-    components:
-    - type: Transform
-      pos: -22.478699,3.461222
-      parent: 60
 - proto: VendingMachineRoboDrobe
   entities:
   - uid: 5862
@@ -142722,17 +140978,17 @@ entities:
       parent: 60
 - proto: VendingMachineSec
   entities:
-  - uid: 634
+  - uid: 13791
     components:
     - type: Transform
-      pos: -28.5,-14.5
+      pos: -20.5,1.5
       parent: 60
 - proto: VendingMachineSecDrobe
   entities:
-  - uid: 635
+  - uid: 13148
     components:
     - type: Transform
-      pos: -27.5,-14.5
+      pos: -21.5,-4.5
       parent: 60
 - proto: VendingMachineSeeds
   entities:
@@ -142748,10 +141004,10 @@ entities:
       parent: 60
 - proto: VendingMachineSeedsUnlocked
   entities:
-  - uid: 13644
+  - uid: 1935
     components:
     - type: Transform
-      pos: -10.5,-11.5
+      pos: -15.5,-11.5
       parent: 60
 - proto: VendingMachineSnack
   entities:
@@ -142786,6 +141042,11 @@ entities:
     - type: Transform
       pos: 3.5,-34.5
       parent: 60
+  - uid: 1766
+    components:
+    - type: Transform
+      pos: -25.5,-0.5
+      parent: 60
   - uid: 2659
     components:
     - type: Transform
@@ -142853,12 +141114,6 @@ entities:
       parent: 60
 - proto: WallmountTelescreen
   entities:
-  - uid: 1910
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,-19.5
-      parent: 60
   - uid: 2611
     components:
     - type: Transform
@@ -142882,6 +141137,12 @@ entities:
       parent: 60
 - proto: WallmountTelevision
   entities:
+  - uid: 3210
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-5.5
+      parent: 60
   - uid: 8148
     components:
     - type: Transform
@@ -142902,6 +141163,11 @@ entities:
     - type: Transform
       pos: 26.5,-21.5
       parent: 60
+  - uid: 13723
+    components:
+    - type: Transform
+      pos: -19.5,-21.5
+      parent: 60
   - uid: 19679
     components:
     - type: Transform
@@ -143308,11 +141574,27 @@ entities:
       parent: 7536
 - proto: WallReinforced
   entities:
+  - uid: 6
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-7.5
+      parent: 60
   - uid: 11
     components:
     - type: Transform
       pos: 56.5,-4.5
       parent: 60
+  - uid: 13
+    components:
+    - type: Transform
+      pos: -35.5,-18.5
+      parent: 60
+  - uid: 20
+    components:
+    - type: Transform
+      pos: -35.5,-19.5
+      parent: 60
   - uid: 38
     components:
     - type: Transform
@@ -143328,20 +141610,21 @@ entities:
     - type: Transform
       pos: -62.5,-17.5
       parent: 60
-  - uid: 51
+  - uid: 57
     components:
     - type: Transform
-      pos: -29.5,-17.5
+      pos: -8.5,-21.5
       parent: 60
   - uid: 62
     components:
     - type: Transform
       pos: 46.5,19.5
       parent: 60
-  - uid: 67
+  - uid: 69
     components:
     - type: Transform
-      pos: -35.5,-15.5
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-11.5
       parent: 60
   - uid: 77
     components:
@@ -143358,15 +141641,96 @@ entities:
     - type: Transform
       pos: -29.5,15.5
       parent: 60
+  - uid: 96
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-14.5
+      parent: 60
+  - uid: 115
+    components:
+    - type: Transform
+      pos: -30.5,-10.5
+      parent: 60
+  - uid: 119
+    components:
+    - type: Transform
+      pos: -21.5,-10.5
+      parent: 60
+  - uid: 124
+    components:
+    - type: Transform
+      pos: -24.5,-5.5
+      parent: 60
+  - uid: 144
+    components:
+    - type: Transform
+      pos: -35.5,-11.5
+      parent: 60
+  - uid: 146
+    components:
+    - type: Transform
+      pos: -31.5,-9.5
+      parent: 60
+  - uid: 148
+    components:
+    - type: Transform
+      pos: -17.5,-4.5
+      parent: 60
+  - uid: 151
+    components:
+    - type: Transform
+      pos: -25.5,-8.5
+      parent: 60
   - uid: 165
     components:
     - type: Transform
       pos: 57.5,-8.5
       parent: 60
-  - uid: 237
+  - uid: 180
     components:
     - type: Transform
-      pos: -34.5,-4.5
+      rot: -1.5707963267948966 rad
+      pos: -26.5,-5.5
+      parent: 60
+  - uid: 182
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -28.5,-10.5
+      parent: 60
+  - uid: 232
+    components:
+    - type: Transform
+      pos: -25.5,-7.5
+      parent: 60
+  - uid: 235
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,-21.5
+      parent: 60
+  - uid: 236
+    components:
+    - type: Transform
+      pos: -35.5,-14.5
+      parent: 60
+  - uid: 242
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,-5.5
+      parent: 60
+  - uid: 243
+    components:
+    - type: Transform
+      pos: -24.5,-8.5
+      parent: 60
+  - uid: 249
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,0.5
       parent: 60
   - uid: 290
     components:
@@ -143378,6 +141742,18 @@ entities:
     - type: Transform
       pos: 57.5,-4.5
       parent: 60
+  - uid: 307
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-6.5
+      parent: 60
+  - uid: 323
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,1.5
+      parent: 60
   - uid: 324
     components:
     - type: Transform
@@ -143393,6 +141769,16 @@ entities:
     - type: Transform
       pos: 35.5,-4.5
       parent: 60
+  - uid: 357
+    components:
+    - type: Transform
+      pos: -21.5,-5.5
+      parent: 60
+  - uid: 364
+    components:
+    - type: Transform
+      pos: -31.5,-5.5
+      parent: 60
   - uid: 366
     components:
     - type: Transform
@@ -143418,6 +141804,11 @@ entities:
     - type: Transform
       pos: -1.5,-15.5
       parent: 60
+  - uid: 399
+    components:
+    - type: Transform
+      pos: -28.5,3.5
+      parent: 60
   - uid: 403
     components:
     - type: Transform
@@ -143438,6 +141829,11 @@ entities:
     - type: Transform
       pos: 26.5,-0.5
       parent: 60
+  - uid: 436
+    components:
+    - type: Transform
+      pos: -20.5,-7.5
+      parent: 60
   - uid: 442
     components:
     - type: Transform
@@ -143483,6 +141879,11 @@ entities:
     - type: Transform
       pos: -13.5,-21.5
       parent: 60
+  - uid: 499
+    components:
+    - type: Transform
+      pos: -21.5,-9.5
+      parent: 60
   - uid: 502
     components:
     - type: Transform
@@ -143498,15 +141899,11 @@ entities:
     - type: Transform
       pos: 14.5,-21.5
       parent: 60
-  - uid: 515
-    components:
-    - type: Transform
-      pos: -13.5,-9.5
-      parent: 60
   - uid: 517
     components:
     - type: Transform
-      pos: -13.5,-6.5
+      rot: 3.141592653589793 rad
+      pos: -29.5,-5.5
       parent: 60
   - uid: 518
     components:
@@ -143558,40 +141955,44 @@ entities:
     - type: Transform
       pos: -3.5,-21.5
       parent: 60
-  - uid: 542
+  - uid: 541
     components:
     - type: Transform
-      pos: -11.5,-12.5
+      pos: -29.5,3.5
       parent: 60
-  - uid: 543
+  - uid: 544
     components:
     - type: Transform
-      pos: -13.5,-17.5
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-20.5
       parent: 60
-  - uid: 550
+  - uid: 546
     components:
     - type: Transform
-      pos: -13.5,-10.5
+      pos: -21.5,-21.5
+      parent: 60
+  - uid: 552
+    components:
+    - type: Transform
+      pos: -25.5,-9.5
       parent: 60
   - uid: 553
     components:
     - type: Transform
-      pos: -13.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-10.5
       parent: 60
   - uid: 554
     components:
     - type: Transform
-      pos: -13.5,-8.5
-      parent: 60
-  - uid: 558
-    components:
-    - type: Transform
-      pos: -13.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: -27.5,-5.5
       parent: 60
   - uid: 565
     components:
     - type: Transform
-      pos: -12.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-5.5
       parent: 60
   - uid: 566
     components:
@@ -143738,6 +142139,23 @@ entities:
     - type: Transform
       pos: 22.5,22.5
       parent: 60
+  - uid: 632
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -31.5,-6.5
+      parent: 60
+  - uid: 634
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-8.5
+      parent: 60
+  - uid: 635
+    components:
+    - type: Transform
+      pos: -32.5,-21.5
+      parent: 60
   - uid: 636
     components:
     - type: Transform
@@ -143793,15 +142211,43 @@ entities:
     - type: Transform
       pos: 11.5,-21.5
       parent: 60
+  - uid: 667
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-11.5
+      parent: 60
   - uid: 717
     components:
     - type: Transform
       pos: -68.5,5.5
       parent: 60
+  - uid: 720
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-15.5
+      parent: 60
+  - uid: 721
+    components:
+    - type: Transform
+      pos: -21.5,-20.5
+      parent: 60
+  - uid: 740
+    components:
+    - type: Transform
+      pos: -34.5,-21.5
+      parent: 60
+  - uid: 749
+    components:
+    - type: Transform
+      pos: -35.5,-20.5
+      parent: 60
   - uid: 765
     components:
     - type: Transform
-      pos: -13.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-11.5
       parent: 60
   - uid: 770
     components:
@@ -143811,12 +142257,37 @@ entities:
   - uid: 774
     components:
     - type: Transform
-      pos: -23.5,1.5
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-8.5
       parent: 60
-  - uid: 776
+  - uid: 781
     components:
     - type: Transform
-      pos: -23.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: -26.5,4.5
+      parent: 60
+  - uid: 783
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-7.5
+      parent: 60
+  - uid: 787
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,-4.5
+      parent: 60
+  - uid: 788
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,4.5
+      parent: 60
+  - uid: 792
+    components:
+    - type: Transform
+      pos: -21.5,-16.5
       parent: 60
   - uid: 809
     components:
@@ -143828,40 +142299,148 @@ entities:
     - type: Transform
       pos: -67.5,-2.5
       parent: 60
-  - uid: 845
+  - uid: 835
     components:
     - type: Transform
-      pos: -29.5,-2.5
+      pos: -22.5,3.5
       parent: 60
-  - uid: 856
+  - uid: 838
     components:
     - type: Transform
-      pos: -29.5,-1.5
+      rot: 3.141592653589793 rad
+      pos: -29.5,-10.5
+      parent: 60
+  - uid: 839
+    components:
+    - type: Transform
+      pos: -35.5,-15.5
       parent: 60
   - uid: 866
     components:
     - type: Transform
       pos: 8.5,-26.5
       parent: 60
-  - uid: 937
+  - uid: 979
     components:
     - type: Transform
-      pos: -17.5,-13.5
+      pos: -21.5,-8.5
       parent: 60
-  - uid: 1175
+  - uid: 984
     components:
     - type: Transform
-      pos: -20.5,-8.5
+      pos: -22.5,-8.5
+      parent: 60
+  - uid: 986
+    components:
+    - type: Transform
+      pos: -21.5,-7.5
+      parent: 60
+  - uid: 987
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,2.5
+      parent: 60
+  - uid: 988
+    components:
+    - type: Transform
+      pos: -26.5,-10.5
+      parent: 60
+  - uid: 990
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-11.5
+      parent: 60
+  - uid: 991
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-11.5
+      parent: 60
+  - uid: 992
+    components:
+    - type: Transform
+      pos: -27.5,-10.5
+      parent: 60
+  - uid: 1123
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-11.5
+      parent: 60
+  - uid: 1124
+    components:
+    - type: Transform
+      pos: -35.5,-10.5
+      parent: 60
+  - uid: 1125
+    components:
+    - type: Transform
+      pos: -35.5,-9.5
+      parent: 60
+  - uid: 1130
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,-4.5
+      parent: 60
+  - uid: 1132
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,2.5
+      parent: 60
+  - uid: 1146
+    components:
+    - type: Transform
+      pos: -35.5,-12.5
+      parent: 60
+  - uid: 1147
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-7.5
+      parent: 60
+  - uid: 1150
+    components:
+    - type: Transform
+      pos: -35.5,-13.5
+      parent: 60
+  - uid: 1151
+    components:
+    - type: Transform
+      pos: -35.5,-16.5
+      parent: 60
+  - uid: 1153
+    components:
+    - type: Transform
+      pos: -18.5,-21.5
+      parent: 60
+  - uid: 1154
+    components:
+    - type: Transform
+      pos: -31.5,2.5
+      parent: 60
+  - uid: 1163
+    components:
+    - type: Transform
+      pos: -31.5,3.5
+      parent: 60
+  - uid: 1173
+    components:
+    - type: Transform
+      pos: -25.5,-6.5
       parent: 60
   - uid: 1207
     components:
     - type: Transform
       pos: 2.5,-26.5
       parent: 60
-  - uid: 1210
+  - uid: 1209
     components:
     - type: Transform
-      pos: -19.5,-8.5
+      pos: -19.5,-7.5
       parent: 60
   - uid: 1232
     components:
@@ -143908,6 +142487,11 @@ entities:
     - type: Transform
       pos: 2.5,12.5
       parent: 60
+  - uid: 1297
+    components:
+    - type: Transform
+      pos: -35.5,-21.5
+      parent: 60
   - uid: 1298
     components:
     - type: Transform
@@ -143993,11 +142577,6 @@ entities:
     - type: Transform
       pos: 3.5,-26.5
       parent: 60
-  - uid: 1386
-    components:
-    - type: Transform
-      pos: -26.5,2.5
-      parent: 60
   - uid: 1387
     components:
     - type: Transform
@@ -144036,37 +142615,12 @@ entities:
   - uid: 1448
     components:
     - type: Transform
-      pos: -27.5,2.5
+      pos: -9.5,-21.5
       parent: 60
-  - uid: 1459
+  - uid: 1464
     components:
     - type: Transform
-      pos: -28.5,2.5
-      parent: 60
-  - uid: 1461
-    components:
-    - type: Transform
-      pos: -29.5,2.5
-      parent: 60
-  - uid: 1465
-    components:
-    - type: Transform
-      pos: -24.5,2.5
-      parent: 60
-  - uid: 1466
-    components:
-    - type: Transform
-      pos: -25.5,2.5
-      parent: 60
-  - uid: 1467
-    components:
-    - type: Transform
-      pos: -26.5,3.5
-      parent: 60
-  - uid: 1468
-    components:
-    - type: Transform
-      pos: -27.5,3.5
+      pos: -35.5,-17.5
       parent: 60
   - uid: 1470
     components:
@@ -144076,52 +142630,17 @@ entities:
   - uid: 1472
     components:
     - type: Transform
-      pos: -23.5,3.5
-      parent: 60
-  - uid: 1473
-    components:
-    - type: Transform
-      pos: -29.5,0.5
-      parent: 60
-  - uid: 1474
-    components:
-    - type: Transform
-      pos: -29.5,1.5
-      parent: 60
-  - uid: 1475
-    components:
-    - type: Transform
-      pos: -29.5,-0.5
+      pos: -33.5,-21.5
       parent: 60
   - uid: 1476
     components:
     - type: Transform
-      pos: -29.5,3.5
+      pos: -30.5,-21.5
       parent: 60
   - uid: 1481
     components:
     - type: Transform
-      pos: -24.5,3.5
-      parent: 60
-  - uid: 1482
-    components:
-    - type: Transform
-      pos: -28.5,3.5
-      parent: 60
-  - uid: 1484
-    components:
-    - type: Transform
-      pos: -27.5,-13.5
-      parent: 60
-  - uid: 1486
-    components:
-    - type: Transform
-      pos: -18.5,-8.5
-      parent: 60
-  - uid: 1492
-    components:
-    - type: Transform
-      pos: -25.5,-13.5
+      pos: -31.5,-21.5
       parent: 60
   - uid: 1495
     components:
@@ -144133,26 +142652,6 @@ entities:
     - type: Transform
       pos: -22.5,-25.5
       parent: 60
-  - uid: 1502
-    components:
-    - type: Transform
-      pos: -23.5,-0.5
-      parent: 60
-  - uid: 1503
-    components:
-    - type: Transform
-      pos: -23.5,-2.5
-      parent: 60
-  - uid: 1504
-    components:
-    - type: Transform
-      pos: -23.5,-1.5
-      parent: 60
-  - uid: 1510
-    components:
-    - type: Transform
-      pos: -23.5,0.5
-      parent: 60
   - uid: 1512
     components:
     - type: Transform
@@ -144178,46 +142677,76 @@ entities:
     - type: Transform
       pos: 8.5,11.5
       parent: 60
-  - uid: 1535
+  - uid: 1555
     components:
     - type: Transform
-      pos: -24.5,-13.5
+      pos: -26.5,-21.5
       parent: 60
-  - uid: 1551
+  - uid: 1558
     components:
     - type: Transform
-      pos: -25.5,3.5
-      parent: 60
-  - uid: 1556
-    components:
-    - type: Transform
-      pos: -23.5,-13.5
-      parent: 60
-  - uid: 1557
-    components:
-    - type: Transform
-      pos: -23.5,-17.5
+      rot: -1.5707963267948966 rad
+      pos: -28.5,-5.5
       parent: 60
   - uid: 1563
     components:
     - type: Transform
       pos: -26.5,-25.5
       parent: 60
-  - uid: 1576
-    components:
-    - type: Transform
-      pos: -24.5,-2.5
-      parent: 60
   - uid: 1577
     components:
     - type: Transform
-      pos: -28.5,-2.5
+      pos: -30.5,-5.5
+      parent: 60
+  - uid: 1580
+    components:
+    - type: Transform
+      pos: -25.5,-21.5
+      parent: 60
+  - uid: 1602
+    components:
+    - type: Transform
+      pos: -19.5,-21.5
       parent: 60
   - uid: 1604
     components:
     - type: Transform
       pos: -30.5,-25.5
       parent: 60
+  - uid: 1612
+    components:
+    - type: Transform
+      pos: -31.5,-10.5
+      parent: 60
+  - uid: 1624
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-15.5
+      parent: 60
+  - uid: 1647
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -17.5,-1.5
+      parent: 60
+  - uid: 1650
+    components:
+    - type: Transform
+      pos: -35.5,-2.5
+      parent: 60
+  - uid: 1652
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -17.5,-3.5
+      parent: 60
+  - uid: 1665
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,-6.5
+      parent: 60
   - uid: 1667
     components:
     - type: Transform
@@ -144228,15 +142757,164 @@ entities:
     - type: Transform
       pos: -21.5,-28.5
       parent: 60
-  - uid: 1809
+  - uid: 1684
     components:
     - type: Transform
-      pos: -20.5,-2.5
+      pos: -17.5,-21.5
+      parent: 60
+  - uid: 1697
+    components:
+    - type: Transform
+      pos: -12.5,-21.5
+      parent: 60
+  - uid: 1718
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -17.5,-2.5
+      parent: 60
+  - uid: 1719
+    components:
+    - type: Transform
+      pos: -14.5,-21.5
+      parent: 60
+  - uid: 1732
+    components:
+    - type: Transform
+      pos: -26.5,3.5
+      parent: 60
+  - uid: 1768
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,-5.5
+      parent: 60
+  - uid: 1791
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,-21.5
+      parent: 60
+  - uid: 1835
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -17.5,-7.5
+      parent: 60
+  - uid: 1843
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,-7.5
+      parent: 60
+  - uid: 1852
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-7.5
+      parent: 60
+  - uid: 1853
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -18.5,-7.5
+      parent: 60
+  - uid: 1854
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -15.5,-7.5
       parent: 60
   - uid: 1866
     components:
     - type: Transform
-      pos: -19.5,2.5
+      rot: 3.141592653589793 rad
+      pos: -13.5,-4.5
+      parent: 60
+  - uid: 1889
+    components:
+    - type: Transform
+      pos: -7.5,-15.5
+      parent: 60
+  - uid: 1904
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -17.5,-0.5
+      parent: 60
+  - uid: 1907
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -17.5,1.5
+      parent: 60
+  - uid: 1918
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-8.5
+      parent: 60
+  - uid: 1928
+    components:
+    - type: Transform
+      pos: -27.5,3.5
+      parent: 60
+  - uid: 1953
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,4.5
+      parent: 60
+  - uid: 1955
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,4.5
+      parent: 60
+  - uid: 1968
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-11.5
+      parent: 60
+  - uid: 1972
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,3.5
+      parent: 60
+  - uid: 1978
+    components:
+    - type: Transform
+      pos: -29.5,-21.5
+      parent: 60
+  - uid: 1990
+    components:
+    - type: Transform
+      pos: -16.5,-15.5
+      parent: 60
+  - uid: 2002
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-13.5
+      parent: 60
+  - uid: 2005
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-16.5
+      parent: 60
+  - uid: 2009
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-14.5
+      parent: 60
+  - uid: 2011
+    components:
+    - type: Transform
+      pos: -18.5,-16.5
       parent: 60
   - uid: 2014
     components:
@@ -144263,10 +142941,31 @@ entities:
     - type: Transform
       pos: -30.5,-26.5
       parent: 60
-  - uid: 2104
+  - uid: 2088
     components:
     - type: Transform
-      pos: -33.5,-12.5
+      pos: -20.5,-16.5
+      parent: 60
+  - uid: 2090
+    components:
+    - type: Transform
+      pos: -18.5,-4.5
+      parent: 60
+  - uid: 2103
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-21.5
+      parent: 60
+  - uid: 2120
+    components:
+    - type: Transform
+      pos: -21.5,-13.5
+      parent: 60
+  - uid: 2133
+    components:
+    - type: Transform
+      pos: -19.5,-4.5
       parent: 60
   - uid: 2134
     components:
@@ -144343,15 +143042,10 @@ entities:
     - type: Transform
       pos: 36.5,-25.5
       parent: 60
-  - uid: 2508
+  - uid: 2585
     components:
     - type: Transform
-      pos: -12.5,-12.5
-      parent: 60
-  - uid: 2553
-    components:
-    - type: Transform
-      pos: -12.5,-8.5
+      pos: -20.5,-4.5
       parent: 60
   - uid: 2587
     components:
@@ -144368,11 +143062,6 @@ entities:
     - type: Transform
       pos: 36.5,-15.5
       parent: 60
-  - uid: 2629
-    components:
-    - type: Transform
-      pos: -11.5,-11.5
-      parent: 60
   - uid: 2655
     components:
     - type: Transform
@@ -144388,11 +143077,6 @@ entities:
     - type: Transform
       pos: 42.5,-29.5
       parent: 60
-  - uid: 2672
-    components:
-    - type: Transform
-      pos: -13.5,-12.5
-      parent: 60
   - uid: 2678
     components:
     - type: Transform
@@ -144461,7 +143145,19 @@ entities:
   - uid: 2777
     components:
     - type: Transform
-      pos: -11.5,-10.5
+      pos: -20.5,-5.5
+      parent: 60
+  - uid: 2793
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-8.5
+      parent: 60
+  - uid: 2807
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-9.5
       parent: 60
   - uid: 2817
     components:
@@ -144498,11 +143194,6 @@ entities:
     - type: Transform
       pos: 46.5,-33.5
       parent: 60
-  - uid: 2856
-    components:
-    - type: Transform
-      pos: -11.5,-8.5
-      parent: 60
   - uid: 2866
     components:
     - type: Transform
@@ -145208,6 +143899,12 @@ entities:
     - type: Transform
       pos: 56.5,-33.5
       parent: 60
+  - uid: 3505
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-20.5
+      parent: 60
   - uid: 3509
     components:
     - type: Transform
@@ -145598,16 +144295,6 @@ entities:
     - type: Transform
       pos: 37.5,-13.5
       parent: 60
-  - uid: 4147
-    components:
-    - type: Transform
-      pos: -35.5,-12.5
-      parent: 60
-  - uid: 4153
-    components:
-    - type: Transform
-      pos: -10.5,-21.5
-      parent: 60
   - uid: 4157
     components:
     - type: Transform
@@ -145618,41 +144305,6 @@ entities:
     - type: Transform
       pos: -47.5,-22.5
       parent: 60
-  - uid: 4188
-    components:
-    - type: Transform
-      pos: -9.5,-21.5
-      parent: 60
-  - uid: 4202
-    components:
-    - type: Transform
-      pos: -35.5,-13.5
-      parent: 60
-  - uid: 4203
-    components:
-    - type: Transform
-      pos: -22.5,-17.5
-      parent: 60
-  - uid: 4209
-    components:
-    - type: Transform
-      pos: -17.5,-21.5
-      parent: 60
-  - uid: 4216
-    components:
-    - type: Transform
-      pos: -30.5,-17.5
-      parent: 60
-  - uid: 4238
-    components:
-    - type: Transform
-      pos: -12.5,-21.5
-      parent: 60
-  - uid: 4239
-    components:
-    - type: Transform
-      pos: -11.5,-21.5
-      parent: 60
   - uid: 4246
     components:
     - type: Transform
@@ -145803,16 +144455,6 @@ entities:
     - type: Transform
       pos: 31.5,-14.5
       parent: 60
-  - uid: 4519
-    components:
-    - type: Transform
-      pos: -29.5,-13.5
-      parent: 60
-  - uid: 4522
-    components:
-    - type: Transform
-      pos: -28.5,-13.5
-      parent: 60
   - uid: 4523
     components:
     - type: Transform
@@ -146118,11 +144760,6 @@ entities:
     - type: Transform
       pos: 56.5,3.5
       parent: 60
-  - uid: 5234
-    components:
-    - type: Transform
-      pos: -17.5,1.5
-      parent: 60
   - uid: 5248
     components:
     - type: Transform
@@ -146313,16 +144950,6 @@ entities:
     - type: Transform
       pos: 14.5,6.5
       parent: 60
-  - uid: 5437
-    components:
-    - type: Transform
-      pos: -12.5,-1.5
-      parent: 60
-  - uid: 5454
-    components:
-    - type: Transform
-      pos: -19.5,1.5
-      parent: 60
   - uid: 5483
     components:
     - type: Transform
@@ -146563,11 +145190,6 @@ entities:
     - type: Transform
       pos: 42.5,16.5
       parent: 60
-  - uid: 5800
-    components:
-    - type: Transform
-      pos: -34.5,-8.5
-      parent: 60
   - uid: 5864
     components:
     - type: Transform
@@ -146618,11 +145240,6 @@ entities:
     - type: Transform
       pos: 14.5,27.5
       parent: 60
-  - uid: 6094
-    components:
-    - type: Transform
-      pos: -20.5,-3.5
-      parent: 60
   - uid: 6160
     components:
     - type: Transform
@@ -146923,16 +145540,17 @@ entities:
     - type: Transform
       pos: 7.5,30.5
       parent: 60
-  - uid: 6582
-    components:
-    - type: Transform
-      pos: -17.5,-2.5
-      parent: 60
   - uid: 6608
     components:
     - type: Transform
       pos: 9.5,22.5
       parent: 60
+  - uid: 6611
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-21.5
+      parent: 60
   - uid: 6615
     components:
     - type: Transform
@@ -146963,26 +145581,11 @@ entities:
     - type: Transform
       pos: -40.5,-29.5
       parent: 60
-  - uid: 6762
-    components:
-    - type: Transform
-      pos: -18.5,1.5
-      parent: 60
-  - uid: 6804
-    components:
-    - type: Transform
-      pos: -35.5,-8.5
-      parent: 60
   - uid: 6806
     components:
     - type: Transform
       pos: 26.5,3.5
       parent: 60
-  - uid: 6820
-    components:
-    - type: Transform
-      pos: -32.5,-4.5
-      parent: 60
   - uid: 6826
     components:
     - type: Transform
@@ -147488,11 +146091,6 @@ entities:
     - type: Transform
       pos: 49.5,-48.5
       parent: 60
-  - uid: 7813
-    components:
-    - type: Transform
-      pos: -20.5,2.5
-      parent: 60
   - uid: 7989
     components:
     - type: Transform
@@ -147538,11 +146136,6 @@ entities:
     - type: Transform
       pos: -3.5,-52.5
       parent: 60
-  - uid: 8153
-    components:
-    - type: Transform
-      pos: -13.5,-18.5
-      parent: 60
   - uid: 8157
     components:
     - type: Transform
@@ -147608,10 +146201,15 @@ entities:
     - type: Transform
       pos: -56.5,-4.5
       parent: 60
-  - uid: 8231
+  - uid: 8246
     components:
     - type: Transform
-      pos: -18.5,-2.5
+      pos: -35.5,-5.5
+      parent: 60
+  - uid: 8247
+    components:
+    - type: Transform
+      pos: -35.5,-4.5
       parent: 60
   - uid: 8254
     components:
@@ -147628,25 +146226,25 @@ entities:
     - type: Transform
       pos: -34.5,1.5
       parent: 60
+  - uid: 8349
+    components:
+    - type: Transform
+      pos: -25.5,-14.5
+      parent: 60
   - uid: 8359
     components:
     - type: Transform
       pos: 52.5,-2.5
       parent: 60
-  - uid: 8380
-    components:
-    - type: Transform
-      pos: -34.5,-12.5
-      parent: 60
   - uid: 8432
     components:
     - type: Transform
       pos: -58.5,-1.5
       parent: 60
-  - uid: 8440
+  - uid: 8456
     components:
     - type: Transform
-      pos: -31.5,-17.5
+      pos: -14.5,1.5
       parent: 60
   - uid: 8459
     components:
@@ -147658,21 +146256,6 @@ entities:
     - type: Transform
       pos: -51.5,10.5
       parent: 60
-  - uid: 8477
-    components:
-    - type: Transform
-      pos: -27.5,-21.5
-      parent: 60
-  - uid: 8480
-    components:
-    - type: Transform
-      pos: -35.5,-4.5
-      parent: 60
-  - uid: 8481
-    components:
-    - type: Transform
-      pos: -17.5,-3.5
-      parent: 60
   - uid: 8490
     components:
     - type: Transform
@@ -147693,21 +146276,11 @@ entities:
     - type: Transform
       pos: -58.5,-3.5
       parent: 60
-  - uid: 8528
-    components:
-    - type: Transform
-      pos: -17.5,-8.5
-      parent: 60
   - uid: 8573
     components:
     - type: Transform
       pos: -34.5,4.5
       parent: 60
-  - uid: 8602
-    components:
-    - type: Transform
-      pos: -25.5,-21.5
-      parent: 60
   - uid: 8656
     components:
     - type: Transform
@@ -147718,6 +146291,12 @@ entities:
     - type: Transform
       pos: 20.5,4.5
       parent: 60
+  - uid: 8670
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-19.5
+      parent: 60
   - uid: 8716
     components:
     - type: Transform
@@ -147733,21 +146312,11 @@ entities:
     - type: Transform
       pos: 28.5,-13.5
       parent: 60
-  - uid: 8771
-    components:
-    - type: Transform
-      pos: -32.5,-8.5
-      parent: 60
   - uid: 8777
     components:
     - type: Transform
       pos: 62.5,-25.5
       parent: 60
-  - uid: 8892
-    components:
-    - type: Transform
-      pos: -19.5,-12.5
-      parent: 60
   - uid: 8936
     components:
     - type: Transform
@@ -147808,21 +146377,6 @@ entities:
     - type: Transform
       pos: -39.5,-8.5
       parent: 60
-  - uid: 9147
-    components:
-    - type: Transform
-      pos: -20.5,-12.5
-      parent: 60
-  - uid: 9152
-    components:
-    - type: Transform
-      pos: -33.5,-8.5
-      parent: 60
-  - uid: 9156
-    components:
-    - type: Transform
-      pos: -33.5,-4.5
-      parent: 60
   - uid: 9183
     components:
     - type: Transform
@@ -148108,10 +146662,11 @@ entities:
     - type: Transform
       pos: -60.5,5.5
       parent: 60
-  - uid: 10681
+  - uid: 10578
     components:
     - type: Transform
-      pos: -21.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-15.5
       parent: 60
   - uid: 10849
     components:
@@ -148133,11 +146688,6 @@ entities:
     - type: Transform
       pos: 52.5,19.5
       parent: 60
-  - uid: 11362
-    components:
-    - type: Transform
-      pos: -21.5,-17.5
-      parent: 60
   - uid: 11382
     components:
     - type: Transform
@@ -148643,65 +147193,26 @@ entities:
     - type: Transform
       pos: 59.5,3.5
       parent: 60
-  - uid: 13614
+  - uid: 13643
     components:
     - type: Transform
-      pos: -6.5,-19.5
-      parent: 60
-  - uid: 13615
-    components:
-    - type: Transform
-      pos: -7.5,-19.5
-      parent: 60
-  - uid: 13617
-    components:
-    - type: Transform
-      pos: -9.5,-19.5
+      pos: -30.5,-14.5
       parent: 60
   - uid: 13659
     components:
     - type: Transform
       pos: 59.5,4.5
       parent: 60
-  - uid: 13672
-    components:
-    - type: Transform
-      pos: -6.5,-10.5
-      parent: 60
   - uid: 13696
     components:
     - type: Transform
       pos: -54.5,30.5
       parent: 60
-  - uid: 13719
+  - uid: 13768
     components:
     - type: Transform
-      pos: -4.5,-16.5
-      parent: 60
-  - uid: 13740
-    components:
-    - type: Transform
-      pos: -4.5,-19.5
-      parent: 60
-  - uid: 13744
-    components:
-    - type: Transform
-      pos: -4.5,-14.5
-      parent: 60
-  - uid: 13748
-    components:
-    - type: Transform
-      pos: -6.5,-14.5
-      parent: 60
-  - uid: 13790
-    components:
-    - type: Transform
-      pos: -4.5,-15.5
-      parent: 60
-  - uid: 13791
-    components:
-    - type: Transform
-      pos: -6.5,-11.5
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-18.5
       parent: 60
   - uid: 13792
     components:
@@ -148728,6 +147239,11 @@ entities:
     - type: Transform
       pos: -5.5,16.5
       parent: 60
+  - uid: 13800
+    components:
+    - type: Transform
+      pos: -18.5,2.5
+      parent: 60
   - uid: 13802
     components:
     - type: Transform
@@ -149033,6 +147549,12 @@ entities:
     - type: Transform
       pos: -9.5,45.5
       parent: 60
+  - uid: 14231
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,2.5
+      parent: 60
   - uid: 14285
     components:
     - type: Transform
@@ -149058,6 +147580,18 @@ entities:
     - type: Transform
       pos: -38.5,27.5
       parent: 60
+  - uid: 14360
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-10.5
+      parent: 60
+  - uid: 14361
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-12.5
+      parent: 60
   - uid: 14391
     components:
     - type: Transform
@@ -149073,21 +147607,11 @@ entities:
     - type: Transform
       pos: -17.5,15.5
       parent: 60
-  - uid: 14454
-    components:
-    - type: Transform
-      pos: -18.5,-12.5
-      parent: 60
   - uid: 14477
     components:
     - type: Transform
       pos: -28.5,27.5
       parent: 60
-  - uid: 14625
-    components:
-    - type: Transform
-      pos: -17.5,-12.5
-      parent: 60
   - uid: 14627
     components:
     - type: Transform
@@ -149743,11 +148267,6 @@ entities:
     - type: Transform
       pos: -16.5,50.5
       parent: 60
-  - uid: 15403
-    components:
-    - type: Transform
-      pos: -31.5,1.5
-      parent: 60
   - uid: 15417
     components:
     - type: Transform
@@ -149808,11 +148327,6 @@ entities:
     - type: Transform
       pos: -16.5,51.5
       parent: 60
-  - uid: 15693
-    components:
-    - type: Transform
-      pos: -9.5,-18.5
-      parent: 60
   - uid: 15716
     components:
     - type: Transform
@@ -149838,21 +148352,6 @@ entities:
     - type: Transform
       pos: 3.5,22.5
       parent: 60
-  - uid: 15845
-    components:
-    - type: Transform
-      pos: -35.5,-16.5
-      parent: 60
-  - uid: 15899
-    components:
-    - type: Transform
-      pos: -35.5,-17.5
-      parent: 60
-  - uid: 15901
-    components:
-    - type: Transform
-      pos: -35.5,-21.5
-      parent: 60
   - uid: 16010
     components:
     - type: Transform
@@ -149898,11 +148397,6 @@ entities:
     - type: Transform
       pos: 9.5,30.5
       parent: 60
-  - uid: 16110
-    components:
-    - type: Transform
-      pos: -31.5,3.5
-      parent: 60
   - uid: 16121
     components:
     - type: Transform
@@ -149923,11 +148417,6 @@ entities:
     - type: Transform
       pos: -8.5,30.5
       parent: 60
-  - uid: 16145
-    components:
-    - type: Transform
-      pos: -35.5,-3.5
-      parent: 60
   - uid: 16152
     components:
     - type: Transform
@@ -150513,16 +149002,6 @@ entities:
     - type: Transform
       pos: -54.5,18.5
       parent: 60
-  - uid: 17471
-    components:
-    - type: Transform
-      pos: -35.5,-1.5
-      parent: 60
-  - uid: 17473
-    components:
-    - type: Transform
-      pos: -35.5,-0.5
-      parent: 60
   - uid: 17475
     components:
     - type: Transform
@@ -150573,11 +149052,6 @@ entities:
     - type: Transform
       pos: 31.5,33.5
       parent: 60
-  - uid: 17672
-    components:
-    - type: Transform
-      pos: -35.5,-2.5
-      parent: 60
   - uid: 17676
     components:
     - type: Transform
@@ -150733,16 +149207,6 @@ entities:
     - type: Transform
       pos: 10.5,-4.5
       parent: 60
-  - uid: 17952
-    components:
-    - type: Transform
-      pos: -24.5,-21.5
-      parent: 60
-  - uid: 17954
-    components:
-    - type: Transform
-      pos: -22.5,-21.5
-      parent: 60
   - uid: 17977
     components:
     - type: Transform
@@ -151168,71 +149632,21 @@ entities:
     - type: Transform
       pos: 32.5,26.5
       parent: 60
-  - uid: 18642
-    components:
-    - type: Transform
-      pos: -20.5,-4.5
-      parent: 60
   - uid: 18677
     components:
     - type: Transform
       pos: 18.5,-2.5
       parent: 60
-  - uid: 18693
-    components:
-    - type: Transform
-      pos: -26.5,-21.5
-      parent: 60
-  - uid: 18695
-    components:
-    - type: Transform
-      pos: -29.5,-21.5
-      parent: 60
-  - uid: 18767
-    components:
-    - type: Transform
-      pos: -31.5,-21.5
-      parent: 60
-  - uid: 18771
-    components:
-    - type: Transform
-      pos: -32.5,-12.5
-      parent: 60
-  - uid: 18790
-    components:
-    - type: Transform
-      pos: -35.5,-14.5
-      parent: 60
-  - uid: 18791
-    components:
-    - type: Transform
-      pos: -17.5,-15.5
-      parent: 60
   - uid: 18804
     components:
     - type: Transform
       pos: -24.5,58.5
       parent: 60
-  - uid: 18826
-    components:
-    - type: Transform
-      pos: -17.5,-17.5
-      parent: 60
   - uid: 18829
     components:
     - type: Transform
       pos: 28.5,4.5
       parent: 60
-  - uid: 18856
-    components:
-    - type: Transform
-      pos: -12.5,0.5
-      parent: 60
-  - uid: 18858
-    components:
-    - type: Transform
-      pos: -17.5,-4.5
-      parent: 60
   - uid: 18862
     components:
     - type: Transform
@@ -151273,16 +149687,6 @@ entities:
     - type: Transform
       pos: 22.5,26.5
       parent: 60
-  - uid: 18968
-    components:
-    - type: Transform
-      pos: -35.5,0.5
-      parent: 60
-  - uid: 18997
-    components:
-    - type: Transform
-      pos: -30.5,-21.5
-      parent: 60
   - uid: 19003
     components:
     - type: Transform
@@ -151328,11 +149732,6 @@ entities:
     - type: Transform
       pos: 52.5,16.5
       parent: 60
-  - uid: 19450
-    components:
-    - type: Transform
-      pos: -19.5,-4.5
-      parent: 60
   - uid: 19740
     components:
     - type: Transform
@@ -151458,16 +149857,6 @@ entities:
     - type: Transform
       pos: 12.5,-78.5
       parent: 60
-  - uid: 19887
-    components:
-    - type: Transform
-      pos: -23.5,-21.5
-      parent: 60
-  - uid: 20003
-    components:
-    - type: Transform
-      pos: -21.5,-21.5
-      parent: 60
   - uid: 20070
     components:
     - type: Transform
@@ -151608,11 +149997,6 @@ entities:
     - type: Transform
       pos: -9.5,42.5
       parent: 60
-  - uid: 21011
-    components:
-    - type: Transform
-      pos: -28.5,-21.5
-      parent: 60
   - uid: 21041
     components:
     - type: Transform
@@ -151773,11 +150157,6 @@ entities:
     - type: Transform
       pos: -13.5,-78.5
       parent: 60
-  - uid: 21381
-    components:
-    - type: Transform
-      pos: -18.5,-4.5
-      parent: 60
   - uid: 21421
     components:
     - type: Transform
@@ -151808,11 +150187,6 @@ entities:
     - type: Transform
       pos: -69.5,15.5
       parent: 60
-  - uid: 21722
-    components:
-    - type: Transform
-      pos: -32.5,-2.5
-      parent: 60
   - uid: 21780
     components:
     - type: Transform
@@ -152678,11 +151052,6 @@ entities:
     - type: Transform
       pos: -8.5,58.5
       parent: 60
-  - uid: 24133
-    components:
-    - type: Transform
-      pos: -5.5,-16.5
-      parent: 60
   - uid: 24435
     components:
     - type: Transform
@@ -152975,6 +151344,11 @@ entities:
     - type: Transform
       pos: 32.5,21.5
       parent: 60
+  - uid: 244
+    components:
+    - type: Transform
+      pos: -32.5,-17.5
+      parent: 60
   - uid: 247
     components:
     - type: Transform
@@ -153005,11 +151379,6 @@ entities:
     - type: Transform
       pos: -22.5,6.5
       parent: 60
-  - uid: 268
-    components:
-    - type: Transform
-      pos: -17.5,4.5
-      parent: 60
   - uid: 282
     components:
     - type: Transform
@@ -153040,11 +151409,6 @@ entities:
     - type: Transform
       pos: -20.5,6.5
       parent: 60
-  - uid: 335
-    components:
-    - type: Transform
-      pos: -17.5,5.5
-      parent: 60
   - uid: 338
     components:
     - type: Transform
@@ -153120,6 +151484,11 @@ entities:
     - type: Transform
       pos: -25.5,6.5
       parent: 60
+  - uid: 584
+    components:
+    - type: Transform
+      pos: -32.5,-16.5
+      parent: 60
   - uid: 596
     components:
     - type: Transform
@@ -153320,6 +151689,12 @@ entities:
     - type: Transform
       pos: 49.5,-34.5
       parent: 60
+  - uid: 895
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -17.5,2.5
+      parent: 60
   - uid: 907
     components:
     - type: Transform
@@ -153400,6 +151775,12 @@ entities:
     - type: Transform
       pos: -3.5,-29.5
       parent: 60
+  - uid: 1238
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,-1.5
+      parent: 60
   - uid: 1248
     components:
     - type: Transform
@@ -153470,16 +151851,154 @@ entities:
     - type: Transform
       pos: 7.5,-33.5
       parent: 60
+  - uid: 1728
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,1.5
+      parent: 60
+  - uid: 1734
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,0.5
+      parent: 60
+  - uid: 1735
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,-0.5
+      parent: 60
+  - uid: 1749
+    components:
+    - type: Transform
+      pos: -14.5,6.5
+      parent: 60
+  - uid: 1762
+    components:
+    - type: Transform
+      pos: -33.5,-15.5
+      parent: 60
   - uid: 1795
     components:
     - type: Transform
       pos: 31.5,-38.5
       parent: 60
+  - uid: 1799
+    components:
+    - type: Transform
+      pos: -8.5,-20.5
+      parent: 60
+  - uid: 1872
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-18.5
+      parent: 60
   - uid: 1886
     components:
     - type: Transform
       pos: 3.5,-33.5
       parent: 60
+  - uid: 1887
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-18.5
+      parent: 60
+  - uid: 1892
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-15.5
+      parent: 60
+  - uid: 1893
+    components:
+    - type: Transform
+      pos: -32.5,-15.5
+      parent: 60
+  - uid: 1965
+    components:
+    - type: Transform
+      pos: -27.5,-1.5
+      parent: 60
+  - uid: 1966
+    components:
+    - type: Transform
+      pos: -31.5,0.5
+      parent: 60
+  - uid: 1969
+    components:
+    - type: Transform
+      pos: -30.5,-19.5
+      parent: 60
+  - uid: 1970
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,-1.5
+      parent: 60
+  - uid: 1974
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-1.5
+      parent: 60
+  - uid: 1975
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-0.5
+      parent: 60
+  - uid: 1977
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -25.5,-1.5
+      parent: 60
+  - uid: 1979
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,1.5
+      parent: 60
+  - uid: 1980
+    components:
+    - type: Transform
+      pos: -30.5,-17.5
+      parent: 60
+  - uid: 1981
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,2.5
+      parent: 60
+  - uid: 1982
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,0.5
+      parent: 60
+  - uid: 1985
+    components:
+    - type: Transform
+      pos: -30.5,-18.5
+      parent: 60
+  - uid: 1987
+    components:
+    - type: Transform
+      pos: -30.5,-20.5
+      parent: 60
+  - uid: 1993
+    components:
+    - type: Transform
+      pos: -31.5,-1.5
+      parent: 60
+  - uid: 2018
+    components:
+    - type: Transform
+      pos: -31.5,-0.5
+      parent: 60
   - uid: 2037
     components:
     - type: Transform
@@ -153540,10 +152059,10 @@ entities:
     - type: Transform
       pos: 15.5,-38.5
       parent: 60
-  - uid: 2165
+  - uid: 2096
     components:
     - type: Transform
-      pos: -11.5,-18.5
+      pos: -30.5,-16.5
       parent: 60
   - uid: 2168
     components:
@@ -154090,11 +152609,6 @@ entities:
     - type: Transform
       pos: 38.5,3.5
       parent: 60
-  - uid: 3210
-    components:
-    - type: Transform
-      pos: -11.5,-17.5
-      parent: 60
   - uid: 3227
     components:
     - type: Transform
@@ -154905,6 +153419,12 @@ entities:
     - type: Transform
       pos: -65.5,49.5
       parent: 60
+  - uid: 5475
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,6.5
+      parent: 60
   - uid: 5482
     components:
     - type: Transform
@@ -155485,16 +154005,6 @@ entities:
     - type: Transform
       pos: 29.5,-18.5
       parent: 60
-  - uid: 8774
-    components:
-    - type: Transform
-      pos: -25.5,5.5
-      parent: 60
-  - uid: 8896
-    components:
-    - type: Transform
-      pos: -17.5,2.5
-      parent: 60
   - uid: 8965
     components:
     - type: Transform
@@ -155730,6 +154240,11 @@ entities:
     - type: Transform
       pos: 32.5,-34.5
       parent: 60
+  - uid: 11371
+    components:
+    - type: Transform
+      pos: -17.5,5.5
+      parent: 60
   - uid: 11431
     components:
     - type: Transform
@@ -156190,6 +154705,11 @@ entities:
     - type: Transform
       pos: 18.5,-39.5
       parent: 60
+  - uid: 13728
+    components:
+    - type: Transform
+      pos: -6.5,-18.5
+      parent: 60
   - uid: 13739
     components:
     - type: Transform
@@ -156420,6 +154940,12 @@ entities:
     - type: Transform
       pos: -20.5,19.5
       parent: 60
+  - uid: 14624
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.5,-17.5
+      parent: 60
   - uid: 14628
     components:
     - type: Transform
@@ -156695,11 +155221,6 @@ entities:
     - type: Transform
       pos: -4.5,22.5
       parent: 60
-  - uid: 18671
-    components:
-    - type: Transform
-      pos: -11.5,-20.5
-      parent: 60
   - uid: 18999
     components:
     - type: Transform
@@ -157577,6 +156098,32 @@ entities:
     - type: Transform
       pos: 32.5,-3.5
       parent: 60
+- proto: WallWeaponCapacitorRecharger
+  entities:
+  - uid: 2004
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -31.5,-0.5
+      parent: 60
+  - uid: 8330
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-16.5
+      parent: 60
+  - uid: 8339
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,0.5
+      parent: 60
+  - uid: 15442
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-15.5
+      parent: 60
 - proto: WardrobeBlackFilled
   entities:
   - uid: 3368
@@ -157654,22 +156201,16 @@ entities:
         - 0
 - proto: WardrobePrisonFilled
   entities:
-  - uid: 1625
+  - uid: 1933
     components:
     - type: Transform
-      anchored: True
-      pos: -29.5,-6.5
+      pos: -13.5,-20.5
       parent: 60
-    - type: Physics
-      bodyType: Static
-  - uid: 1977
+  - uid: 1934
     components:
     - type: Transform
-      anchored: True
-      pos: -23.5,-6.5
+      pos: -12.5,-20.5
       parent: 60
-    - type: Physics
-      bodyType: Static
 - proto: WardrobeSalvageFilled
   entities:
   - uid: 13247
@@ -157833,13 +156374,18 @@ entities:
     - type: Transform
       pos: -36.5,21.5
       parent: 60
-  - uid: 22118
-    components:
-    - type: Transform
-      pos: -28.5,-3.5
-      parent: 60
 - proto: WaterTankFull
   entities:
+  - uid: 564
+    components:
+    - type: Transform
+      pos: -18.5,-5.5
+      parent: 60
+  - uid: 1929
+    components:
+    - type: Transform
+      pos: -12.5,-9.5
+      parent: 60
   - uid: 2329
     components:
     - type: Transform
@@ -157916,25 +156462,15 @@ entities:
       parent: 60
 - proto: WeaponCapacitorRecharger
   entities:
-  - uid: 720
+  - uid: 341
     components:
     - type: Transform
-      pos: -25.5,-9.5
+      pos: -18.5,-2.5
       parent: 60
-  - uid: 1570
+  - uid: 3773
     components:
     - type: Transform
-      pos: -27.5,-6.5
-      parent: 60
-  - uid: 5010
-    components:
-    - type: Transform
-      pos: -28.5,-20.5
-      parent: 60
-  - uid: 8468
-    components:
-    - type: Transform
-      pos: -31.5,-18.5
+      pos: -28.5,-14.5
       parent: 60
   - uid: 9536
     components:
@@ -157953,33 +156489,40 @@ entities:
       parent: 60
     - type: Physics
       canCollide: False
-  - uid: 19155
-    components:
-    - type: Transform
-      pos: -21.5,-18.5
-      parent: 60
-- proto: WeaponLaserCarbine
+- proto: WeaponEnergyTurretSecurity
   entities:
-  - uid: 6308
+  - uid: 1506
     components:
     - type: Transform
-      parent: 6206
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: -26.5,-8.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 13699
+- proto: WeaponEnergyTurretSecurityControlPanel
+  entities:
+  - uid: 13699
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,-6.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 1506
 - proto: WeaponRifleAk
   entities:
-  - uid: 6136
+  - uid: 22
     components:
     - type: Transform
-      pos: -24.376413,1.5949111
+      pos: -26.496874,-6.540243
       parent: 60
 - proto: WeaponSubMachineGunWt550
   entities:
-  - uid: 8243
+  - uid: 1824
     components:
     - type: Transform
-      pos: -21.478931,-0.37953046
+      pos: -29.44601,0.7170377
       parent: 60
 - proto: WeaponTurretSyndicateBroken
   entities:
@@ -158060,6 +156603,11 @@ entities:
     - type: Transform
       pos: -28.5,-27.5
       parent: 60
+  - uid: 1740
+    components:
+    - type: Transform
+      pos: -19.5,-5.5
+      parent: 60
   - uid: 2326
     components:
     - type: Transform
@@ -158325,37 +156873,56 @@ entities:
       parent: 60
 - proto: WindoorSecureArmoryLocked
   entities:
-  - uid: 4898
-    components:
-    - type: Transform
-      pos: -24.5,1.5
-      parent: 60
-  - uid: 8413
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,-10.5
-      parent: 60
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        234:
-        - - DoorStatus
-          - Close
-  - uid: 15897
+  - uid: 246
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -29.5,-10.5
+      pos: -27.5,-6.5
+      parent: 60
+  - uid: 776
+    components:
+    - type: Transform
+      pos: -26.5,-6.5
+      parent: 60
+  - uid: 796
+    components:
+    - type: Transform
+      pos: -26.5,-14.5
+      parent: 60
+  - uid: 1556
+    components:
+    - type: Transform
+      pos: -28.5,-14.5
+      parent: 60
+  - uid: 1750
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-17.5
+      parent: 60
+  - uid: 1976
+    components:
+    - type: Transform
+      pos: -27.5,-14.5
+      parent: 60
+  - uid: 8278
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,-8.5
+      parent: 60
+  - uid: 8420
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-16.5
+      parent: 60
+  - uid: 13642
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-18.5
       parent: 60
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        8920:
-        - - DoorStatus
-          - Close
 - proto: WindoorSecureAtmosphericsLocked
   entities:
   - uid: 13959
@@ -158371,75 +156938,28 @@ entities:
       parent: 60
 - proto: WindoorSecureBrigLocked
   entities:
-  - uid: 234
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -23.5,-10.5
-      parent: 60
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        8413:
-        - - DoorStatus
-          - Close
-  - uid: 2584
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-7.5
-      parent: 60
-  - uid: 2602
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -32.5,-7.5
-      parent: 60
   - uid: 4198
     components:
     - type: Transform
       pos: -43.5,-18.5
       parent: 60
-  - uid: 6709
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-11.5
-      parent: 60
-  - uid: 8514
-    components:
-    - type: Transform
-      pos: -18.5,-13.5
-      parent: 60
-  - uid: 8748
-    components:
-    - type: Transform
-      pos: -19.5,-13.5
-      parent: 60
-  - uid: 8920
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -29.5,-10.5
-      parent: 60
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        15897:
-        - - DoorStatus
-          - Close
-  - uid: 9176
+  - uid: 8277
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -32.5,-11.5
+      pos: -35.5,-0.5
       parent: 60
-  - uid: 17466
+  - uid: 8424
     components:
     - type: Transform
-      pos: -20.5,-13.5
+      rot: 1.5707963267948966 rad
+      pos: -35.5,-1.5
+      parent: 60
+  - uid: 8437
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -35.5,0.5
       parent: 60
 - proto: WindoorSecureCargoLocked
   entities:
@@ -158713,93 +157233,17 @@ entities:
       parent: 60
 - proto: WindoorSecureSecurityLocked
   entities:
-  - uid: 1483
-    components:
-    - type: MetaData
-      name: Cell 1
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -32.5,-5.5
-      parent: 60
-  - uid: 1485
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -32.5,-11.5
-      parent: 60
-    - type: Airlock
-      autoClose: False
-  - uid: 1487
-    components:
-    - type: MetaData
-      name: Cell 4
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,-9.5
-      parent: 60
-  - uid: 1530
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,-11.5
-      parent: 60
-    - type: Airlock
-      autoClose: False
-  - uid: 1548
-    components:
-    - type: MetaData
-      name: Cell 3
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,-5.5
-      parent: 60
-  - uid: 1555
-    components:
-    - type: MetaData
-      name: Cell 2
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -32.5,-9.5
-      parent: 60
-  - uid: 1821
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,-19.5
-      parent: 60
-  - uid: 2100
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -31.5,-19.5
-      parent: 60
-  - uid: 4201
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,-7.5
-      parent: 60
-    - type: Airlock
-      autoClose: False
   - uid: 4298
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -42.5,-15.5
       parent: 60
-  - uid: 5825
+  - uid: 8280
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -32.5,-7.5
-      parent: 60
-    - type: Airlock
-      autoClose: False
-  - uid: 12596
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -31.5,2.5
+      pos: -31.5,-8.5
       parent: 60
 - proto: Window
   entities:
@@ -159303,28 +157747,20 @@ entities:
       parent: 60
 - proto: WindowReinforcedDirectional
   entities:
-  - uid: 132
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -31.5,-18.5
-      parent: 60
-  - uid: 493
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,-18.5
-      parent: 60
   - uid: 521
     components:
     - type: Transform
       pos: 10.5,-9.5
       parent: 60
-  - uid: 630
+  - uid: 836
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -29.5,-18.5
+      pos: -34.5,-17.5
+      parent: 60
+  - uid: 837
+    components:
+    - type: Transform
+      pos: -33.5,-17.5
       parent: 60
   - uid: 1345
     components:
@@ -159346,24 +157782,6 @@ entities:
     - type: Transform
       pos: 7.5,-24.5
       parent: 60
-  - uid: 1646
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -29.5,-20.5
-      parent: 60
-  - uid: 1651
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,-20.5
-      parent: 60
-  - uid: 1916
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -31.5,-20.5
-      parent: 60
   - uid: 2417
     components:
     - type: Transform
@@ -159575,12 +157993,6 @@ entities:
     - type: Transform
       pos: -15.5,-44.5
       parent: 60
-  - uid: 6149
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -24.5,1.5
-      parent: 60
   - uid: 6478
     components:
     - type: Transform
@@ -159770,12 +158182,6 @@ entities:
     - type: Transform
       pos: -113.5,12.5
       parent: 60
-  - uid: 7918
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,-10.5
-      parent: 60
   - uid: 8159
     components:
     - type: Transform
@@ -159786,77 +158192,18 @@ entities:
     - type: Transform
       pos: -10.5,-44.5
       parent: 60
-  - uid: 8214
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,-10.5
-      parent: 60
-  - uid: 8215
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-10.5
-      parent: 60
-  - uid: 8296
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,-18.5
-      parent: 60
   - uid: 8385
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -40.5,-15.5
       parent: 60
-  - uid: 8427
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,-10.5
-      parent: 60
-  - uid: 8457
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-13.5
-      parent: 60
-  - uid: 8493
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,-10.5
-      parent: 60
-  - uid: 8497
-    components:
-    - type: Transform
-      pos: -9.5,-10.5
-      parent: 60
-  - uid: 8509
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-2.5
-      parent: 60
-  - uid: 8565
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-10.5
-      parent: 60
   - uid: 9023
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 46.5,-16.5
       parent: 60
-  - uid: 9089
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,-20.5
-      parent: 60
   - uid: 10850
     components:
     - type: Transform
@@ -159890,68 +158237,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,-30.5
       parent: 60
-  - uid: 11516
-    components:
-    - type: Transform
-      pos: -7.5,-10.5
-      parent: 60
-  - uid: 11567
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-12.5
-      parent: 60
-  - uid: 11568
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-13.5
-      parent: 60
-  - uid: 11569
-    components:
-    - type: Transform
-      pos: -10.5,-10.5
-      parent: 60
-  - uid: 11574
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-12.5
-      parent: 60
-  - uid: 11575
-    components:
-    - type: Transform
-      pos: -8.5,-10.5
-      parent: 60
-  - uid: 11578
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-12.5
-      parent: 60
-  - uid: 11579
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-14.5
-      parent: 60
-  - uid: 11580
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-13.5
-      parent: 60
-  - uid: 11582
-    components:
-    - type: Transform
-      pos: -6.5,-13.5
-      parent: 60
-  - uid: 11753
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-11.5
-      parent: 60
   - uid: 12599
     components:
     - type: Transform
@@ -159968,11 +158253,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -81.5,15.5
       parent: 60
-  - uid: 13619
-    components:
-    - type: Transform
-      pos: -11.5,-16.5
-      parent: 60
   - uid: 13801
     components:
     - type: Transform
@@ -160080,12 +158360,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -82.5,15.5
       parent: 60
-  - uid: 16450
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,-2.5
-      parent: 60
   - uid: 16616
     components:
     - type: Transform
@@ -160283,17 +158557,6 @@ entities:
     - type: Transform
       pos: -87.5,19.5
       parent: 60
-  - uid: 21215
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-14.5
-      parent: 60
-  - uid: 21216
-    components:
-    - type: Transform
-      pos: -5.5,-14.5
-      parent: 60
   - uid: 21222
     components:
     - type: Transform
@@ -161716,174 +159979,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -103.5,11.5
       parent: 60
-  - uid: 23081
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-14.5
-      parent: 60
-  - uid: 23082
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,-16.5
-      parent: 60
-  - uid: 23083
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,-16.5
-      parent: 60
-  - uid: 24512
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,-16.5
-      parent: 60
-  - uid: 24513
-    components:
-    - type: Transform
-      pos: -9.5,-17.5
-      parent: 60
-  - uid: 24514
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-17.5
-      parent: 60
-  - uid: 24515
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-16.5
-      parent: 60
-  - uid: 24516
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-16.5
-      parent: 60
-  - uid: 24517
-    components:
-    - type: Transform
-      pos: -7.5,-16.5
-      parent: 60
-  - uid: 24518
-    components:
-    - type: Transform
-      pos: -8.5,-16.5
-      parent: 60
-  - uid: 24519
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-17.5
-      parent: 60
-  - uid: 24520
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-20.5
-      parent: 60
-  - uid: 24521
-    components:
-    - type: Transform
-      pos: -9.5,-20.5
-      parent: 60
-  - uid: 24522
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-20.5
-      parent: 60
-  - uid: 24523
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,-20.5
-      parent: 60
-  - uid: 24524
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-13.5
-      parent: 60
-  - uid: 24525
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-13.5
-      parent: 60
-  - uid: 24526
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-14.5
-      parent: 60
-  - uid: 24527
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-15.5
-      parent: 60
-  - uid: 24528
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-16.5
-      parent: 60
-  - uid: 24529
-    components:
-    - type: Transform
-      pos: -13.5,-16.5
-      parent: 60
-  - uid: 24530
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-16.5
-      parent: 60
-  - uid: 24531
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-15.5
-      parent: 60
-  - uid: 24532
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-14.5
-      parent: 60
-  - uid: 24533
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-13.5
-      parent: 60
-  - uid: 24534
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-19.5
-      parent: 60
-  - uid: 24535
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-19.5
-      parent: 60
-  - uid: 24536
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-19.5
-      parent: 60
-  - uid: 24537
-    components:
-    - type: Transform
-      pos: -13.5,-19.5
-      parent: 60
   - uid: 24660
     components:
     - type: Transform
@@ -161947,11 +160042,6 @@ entities:
     - type: Transform
       pos: 48.5,-39.5
       parent: 60
-  - uid: 6746
-    components:
-    - type: Transform
-      pos: -19.5,-2.5
-      parent: 60
   - uid: 13851
     components:
     - type: MetaData
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index 40a576b453..e6587ae6b8 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -401,6 +401,20 @@
     useDelay: 1
     itemIconStyle: BigAction
 
+- type: entity
+  parent: BaseAction
+  id: ActionGravityJump
+  name: Jump
+  description: Activating the advanced propulsion system, you propel yourself a short distance in the direction of your gaze.
+  components:
+  - type: Action
+    useDelay: 8
+    icon: 
+      sprite: Interface/Actions/jump.rsi
+      state: icon
+  - type: InstantAction
+    event: !type:GravityJumpEvent {}
+    
 - type: entity
   parent: BaseToggleAction
   id: ActionToggleRootable
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index 667b83ec3f..68b4b2dc58 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -151,7 +151,7 @@
 - type: cargoProduct
   id: LivestockParrot
   icon:
-    sprite: Mobs/Animals/parrot.rsi
+    sprite: Mobs/Animals/parrot/parrot.rsi
     state: parrot
   product: CrateNPCParrot
   cost: 3000
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
index a42d653d52..06005c274f 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
@@ -57,27 +57,6 @@
         amount: 4
 
 # Magnum
-- type: entity
-  name: box of SMG .45 magnum magazines
-  parent: BoxMagazine
-  id: BoxMagazineMagnumSubMachineGun
-  description: A box full of SMG .45 magnum magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazineMagnumSubMachineGun
-        amount: 3
-
-- type: entity
-  name: box of SMG .45 magnum (practice) magazines
-  parent: BoxMagazine
-  id: BoxMagazineMagnumSubMachineGunPractice
-  description: A box full of SMG .45 magnum (practice) magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazineMagnumSubMachineGunPractice
-        amount: 3
 
 # Pistol
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
index d9beb72435..7f3a16c33a 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
@@ -102,6 +102,7 @@
     layers:
       - state: box
       - state: bodybags
+  - type: Storage
     whitelist:
       tags:
         - BodyBag
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 1c0d3668ae..6e26006ef1 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -462,7 +462,7 @@
   name: hydrated scurret
   description: Wait, what?
   id: CrateFunScurret
-  parent: CratePlastic
+  parent: CrateLivestock
   components:
   - type: StorageFill
     contents:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index c61247dea9..84da90eb2a 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -2,7 +2,7 @@
   id: CrateServiceJanitorialSupplies
   parent: CratePlastic
   name: janitorial supplies crate
-  description: Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, broom, spray cleaner, rag, and trash bag.
+  description: Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, broom, spray cleaner, wire brush, rag, and trash bag.
   components:
   - type: StorageFill
     contents:
@@ -20,6 +20,8 @@
       - id: Plunger
         amount: 2
       - id: BoxCleanerGrenades
+      - id: WireBrush
+        amount: 2
 
 - type: entity
   id: CrateServiceCleanerGrenades
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 3575439567..5da3df71c0 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -84,6 +84,7 @@
         amount: 2
       - id: FlashlightLantern
       - id: LightReplacer
+      - id: WireBrush
 
 - type: entity
   id: ClothingBeltMedicalFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index cfd1aca2b5..2f2e7a2c1a 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -3,161 +3,201 @@
   suffix: Filled, Hardsuit
   parent: LockerWarden
   components:
-  - type: StorageFill
-    contents:
-      - id: FlashlightSeclite
-      - id: WeaponDisabler
-      - id: ClothingBeltSecurityFilled
-      - id: Flash
-      - id: ClothingEyesGlassesSecurity
-      - id: ClothingHandsGlovesCombat
-      - id: ClothingShoesBootsJack
-      - id: ClothingOuterCoatWarden
-      - id: ClothingOuterWinterWarden
-      - id: RubberStampWarden
-      - id: DoorRemoteArmory
-      - id: ClothingOuterHardsuitWarden
-      - id: HoloprojectorSecurity
-      - id: BookSpaceLaw
-      - id: ClothingBackpackElectropack
-        amount: 2
-      - id: RemoteSignaller
-        amount: 2
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - !type:NestedSelector
+          tableId: FillLockerWarden
+        - !type:NestedSelector
+          tableId: FillLockerWardenHarduit
 
 - type: entity
   id: LockerWardenFilled
   suffix: Filled
   parent: LockerWarden
   components:
-  - type: StorageFill
-    contents:
-      - id: FlashlightSeclite
-      - id: WeaponDisabler
-      - id: ClothingBeltSecurityFilled
-      - id: Flash
-      - id: ClothingEyesGlassesSecurity
-      - id: ClothingHandsGlovesCombat
-      - id: ClothingShoesBootsJack
-      - id: ClothingOuterCoatWarden
-      - id: ClothingOuterWinterWarden
-      - id: RubberStampWarden
-      - id: DoorRemoteArmory
-      - id: HoloprojectorSecurity
-      - id: BookSpaceLaw
-      - id: ClothingBackpackElectropack
-        amount: 2
-      - id: RemoteSignaller
-        amount: 2
-      - id: Binoculars
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerWarden
+
+- type: entityTable
+  id: FillLockerWarden
+  table: !type:AllSelector
+    children:
+    - id: FlashlightSeclite
+    - id: WeaponDisabler
+    - id: ClothingBeltSecurityFilled
+    - id: Flash
+    - id: ClothingEyesGlassesSecurity
+    - id: ClothingHandsGlovesCombat
+    - id: ClothingShoesBootsJack
+    - id: ClothingOuterCoatWarden
+    - id: ClothingOuterWinterWarden
+    - id: RubberStampWarden
+    - id: DoorRemoteArmory
+    - id: HoloprojectorSecurity
+    - id: BookSpaceLaw
+    - id: ClothingBackpackElectropack
+      amount: 2
+    - id: RemoteSignaller
+      amount: 2
+    - id: Binoculars
+
+- type: entityTable
+  id: FillLockerWardenHarduit
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterHardsuitWarden
+    - id: OxygenTankFilled
+    - id: ClothingMaskBreath
 
 - type: entity
   id: LockerSecurityFilled
   suffix: Filled
   parent: LockerSecurity
   components:
-  - type: StorageFill
-    contents:
-      - id: FlashlightSeclite
-        prob: 0.8
-      - id: WeaponDisabler
-      - id: ClothingUniformJumpsuitSecGrey
-        prob: 0.3
-      - id: ClothingHeadHelmetBasic
-      - id: ClothingOuterArmorBasic
-      - id: ClothingBeltSecurityFilled
-      - id: Flash
-        prob: 0.5
-      - id: ClothingEyesGlassesSecurity
-      - id: ClothingHeadsetSecurity
-      - id: ClothingHandsGlovesColorBlack
-      - id: ClothingShoesBootsJack
-      - id: WeaponMeleeNeedle
-        prob: 0.1
-      - id: HoloprojectorSecurity
-        prob: 0.6
-      - id: BookSpaceLaw
-        prob: 0.5
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerSecurity
+
+- type: entityTable
+  id: FillLockerSecurity
+  table: !type:AllSelector
+    children:
+    - id: FlashlightSeclite
+      prob: 0.8
+    - id: WeaponDisabler
+    - id: ClothingUniformJumpsuitSecGrey
+      prob: 0.3
+    - id: ClothingHeadHelmetBasic
+    - id: ClothingOuterArmorBasic
+    - id: ClothingBeltSecurityFilled
+    - id: Flash
+      prob: 0.5
+    - id: ClothingEyesGlassesSecurity
+    - id: ClothingHeadsetSecurity
+    - id: ClothingHandsGlovesColorBlack
+    - id: ClothingShoesBootsJack
+    - id: WeaponMeleeNeedle
+      prob: 0.1
+    - id: HoloprojectorSecurity
+      prob: 0.6
+    - id: BookSpaceLaw
+      prob: 0.5
 
 - type: entity
   id: LockerBrigmedicFilled
   suffix: Brigmedic, Filled
   parent: LockerBrigmedic
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingEyesGlassesSecurity
-      - id: WeaponDisabler
-      - id: TrackingImplanter
-        amount: 2
-      - id: ClothingOuterHardsuitBrigmedic
-      - id: BoxSterileMask
-      - id: ClothingHeadHatBeretBrigmedic
-      - id: ClothingOuterCoatAMG
-      - id: ClothingUniformJumpsuitBrigmedic
-      - id: ClothingUniformJumpskirtBrigmedic
-      - id: ClothingUniformJumpskirtOfLife
-        prob: 0.1
-      - id: MedkitFilled
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerBrigmedic
+
+- type: entityTable
+  id: FillLockerBrigmedic
+  table: !type:AllSelector
+    children:
+    - id: ClothingEyesGlassesSecurity
+    - id: WeaponDisabler
+    - id: TrackingImplanter
+      amount: 2
+    - id: ClothingOuterHardsuitBrigmedic
+    - id: BoxSterileMask
+    - id: ClothingHeadHatBeretBrigmedic
+    - id: ClothingOuterCoatAMG
+    - id: ClothingUniformJumpsuitBrigmedic
+    - id: ClothingUniformJumpskirtBrigmedic
+    - id: ClothingUniformJumpskirtOfLife
+      prob: 0.1
+    - id: MedkitFilled
+    - !type:GroupSelector
+      prob: 0.7
+      children:
       - id: MedkitCombatFilled
-        prob: 0.6
+        weight: 1.6
       - id: MedkitAdvancedFilled
-        prob: 0.4
       - id: MedkitOxygenFilled
-        prob: 0.3
+        weight: 0.8
       - id: MedkitBruteFilled
-        prob: 0.3
+        weight: 0.8
       - id: MedkitToxinFilled
-        prob: 0.3
+        weight: 0.8
       - id: MedkitBurnFilled
-        prob: 0.7
-      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
-        prob: 0.15
+        weight: 1.8
+    - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
+      prob: 0.15
 
 - type: entity
   id: LockerDetectiveFilled
   suffix: Filled
   parent: LockerDetective
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingEyesGlassesNoir
-      - id: ClothingHeadHatDetGadget
-      - id: ClothingNeckTieDet
-      - id: ClothingOuterVestDetective
-      - id: ClothingOuterCoatDetectiveLoadout
-      - id: FlippoEngravedLighter
-      - id: FlashlightSeclite
-      - id: ForensicScanner
-      - id: LogProbeCartridge
-      - id: BoxForensicPad
-      - id: DrinkDetFlask
-      - id: ClothingHandsGlovesForensic
-      - id: RubberStampDetective
-      - id: HoloprojectorSecurity
-      - id: BoxEvidenceMarkers
-      - id: HandLabeler
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerDetective
+
+- type: entityTable
+  id: FillLockerDetective
+  table: !type:AllSelector
+    children:
+    - id: ClothingEyesGlassesNoir
+    - id: ClothingHeadHatDetGadget
+    - id: ClothingNeckTieDet
+    - id: ClothingOuterVestDetective
+    - id: ClothingOuterCoatDetectiveLoadout
+    - id: FlippoEngravedLighter
+    - id: FlashlightSeclite
+    - id: ForensicScanner
+    - id: LogProbeCartridge
+    - id: BoxForensicPad
+    - id: DrinkDetFlask
+    - id: ClothingHandsGlovesForensic
+    - id: RubberStampDetective
+    - id: HoloprojectorSecurity
+    - id: BoxEvidenceMarkers
+    - id: HandLabeler
 
 - type: entity
   id: ClosetBombFilled
   parent: ClosetBomb
   suffix: Filled
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingHeadHelmetBombSuit
-      - id: ClothingOuterSuitBomb
-      - id: Wirecutter
-      - id: Screwdriver
-      - id: Multitool
-        prob: 0.5
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillClosetBomb
+
+- type: entityTable
+  id: FillClosetBomb
+  table: !type:AllSelector
+    children:
+    - id: ClothingHeadHelmetBombSuit
+    - id: ClothingOuterSuitBomb
+    - id: Wirecutter
+    - id: Screwdriver
+    - id: Multitool
+      prob: 0.5
 
 - type: entity
   parent: [GunSafeBaseSecure, BaseSecurityContraband]
   id: GunSafeDisabler
   name: disabler safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeDisabler
+
+- type: entityTable
+  id: FillGunSafeDisabler
+  table: !type:AllSelector
+    children:
     - id: WeaponDisabler
       amount: 5
 
@@ -166,8 +206,15 @@
   id: GunSafePistolMk58
   name: mk58 safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafePistolMk58
+
+- type: entityTable
+  id: FillGunSafePistolMk58
+  table: !type:AllSelector
+    children:
     - id: WeaponPistolMk58
       amount: 4
     - id: MagazinePistol
@@ -178,8 +225,15 @@
   id: GunSafeRifleLecter
   name: lecter safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeRifleLecter
+
+- type: entityTable
+  id: FillGunSafeRifleLecter
+  table: !type:AllSelector
+    children:
     - id: WeaponRifleLecter
       amount: 2
     - id: MagazineRifle
@@ -190,8 +244,15 @@
   id: GunSafeSubMachineGunDrozd
   name: drozd safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeSubMachineGunDrozd
+
+- type: entityTable
+  id: FillGunSafeSubMachineGunDrozd
+  table: !type:AllSelector
+    children:
     - id: WeaponSubMachineGunDrozd
       amount: 2
     - id: MagazinePistolSubMachineGun
@@ -202,8 +263,15 @@
   id: GunSafeShotgunEnforcer
   name: enforcer safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeShotgunEnforcer
+
+- type: entityTable
+  id: FillGunSafeShotgunEnforcer
+  table: !type:AllSelector
+    children:
     - id: WeaponShotgunEnforcer
       amount: 2
     - id: BoxLethalshot
@@ -214,12 +282,19 @@
   id: GunSafeShotgunKammerer
   name: kammerer safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeShotgunKammerer
+
+- type: entityTable
+  id: FillGunSafeShotgunKammerer
+  table: !type:AllSelector
+    children:
     - id: WeaponShotgunKammerer
       amount: 2
     - id: BoxLethalshot
-      amount: 2
+      amount: 4
 
 - type: entity
   id: GunSafeSubMachineGunWt550
@@ -227,8 +302,15 @@
   parent: [GunSafeBaseSecure, BaseSecurityContraband]
   name: wt550 safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeSubMachineGunWt550
+
+- type: entityTable
+  id: FillGunSafeSubMachineGunWt550
+  table: !type:AllSelector
+    children:
     - id: WeaponSubMachineGunWt550
       amount: 2
     - id: MagazinePistolSubMachineGunTopMounted
@@ -239,7 +321,14 @@
   id: GunSafeLaserCarbine
   name: laser safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeLaserCarbine
+
+- type: entityTable
+  id: FillGunSafeLaserCarbine
+  table: !type:AllSelector
+    children:
     - id: WeaponLaserCarbine
       amount: 3
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index 03a24856ed..85bd52e13d 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -3,24 +3,28 @@
   suffix: Filled
   parent: LockerBooze
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingOuterArmorBasicSlim
-      - id: WeaponShotgunDoubleBarreledRubber
-      - id: DrinkShaker
-      - id: ClothingEyesHudBeer
-      - id: HandLabeler
-        amount: 1
-      - id: DrinkBottleBeer
-        prob: 0.5
-      - id: DrinkBottleBeer
-        prob: 0.5
-      - id: DrinkBottleBeer
-        prob: 0.5
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerBooze
+
+- type: entityTable
+  id: FillLockerBooze
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterArmorBasicSlim
+    - id: WeaponShotgunDoubleBarreledRubber
+    - id: DrinkShaker
+    - id: ClothingEyesHudBeer
+    - id: HandLabeler
+    - id: DrinkBottleBeer
+      amount: !type:BinomialNumberSelector
+        trials: 3
+    - !type:AllSelector
+      rolls: 2
+      children:
       - id: BoxBeanbag
-        amount: 2
       - id: RagItem
-        amount: 2
 
 #- type: entity
 #  id: LockerFormalFilled
@@ -32,101 +36,134 @@
   suffix: Filled
   parent: ClosetChef
   components:
-  - type: StorageFill
-    contents:
-      - id: VariantCubeBox
-      - id: BoxMousetrap
-        amount: 2
-      - id: SprayBottleWater
-      - id: ReagentContainerFlour
-        amount: 2
-      - id: FoodBoxCloth
-        amount: 1
-      - id: ReagentContainerSugar
-      - id: FoodCondimentPacketSalt
-        amount: 3
-      - id: FoodCondimentPacketPepper
-        amount: 3
-      - id: FoodCondimentBottleEnzyme
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillClosetChef
+
+- type: entityTable
+  id: FillClosetChef
+  table: !type:AllSelector
+    children:
+    - id: VariantCubeBox
+    - id: SprayBottleWater
+    - id: FoodBoxCloth
+    - id: ReagentContainerSugar
+    - id: FoodCondimentBottleEnzyme
+    - id: DrinkSoyMilkCarton
+    - !type:AllSelector
+      rolls: 2
+      children:
+      - id: DrinkMilkCarton
       # really, milk should go in the fridge. Unfortunately saltern only has freezers.
       # yes, I'm using this as an excuse to not have to do extra work.
-      - id: DrinkMilkCarton
-        amount: 2
-      - id: DrinkSoyMilkCarton
+      - id: ReagentContainerFlour
+      - id: BoxMousetrap
+    - !type:AllSelector
+      rolls: 3
+      children:
+      - id: FoodCondimentPacketSalt
+      - id: FoodCondimentPacketPepper
 
 - type: entity
   id: ClosetJanitorFilled
   suffix: Filled
   parent: ClosetJanitor
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillClosetJanitor
+
+- type: entityTable
+  id: FillClosetJanitor
+  table: !type:AllSelector
+    children:
+    - id: WetFloorSign
+      amount: 3
+    - id: LightReplacer
+    - id: BoxLightMixed
+    - id: Holoprojector
+    - !type:AllSelector
+      rolls: 2
+      children:
       - id: MopItem
-        amount: 2
       - id: BoxMousetrap
-        amount: 2
-      - id: WetFloorSign
-        amount: 3
       - id: TrashBag
-        amount: 2
-      - id: LightReplacer
-      - id: BoxLightMixed
-      - id: Holoprojector
       - id: SoapNT
-        amount: 2
       - id: FlashlightLantern
-        amount: 2
       - id: Plunger
-        amount: 2
+      - id: WireBrush
 
 - type: entity
   id: ClosetLegalFilled
   suffix: Filled
   parent: ClosetLegal
   components:
-  - type: StorageFill
-    contents:
-      - id: BriefcaseBrownFilled
-        prob: 0.80
-      - id: ClothingOuterRobesJudge
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillClosetLegal
+
+- type: entityTable
+  id: FillClosetLegal
+  table: !type:AllSelector
+    children:
+    - id: BriefcaseBrownFilled
+      prob: 0.80
+    - id: ClothingOuterRobesJudge
 
 - type: entity
   id: LockerBotanistFilled
   suffix: Filled
   parent: LockerBotanist
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingHandsGlovesLeather
-      - id: ClothingOuterApronBotanist
-      - id: ClothingHeadBandBotany
-      - id: ChemistryBottleRobustHarvest
-        prob: 0.3
-      - id: ClothingBeltPlant
-      - id: PlantBag ##Some maps don't have nutrivend
-      - id: BoxMouthSwab
-      - id: Dropper
-      - id: HandLabeler
-      - id: ClothingUniformOveralls
-      - id: ClothingHeadHatTrucker
-        prob: 0.1
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerBotanist
+
+- type: entityTable
+  id: FillLockerBotanist
+  table: !type:AllSelector
+    children:
+    - id: ClothingHandsGlovesLeather
+    - id: ClothingOuterApronBotanist
+    - id: ClothingHeadBandBotany
+    - id: ChemistryBottleRobustHarvest
+      prob: 0.3
+    - id: ClothingBeltPlant
+    - id: PlantBag ##Some maps don't have nutrivend
+    - id: BoxMouthSwab
+    - id: Dropper
+    - id: HandLabeler
+    - id: ClothingUniformOveralls
+    - id: ClothingHeadHatTrucker
+      prob: 0.1
 
 - type: entity
   id: LockerBotanistLoot
   suffix: Loot
   parent: LockerBotanist
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformOveralls
-      - id: ClothingHeadHatTrucker
-        prob: 0.3
-      - id: GatfruitSeeds
-        prob: 0.1
-      - id: FlyAmanitaSeeds
-        prob: 0.5
-      - id: NettleSeeds
-        prob: 0.7
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerBotanistLoot
+
+- type: entityTable
+  id: FillLockerBotanistLoot
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformOveralls
+    - id: ClothingHeadHatTrucker
+      prob: 0.3
+    - id: GatfruitSeeds
+      prob: 0.1
+    - id: FlyAmanitaSeeds
+      prob: 0.5
+    - id: NettleSeeds
+      prob: 0.7
 
 - type: entity
   id: ClosetJanitorBombFilled
@@ -134,7 +171,14 @@
   suffix: DO NOT MAP, Filled
   categories: [ DoNotMap ]
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingHeadHelmetJanitorBombSuit
-      - id: ClothingOuterSuitJanitorBomb
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillClosetJanitorBomb
+
+- type: entityTable
+  id: FillClosetJanitorBomb
+  table: !type:AllSelector
+    children:
+    - id: ClothingHeadHelmetJanitorBombSuit
+    - id: ClothingOuterSuitJanitorBomb
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/space_ruin.yml b/Resources/Prototypes/Catalog/Fills/Lockers/space_ruin.yml
index a35c5915ab..940072a335 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/space_ruin.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/space_ruin.yml
@@ -5,11 +5,18 @@
   suffix: NTSRA voidsuit locker
   parent: LockerSyndicate
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingHeadHelmetAncient
-      - id: ClothingOuterHardsuitAncientEVA
-      - id: JetpackVoidFilled
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FilLockerOldAISat
+
+- type: entityTable
+  id: FilLockerOldAISat
+  table: !type:AllSelector
+    children:
+    - id: ClothingHeadHelmetAncient
+    - id: ClothingOuterHardsuitAncientEVA
+    - id: JetpackVoidFilled
 
 #Syndicate ship armory stuff
 - type: entity
@@ -17,35 +24,49 @@
   parent: LockerSyndicate
   suffix: Basic ship gear, Random
   components:
-  - type: StorageFill
-    contents:
-      - id: CrowbarRed
-        prob: 0.6
-      - id: ClothingShoesBootsCombat
-        prob: 0.4
-      - id: ClothingUniformJumpsuitOperative
-        prob: 0.4
-      - id: ClothingHandsGlovesCombat
-        prob: 0.2
-      - id: ClothingBeltMilitaryWebbing
-        prob: 0.2
-        
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FilLockerSyndicateShipGearBasic
+
+- type: entityTable
+  id: FilLockerSyndicateShipGearBasic
+  table: !type:AllSelector
+    children:
+    - id: CrowbarRed
+      prob: 0.6
+    - id: ClothingShoesBootsCombat
+      prob: 0.4
+    - id: ClothingUniformJumpsuitOperative
+      prob: 0.4
+    - id: ClothingHandsGlovesCombat
+      prob: 0.2
+    - id: ClothingBeltMilitaryWebbing
+      prob: 0.2
+
 #Garunteed chameleon kit spawn, for the syndicate dropship
 - type: entity
   id: LockerSyndicateShipGearBasicChameleonKit
   parent: LockerSyndicateShipGearBasic
   suffix: Basic ship gear, Random, Chameleon Kit
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingBackpackChameleonFill
-      - id: CrowbarRed
-        prob: 0.6
-      - id: ClothingShoesBootsCombat
-        prob: 0.4
-      - id: ClothingUniformJumpsuitOperative
-        prob: 0.4
-      - id: ClothingHandsGlovesCombat
-        prob: 0.2
-      - id: ClothingBeltMilitaryWebbing
-        prob: 0.2
\ No newline at end of file
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FilLockerSyndicateShipGearBasicChameleonKit
+
+- type: entityTable
+  id: FilLockerSyndicateShipGearBasicChameleonKit
+  table: !type:AllSelector
+    children:
+    - id: ClothingBackpackChameleonFill
+    - id: CrowbarRed
+      prob: 0.6
+    - id: ClothingShoesBootsCombat
+      prob: 0.4
+    - id: ClothingUniformJumpsuitOperative
+      prob: 0.4
+    - id: ClothingHandsGlovesCombat
+      prob: 0.2
+    - id: ClothingBeltMilitaryWebbing
+      prob: 0.2
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index ff9e81b929..b914d3b850 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -5,12 +5,19 @@
   parent: SuitStorageBase
   suffix: EVA
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitEVA
-        - id: ClothingHeadHelmetEVA
-        - id: ClothingMaskBreath
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageEVA
+
+- type: entityTable
+  id: FillSuitStorageEVA
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitEVA
+    - id: ClothingHeadHelmetEVA
+    - id: ClothingMaskBreath
 
 #Basic EVA (Big Ass Helmet)
 - type: entity
@@ -18,12 +25,19 @@
   parent: SuitStorageBase
   suffix: EVA, Large Helmet
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitEVA
-        - id: ClothingHeadHelmetEVALarge
-        - id: ClothingMaskBreath
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageEVAAlternate
+
+- type: entityTable
+  id: FillSuitStorageEVAAlternate
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitEVA
+    - id: ClothingHeadHelmetEVALarge
+    - id: ClothingMaskBreath
 
 #Emergency EVA
 - type: entity
@@ -31,11 +45,18 @@
   parent: SuitStorageBase
   suffix: Emergency EVA
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterSuitEmergency
-        - id: ClothingMaskBreath
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageEVAEmergency
+
+- type: entityTable
+  id: FillSuitStorageEVAEmergency
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterSuitEmergency
+    - id: ClothingMaskBreath
 
 #Prisoner EVA
 - type: entity
@@ -43,12 +64,19 @@
   parent: SuitStorageBase
   suffix: Prisoner EVA
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitEVAPrisoner
-        - id: ClothingHeadHelmetEVALarge
-        - id: ClothingMaskBreath
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageEVAPrisoner
+
+- type: entityTable
+  id: FillSuitStorageEVAPrisoner
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitEVAPrisoner
+    - id: ClothingHeadHelmetEVALarge
+    - id: ClothingMaskBreath
 
 #Syndicate EVA
 - type: entity
@@ -56,12 +84,19 @@
   parent: SuitStorageBase
   suffix: Syndicate EVA
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterEVASuitSyndicate
-        - id: ClothingHeadHelmetSyndicate
-        - id: ClothingMaskGasSyndicate
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageEVASyndicate
+
+- type: entityTable
+  id: FillSuitStorageEVASyndicate
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterEVASuitSyndicate
+    - id: ClothingHeadHelmetSyndicate
+    - id: ClothingMaskGasSyndicate
 
 #Pirate EVA
 - type: entity
@@ -69,11 +104,18 @@
   parent: SuitStorageBase
   suffix: Pirate EVA
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitPirateEVA
-        - id: ClothingMaskGas
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageEVAPirate
+
+- type: entityTable
+  id: FillSuitStorageEVAPirate
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitPirateEVA
+    - id: ClothingMaskGas
 
 #NTSRA Voidsuit
 - type: entity
@@ -81,12 +123,19 @@
   parent: SuitStorageBase
   suffix: Ancient EVA
   components:
-  - type: StorageFill
-    contents:
-        - id: JetpackVoidFilled
-        - id: ClothingOuterHardsuitAncientEVA
-        - id: ClothingHeadHelmetAncient
-        - id: ClothingMaskBreath
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageEVANTSRA
+
+- type: entityTable
+  id: FillSuitStorageEVANTSRA
+  table: !type:AllSelector
+    children:
+    - id: JetpackVoidFilled
+    - id: ClothingOuterHardsuitAncientEVA
+    - id: ClothingHeadHelmetAncient
+    - id: ClothingMaskBreath
 
 #HARDSUITS
 #Engineering hardsuit
@@ -121,14 +170,21 @@
   parent: SuitStorageBase
   suffix: Security
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitSecurity
-        - id: ClothingMaskBreath
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageSecurity
   - type: AccessReader
     access: [["Security"]]
 
+- type: entityTable
+  id: FillSuitStorageSecurity
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitSecurity
+    - id: ClothingMaskBreath
+
 #CE's hardsuit
 - type: entity
   id: SuitStorageCE
@@ -187,11 +243,10 @@
   parent: SuitStorageBase
   suffix: Warden
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitWarden
-        - id: ClothingMaskBreath
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerWardenHarduit
   - type: AccessReader
     access: [["Armory"]]
 
@@ -227,12 +282,19 @@
   parent: SuitStorageBase
   suffix: Syndicate Hardsuit
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitSyndie
-        - id: ClothingShoesBootsMagSyndie
-        - id: ClothingMaskGasSyndicate
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageSyndie
+
+- type: entityTable
+  id: FillSuitStorageSyndie
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitSyndie
+    - id: ClothingShoesBootsMagSyndie
+    - id: ClothingMaskGasSyndicate
 
 #Pirate Captain's hardsuit
 - type: entity
@@ -240,11 +302,18 @@
   parent: SuitStorageBase
   suffix: Pirate Captain
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitPirateCap
-        - id: ClothingMaskGas
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStoragePirateCap
+
+- type: entityTable
+  id: FillSuitStoragePirateCap
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitPirateCap
+    - id: ClothingMaskGas
 
 #Wizard
 - type: entity
@@ -252,10 +321,17 @@
   parent: SuitStorageBase
   suffix: Wizard
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingMaskBreath
-        # TODO: Gone until reworked to have no space protection
-        #- id: ClothingOuterHardsuitWizard
-        #- id: JetpackVoidFilled
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageWizard
+
+- type: entityTable
+  id: FillSuitStorageWizard
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingMaskBreath
+    # TODO: Gone until reworked to have no space protection
+    #- id: ClothingOuterHardsuitWizard
+    #- id: JetpackVoidFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
index 4e885a08b2..d65469ccd2 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
@@ -3,60 +3,111 @@
   suffix: Filled
   parent: WardrobeGrey
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitColorGrey
-        amount: 2
-      - id: ClothingUniformJumpskirtColorGrey
-        amount: 2
-      - id: ClothingShoesColorBlack
-        amount: 3
-      - id: ClothingHeadHatGreysoft
-      - id: ClothingBackpackDuffel
-        prob: 0.5
-      - id: ClothingOuterCoatBomber
-        prob: 0.3
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeGrey
+
+- type: entity
+  id: ClosetWallWardrobeGreyFilled
+  suffix: Filled
+  parent: ClosetWallGrey
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeGrey
+
+- type: entityTable
+  id: FillWardrobeGrey
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitColorGrey
+      amount: 2
+    - id: ClothingUniformJumpskirtColorGrey
+      amount: 2
+    - id: ClothingShoesColorBlack
+      amount: 3
+    - id: ClothingHeadHatGreysoft
+    - id: ClothingBackpackDuffel
+      prob: 0.5
+    - id: ClothingOuterCoatBomber
+      prob: 0.3
 
 - type: entity
   id: WardrobeMixedFilled
   suffix: Filled
   parent: WardrobeMixed
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingShoesColorBlack
-        amount: 1
-      - id: ClothingShoesColorBrown
-        amount: 1
-      - id: ClothingShoesColorWhite
-        amount: 1
-      - id: ClothingOuterCoatBomber
-        prob: 0.4
-      - id: ClothingOuterCoatGentle
-        prob: 0.3
-      - id: ClothingUniformRandomShorts
-        amount: 3
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeMixed
+
+- type: entity
+  id: ClosetWallWardrobeMixedFilled
+  suffix: Filled
+  parent: ClosetWallMixed
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeMixed
+
+- type: entityTable
+  id: FillWardrobeMixed
+  table: !type:AllSelector
+    children:
+    - id: ClothingShoesColorBlack
+    - id: ClothingShoesColorBrown
+    - id: ClothingShoesColorWhite
+    - id: ClothingOuterCoatBomber
+      prob: 0.4
+    - id: ClothingOuterCoatGentle
+      prob: 0.3
+    - id: ClothingUniformRandomShorts
+      amount: 3
+    - id: ClothingUniformRandomBra
+      amount: 5
+    - !type:AllSelector
+      rolls: 5
+      children:
       - id: ClothingUniformRandomArmless
-        amount: 5
+        prob: 0.8
       - id: ClothingUniformRandomStandard
-        amount: 5
-      - id: ClothingUniformRandomBra
-        amount: 5
+        prob: 0.8
       - id: ClothingUniformRandomShirt
-        amount: 4
+        prob: 0.8
 
 - type: entity
   id: WardrobeYellowFilled
   suffix: Filled
   parent: WardrobeYellow
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitColorYellow
-      - id: ClothingUniformJumpskirtColorYellow
-      - id: ClothingShoesColorOrange
-        amount: 2
-      - id: ClothingHeadBandGold
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeYellow
+
+- type: entity
+  id: ClosetWallWardrobeYellowFilled
+  suffix: Filled
+  parent: ClosetWallYellow
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeYellow
+
+- type: entityTable
+  id: FillWardrobeYellow
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitColorYellow
+    - id: ClothingUniformJumpskirtColorYellow
+    - id: ClothingShoesColorOrange
+      amount: 2
+    - id: ClothingHeadBandGold
 
 
 - type: entity
@@ -64,62 +115,147 @@
   suffix: Filled
   parent: WardrobeWhite
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitColorWhite
-      - id: ClothingUniformJumpskirtColorWhite
-      - id: ClothingShoesColorWhite
-        amount: 2
-      - id: ClothingHeadHatMimesoft
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeWhite
+
+- type: entity
+  id: ClosetWallWardrobeWhiteFilled
+  suffix: Filled
+  parent: ClosetWallWhite
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeWhite
+
+- type: entityTable
+  id: FillWardrobeWhite
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitColorWhite
+    - id: ClothingUniformJumpskirtColorWhite
+    - id: ClothingShoesColorWhite
+      amount: 2
+    - id: ClothingHeadHatMimesoft
 
 - type: entity
   id: WardrobeBlueFilled
   suffix: Filled
   parent: WardrobeBlue
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitColorBlue
-      - id: ClothingUniformJumpskirtColorBlue
-      - id: ClothingShoesColorBrown
-        amount: 2
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeBlue
+
+- type: entity
+  id: ClosetWallWardrobeBlueFilled
+  suffix: Filled
+  parent: ClosetWallBlue
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeBlue
+
+- type: entityTable
+  id: FillWardrobeBlue
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitColorBlue
+    - id: ClothingUniformJumpskirtColorBlue
+    - id: ClothingShoesColorBrown
+      amount: 2
 
 - type: entity
   id: WardrobePinkFilled
   suffix: Filled
   parent: WardrobePink
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitColorPink
-      - id: ClothingUniformJumpskirtColorPink
-      - id: ClothingShoesColorBrown
-        amount: 2
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobePink
+
+- type: entity
+  id: ClosetWallWardrobePinkFilled
+  suffix: Filled
+  parent: ClosetWallPink
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobePink
+
+- type: entityTable
+  id: FillWardrobePink
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitColorPink
+    - id: ClothingUniformJumpskirtColorPink
+    - id: ClothingShoesColorBrown
+      amount: 2
 
 - type: entity
   id: WardrobeBlackFilled
   suffix: Filled
   parent: WardrobeBlack
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitColorBlack
-      - id: ClothingUniformJumpskirtColorBlack
-      - id: ClothingShoesColorBlack
-        amount: 2
-      - id: ClothingHeadBandBlack
-      - id: ClothingHeadBandSkull
-        prob: 0.4
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeBlack
+
+- type: entity
+  id: ClosetWallWardrobeBlackFilled
+  suffix: Filled
+  parent: ClosetWallBlack
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeBlack
+
+- type: entityTable
+  id: FillWardrobeBlack
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitColorBlack
+    - id: ClothingUniformJumpskirtColorBlack
+    - id: ClothingShoesColorBlack
+      amount: 2
+    - id: ClothingHeadBandBlack
+    - id: ClothingHeadBandSkull
+      prob: 0.4
 
 - type: entity
   id: WardrobeGreenFilled
   suffix: Filled
   parent: WardrobeGreen
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitColorGreen
-      - id: ClothingUniformJumpskirtColorGreen
-      - id: ClothingShoesColorBlack
-        amount: 2
-      - id: ClothingHeadBandGreen
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeGreen
+
+- type: entity
+  id: ClosetWallWardrobeGreenFilled
+  suffix: Filled
+  parent: ClosetWallGreen
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeGreen
+
+- type: entityTable
+  id: FillWardrobeGreen
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitColorGreen
+    - id: ClothingUniformJumpskirtColorGreen
+    - id: ClothingShoesColorBlack
+      amount: 2
+    - id: ClothingHeadBandGreen
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
index 49601980f3..dc944a803c 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
@@ -1,18 +1,83 @@
- - type: entity
-   id: WardrobePrisonFilled
-   suffix: Filled
-   parent: WardrobePrison
-   description: "Contains a selection of nice orange clothes for people enjoying their stay in the brig."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitPrisoner
-         amount: 2
-       - id: ClothingUniformJumpskirtPrisoner
-         amount: 2
-       - id: ClothingShoesColorBlack
-         amount: 2
-       - id: ClothingMaskMuzzle
+- type: entity
+  id: WardrobePrisonFilled
+  suffix: Filled
+  parent: WardrobePrison
+  description: "Contains a selection of nice orange clothes for people enjoying their stay in the brig."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobePrison
+
+- type: entity
+  id: ClosetWallWardrobePrisonFilled
+  suffix: Filled
+  parent: ClosetWallOrange
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobePrison
+
+- type: entityTable
+  id: FillWardrobePrison
+  table: !type:AllSelector
+    children:
+    - !type:AllSelector
+      rolls: 2
+      children:
+      - id: ClothingUniformJumpsuitPrisoner
+      - id: ClothingUniformJumpskirtPrisoner
+      - id: ClothingShoesColorBlack
+    - id: ClothingMaskMuzzle
+    - !type:GroupSelector
+      prob: 0.15
+      rolls: 2
+      children:
+      - id: FoodSnackBoritos
+      - id: FoodSnackCheesie
+      - id: FoodSnackChips
+      - id: FoodSnackRaisins
+      - id: FoodSnackMREBrownie
+      - id: FoodSnackChocolate
+      - id: FoodSnackChowMein
+    - !type:GroupSelector
+      prob: 0.25
+      children:
+      - id: BookRandomStory
+      - id: BookRandom
+    - !type:GroupSelector
+      prob: 0.15
+      children:
+      - id: Flare
+      - id: BarberScissors
+      - id: FlippoLighter
+      - id: trayScanner
+      - id: Wristwatch
+      - id: ClothingNeckBling
+      - id: ClothingMultipleHeadphones
+      - id: DiceBag
+      - id: PersonalAI
+      - id: CrayonBox
+      - id: HarmonicaInstrument
+      - id: ToyAmongPequeno
+      - id: WhoopieCushion
+      - id: Brutepack
+      - id: StrangePill
+      - id: Shiv
+    - !type:GroupSelector
+      prob: 0.1
+      children:
+      - id: CigPackBlack
+      - id: Joint
+      - id: Blunt
+      - id: PackPaperRolling
+      - id: Cigarette
+        amount: !type:RangeNumberSelector
+          range: 1, 4
+      - id: GroundCannabis
+        amount: !type:RangeNumberSelector
+          range: 1, 6
 
 #- type: entity
 #  id: WardrobePajamaFilled
@@ -20,202 +85,304 @@
 #  parent: WardrobeWhite
 #  name: pajama wardrobe
 
- - type: entity
-   id: WardrobeRoboticsFilled
-   suffix: Filled
-   parent: WardrobeRobotics
-   description: "You can build a robot out of this locker."
-   components:
-   - type: StorageFill
-     contents:
-     - id: ClothingOuterCoatRobo
-       amount: 2
-     - id: ClothingUniformJumpsuitRoboticist
-     - id: ClothingUniformJumpskirtRoboticist
-     - id: ClothingShoesColorBlack
-       amount: 2
-     - id: ClothingHandsGlovesFingerless
-       amount: 2
+- type: entity
+  id: WardrobeRoboticsFilled
+  suffix: Filled
+  parent: WardrobeRobotics
+  description: "You can build a robot out of this locker."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeRobotics
 
- - type: entity
-   id: WardrobeChemistryFilled
-   suffix: Filled
-   parent: WardrobeChemistry
-   description: "The sleek orange threads contained within make you much less likely to be thrown out of the chemistry lab."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitChemistry
-       - id: ClothingBackpackChemistry
-       - id: ClothingShoesColorWhite
-       - id: ClothingOuterCoatLabChem
-       - id: ClothingUniformJumpskirtChemistry
+- type: entityTable
+  id: FillWardrobeRobotics
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitRoboticist
+    - id: ClothingUniformJumpskirtRoboticist
+    - !type:AllSelector
+      rolls: 2
+      children:
+      - id: ClothingOuterCoatRobo
+      - id: ClothingShoesColorBlack
+      - id: ClothingHandsGlovesFingerless
 
- - type: entity
-   id: WardrobeGeneticsFilled
-   suffix: Filled
-   parent: WardrobeGenetics
-   description: "The sleek blue threads contained within make you much less likely to be thrown out of the genetics lab."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitGenetics
-       - id: ClothingBackpackGenetics
-       - id: ClothingShoesColorWhite
-       - id: ClothingOuterCoatLabGene
-       - id: ClothingUniformJumpskirtGenetics
+- type: entity
+  id: WardrobeChemistryFilled
+  suffix: Filled
+  parent: WardrobeChemistry
+  description: "The sleek orange threads contained within make you much less likely to be thrown out of the chemistry lab."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeChemistry
 
- - type: entity
-   id: WardrobeVirologyFilled
-   suffix: Filled
-   parent: WardrobeVirology
-   description: "The sleek green threads contained within make you much less likely to be thrown out of the virology lab."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitVirology
-       - id: ClothingBackpackVirology
-       - id: ClothingShoesColorWhite
-       - id: ClothingOuterCoatLabViro
-       - id: ClothingUniformJumpskirtVirology
+- type: entityTable
+  id: FillWardrobeChemistry
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitChemistry
+    - id: ClothingBackpackChemistry
+    - id: ClothingShoesColorWhite
+    - id: ClothingOuterCoatLabChem
+    - id: ClothingUniformJumpskirtChemistry
 
- - type: entity
-   id: WardrobeScienceFilled
-   suffix: Filled
-   parent: WardrobeScience
-   description: "You've read a couple pop science articles, now it's time for the real deal."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitScientist
-       - id: ClothingBackpackScience
-       - id: ClothingShoesColorWhite
-       - id: ClothingOuterCoatRnd
-       - id: ClothingUniformJumpskirtScientist
-       - id: ClothingEyesGlasses
-         prob: 0.5
-       - id: CrowbarRed #The jojoke - hit video game Half-Life
-         prob: 0.1
+- type: entity
+  id: WardrobeGeneticsFilled
+  suffix: Filled
+  parent: WardrobeGenetics
+  description: "The sleek blue threads contained within make you much less likely to be thrown out of the genetics lab."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeGenetics
 
+- type: entityTable
+  id: FillWardrobeGenetics
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitGenetics
+    - id: ClothingBackpackGenetics
+    - id: ClothingShoesColorWhite
+    - id: ClothingOuterCoatLabGene
+    - id: ClothingUniformJumpskirtGenetics
 
- - type: entity
-   id: WardrobeBotanistFilled
-   suffix: Filled
-   parent: WardrobeBotanist
-   description: "Plant yourself among the plant men with these 100% natural plant-derived clothes."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitHydroponics
-       - id: ClothingBackpackHydroponics
-       - id: ClothingShoesColorBrown
-       - id: ClothingOuterApronBotanist
-       - id: ClothingUniformJumpskirtHydroponics
-       - id: ClothingUniformOveralls
-       - id: ClothingHeadHatTrucker #the hat itself is a subtle joke
-         prob: 0.15
-       - id: ClothingHandsGlovesLeather
-         prob: 0.5
+- type: entity
+  id: WardrobeVirologyFilled
+  suffix: Filled
+  parent: WardrobeVirology
+  description: "The sleek green threads contained within make you much less likely to be thrown out of the virology lab."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeVirology
 
- - type: entity
-   id: WardrobeMedicalDoctorFilled
-   suffix: Filled
-   parent: WardrobeMedicalDoctor
-   description: "We've all played doctor before, now practice medicine."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitMedicalDoctor
-       - id: ClothingBackpackMedical
-       - id: ClothingShoesColorWhite
-       - id: ClothingOuterCoatLab
-       - id: ClothingUniformJumpskirtMedicalDoctor
-       - id: ClothingHandsGlovesLatex
-         prob: 0.4
-       - id: ClothingEyesGlasses
-         prob: 0.3
+- type: entityTable
+  id: FillWardrobeVirology
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitVirology
+    - id: ClothingBackpackVirology
+    - id: ClothingShoesColorWhite
+    - id: ClothingOuterCoatLabViro
+    - id: ClothingUniformJumpskirtVirology
 
- - type: entity
-   id: WardrobeChapelFilled
-   suffix: Filled
-   parent: WardrobeChapel
-   description: "You have to look presentable for your flock."
-   components:
-   - type: StorageFill
-     contents: # todo chaplain backpack
-       - id: ClothingUniformJumpsuitChaplain
-       - id: ClothingShoesColorBlack
-       - id: ClothingUniformJumpskirtChaplain
+- type: entity
+  id: WardrobeScienceFilled
+  suffix: Filled
+  parent: WardrobeScience
+  description: "You've read a couple pop science articles, now it's time for the real deal."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeScience
 
- - type: entity
-   id: WardrobeSecurityFilled
-   suffix: Filled
-   parent: WardrobeSecurity
-   description: "Cross the thin red line."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitSec
-       - id: ClothingBackpackSecurity
-       - id: ClothingShoesBootsJack
-       - id: ClothingEyesGlassesSunglasses
-       - id: ClothingHeadHelmetBasic
-       - id: ClothingOuterArmorBasic
-       - id: ClothingUniformJumpskirtSec
+- type: entityTable
+  id: FillWardrobeScience
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitScientist
+    - id: ClothingBackpackScience
+    - id: ClothingShoesColorWhite
+    - id: ClothingOuterCoatRnd
+    - id: ClothingUniformJumpskirtScientist
+    - id: ClothingEyesGlasses
+      prob: 0.5
+    - id: CrowbarRed #The jojoke - hit video game Half-Life
+      prob: 0.1
 
- - type: entity
-   id: WardrobeCargoFilled
-   suffix: Filled
-   parent: WardrobeCargo
-   description: "This locker? Maybe 500 spesos. Brotherhood? Priceless."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingHeadHatCargosoft
-       - id: ClothingUniformJumpsuitCargo
-       - id: ClothingBackpack
-       - id: ClothingShoesColorBlack
-       - id: ClothingUniformJumpskirtCargo
-       - id: ClothingHandsGlovesFingerless
-       - id: AppraisalTool
+- type: entity
+  id: WardrobeBotanistFilled
+  suffix: Filled
+  parent: WardrobeBotanist
+  description: "Plant yourself among the plant men with these 100% natural plant-derived clothes."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeBotanist
 
- - type: entity
-   id: WardrobeSalvageFilled
-   suffix: Filled
-   parent: WardrobeSalvage
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingBackpack
-       - id: ClothingShoesBootsSalvage
-         amount: 2
-       - id: ClothingUniformJumpsuitSalvageSpecialist
-         amount: 2
+- type: entityTable
+  id: FillWardrobeBotanist
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitHydroponics
+    - id: ClothingBackpackHydroponics
+    - id: ClothingShoesColorBrown
+    - id: ClothingOuterApronBotanist
+    - id: ClothingUniformJumpskirtHydroponics
+    - id: ClothingUniformOveralls
+    - id: ClothingHeadHatTrucker #the hat itself is a subtle joke
+      prob: 0.15
+    - id: ClothingHandsGlovesLeather
+      prob: 0.5
 
- - type: entity
-   id: WardrobeAtmosphericsFilled
-   suffix: Filled
-   parent: WardrobeAtmospherics
-   description: "This locker contains a uniform for atmospheric technicians."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitAtmos
-       - id: ClothingBackpackEngineering
-       - id: ClothingShoesColorWhite
-       - id: ClothingUniformJumpskirtAtmos
+- type: entity
+  id: WardrobeMedicalDoctorFilled
+  suffix: Filled
+  parent: WardrobeMedicalDoctor
+  description: "We've all played doctor before, now practice medicine."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeMedicalDoctor
 
- - type: entity
-   id: WardrobeEngineeringFilled
-   suffix: Filled
-   parent: WardrobeEngineering
-   description: "This locker contains a uniform for engineering or social engineering."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingHeadHatHardhatYellow
-       - id: ClothingUniformJumpsuitEngineering
-       - id: ClothingBackpackEngineering
-       - id: ClothingShoesBootsWork
-       - id: ClothingOuterVestHazard
-       - id: ClothingUniformJumpskirtEngineering
+- type: entityTable
+  id: FillWardrobeMedicalDoctor
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitMedicalDoctor
+    - id: ClothingBackpackMedical
+    - id: ClothingShoesColorWhite
+    - id: ClothingOuterCoatLab
+    - id: ClothingUniformJumpskirtMedicalDoctor
+    - id: ClothingHandsGlovesLatex
+      prob: 0.4
+    - id: ClothingEyesGlasses
+      prob: 0.3
+
+- type: entity
+  id: WardrobeChapelFilled
+  suffix: Filled
+  parent: WardrobeChapel
+  description: "You have to look presentable for your flock."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeChapel
+
+- type: entityTable
+  id: FillWardrobeChapel
+  table: !type:AllSelector
+    children:
+    # todo chaplain backpack
+    - id: ClothingUniformJumpsuitChaplain
+    - id: ClothingShoesColorBlack
+    - id: ClothingUniformJumpskirtChaplain
+
+- type: entity
+  id: WardrobeSecurityFilled
+  suffix: Filled
+  parent: WardrobeSecurity
+  description: "Cross the thin red line."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeSecurity
+
+- type: entityTable
+  id: FillWardrobeSecurity
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitSec
+    - id: ClothingBackpackSecurity
+    - id: ClothingShoesBootsJack
+    - id: ClothingEyesGlassesSunglasses
+    - id: ClothingHeadHelmetBasic
+    - id: ClothingOuterArmorBasic
+    - id: ClothingUniformJumpskirtSec
+
+- type: entity
+  id: WardrobeCargoFilled
+  suffix: Filled
+  parent: WardrobeCargo
+  description: "This locker? Maybe 500 spesos. Brotherhood? Priceless."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeCargo
+
+- type: entityTable
+  id: FillWardrobeCargo
+  table: !type:AllSelector
+    children:
+    - id: ClothingHeadHatCargosoft
+    - id: ClothingUniformJumpsuitCargo
+    - id: ClothingBackpack
+    - id: ClothingShoesColorBlack
+    - id: ClothingUniformJumpskirtCargo
+    - id: ClothingHandsGlovesFingerless
+    - id: AppraisalTool
+
+- type: entity
+  id: WardrobeSalvageFilled
+  suffix: Filled
+  parent: WardrobeSalvage
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeSalvage
+
+- type: entityTable
+  id: FillWardrobeSalvage
+  table: !type:AllSelector
+    children:
+    - id: ClothingBackpack
+    - id: ClothingShoesBootsSalvage
+      amount: 2
+    - id: ClothingUniformJumpsuitSalvageSpecialist
+      amount: 2
+
+- type: entity
+  id: WardrobeAtmosphericsFilled
+  suffix: Filled
+  parent: WardrobeAtmospherics
+  description: "This locker contains a uniform for atmospheric technicians."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeAtmospherics
+
+- type: entity
+  id: ClosetWallWardrobeAtmosphericsFilled
+  suffix: Filled
+  parent: ClosetWallAtmospherics
+  description: "This locker contains a uniform for atmospheric technicians."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeAtmospherics
+
+- type: entityTable
+  id: FillWardrobeAtmospherics
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitAtmos
+    - id: ClothingBackpackEngineering
+    - id: ClothingShoesColorWhite
+    - id: ClothingUniformJumpskirtAtmos
+
+- type: entity
+  id: WardrobeEngineeringFilled
+  suffix: Filled
+  parent: WardrobeEngineering
+  description: "This locker contains a uniform for engineering or social engineering."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeEngineering
+
+- type: entityTable
+  id: FillWardrobeEngineering
+  table: !type:AllSelector
+    children:
+    - id: ClothingHeadHatHardhatYellow
+    - id: ClothingUniformJumpsuitEngineering
+    - id: ClothingBackpackEngineering
+    - id: ClothingShoesBootsWork
+    - id: ClothingOuterVestHazard
+    - id: ClothingUniformJumpskirtEngineering
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
index 9708373dbf..fe397ea8cf 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
@@ -8,6 +8,7 @@
     FoodSnackPopcorn: 3
     FoodSnackEnergy: 3
     CigPackMixed: 2
+    DiscountDanLighter: 1
   contrabandInventory:
     FoodSnackDanDanNoodles: 3
     FoodBakedBunHoney: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
index 0e25fb2b05..f612f65eca 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -20,6 +20,7 @@
     RiotLaserShield: 2
     RiotBulletShield: 2
     RadioHandheldSecurity: 5
+    Bola: 6
   # security officers need to follow a diet regimen!
   contrabandInventory:
     WeaponMeleeNeedle: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
index 2231c714ff..71beff3cf5 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
@@ -13,6 +13,7 @@
     FlashlightLantern: 5
     ClothingHandsGlovesColorYellowBudget: 3
     SprayPainter: 3
+    SprayPainterAmmo: 5
   # Some engineer forgot to take the multitool out the youtool when working on it, happens.
   contrabandInventory:
     Multitool: 1
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 2095edabff..c94306cdc1 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -2233,6 +2233,17 @@
     - Chef
     - Mime
 
+- type: listing
+  id: UplinkContrabandLighter
+  name: uplink-contraband-lighter-name
+  description: uplink-contraband-lighter-desc
+  icon: { sprite:  Objects/Tools/Lighters/syndielighter.rsi, state: icon}
+  productEntity: UplinkLighterBox
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkPointless
+
 - type: listing
   id: UplinkSmugglerSatchel
   name: uplink-smuggler-satchel-name
diff --git a/Resources/Prototypes/Damage/examine_messages.yml b/Resources/Prototypes/Damage/examine_messages.yml
index 4523998094..91f838a436 100644
--- a/Resources/Prototypes/Damage/examine_messages.yml
+++ b/Resources/Prototypes/Damage/examine_messages.yml
@@ -1,9 +1,5 @@
-- type: examinableDamage
+- type: localizedDataset
   id: WindowMessages
-  messages:
-    - comp-window-damaged-1
-    - comp-window-damaged-2
-    - comp-window-damaged-3
-    - comp-window-damaged-4
-    - comp-window-damaged-5
-    - comp-window-damaged-6
+  values:
+    prefix: comp-window-damaged-
+    count: 6
diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
index d3e43653e0..52277a5d85 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -116,6 +116,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Back/Duffels/mime.rsi
+  - type: Storage
     storageOpenSound:
       collection: null
     storageInsertSound:
diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
index 5b195f4454..ac26054033 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -178,3 +178,13 @@
     maxItemSize: Huge
     grid:
     - 0,0,19,9
+
+- type: entity
+  parent: ClothingBackpackSatchelHolding
+  id: ClothingBackpackSatchelAdmin
+  name: satchel of administration
+  suffix: Admin
+  description: If you are somehow seeing this, no you're not.
+  components:
+  - type: ExplosionResistance
+    damageCoefficient: 0
diff --git a/Resources/Prototypes/Entities/Clothing/Back/specific.yml b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
index ff06b93bbf..d303aa166c 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
@@ -98,3 +98,25 @@
   - type: Construction
     graph: ClothingBagPet
     node: bagPet
+
+- type: entity
+  parent: Clothing
+  id: ClothingBackpackHarmpack
+  name: H.A.R.M.P.A.C.K.
+  description: Now you can reload, punch, and eat a snack - simultaneously.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Specific/harmpack.rsi
+    state: icon
+  - type: Item
+    size: Ginormous
+  - type: Clothing
+    slots: BACK
+  - type: ExtraHandsEquipment
+    hands:
+      # middle hands to prevent overlapping inhand sprites
+      # This can be changed once we have per-hand displacement maps
+      extra_hand_1:
+        location: Middle
+      extra_hand_2:
+        location: Middle
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 674ee2db4b..8255f0095a 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -12,7 +12,9 @@
     sprite: Clothing/Belt/utility.rsi
   - type: Storage
     maxItemSize: Normal
-    # TODO: Fill this out more.
+    # Don't add more than absolutely needed to this whitelist!
+    # Utility belts shouldn't just be free extra storage.
+    # This is only intended for basic engineering equipment.
     whitelist:
       tags:
         - Powerdrill
@@ -32,9 +34,11 @@
         - JawsOfLife
         - GPS
         - WeldingMask
+        - RemoteSignaller
       components:
         - StationMap
         - SprayPainter
+        - SprayPainterAmmo
         - NetworkConfigurator
         - RCD
         - RCDAmmo
@@ -119,6 +123,7 @@
       components:
         - StationMap
         - SprayPainter
+        - SprayPainterAmmo
         - NetworkConfigurator
         - RCD
         - RCDAmmo
@@ -229,6 +234,7 @@
         - WetFloorSign
         - HolosignProjector
         - Plunger
+        - WireBrush
       components:
         - LightReplacer
         - SmokeOnTrigger
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
index 52187227ac..30c14cab04 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -67,7 +67,7 @@
     coverage: EYES
   - type: Tag
     tags:
-    - CorgiWearable
+    - PetWearable
     - WhitelistChameleon
 
 - type: entity
@@ -144,7 +144,7 @@
   - type: Tag
     tags:
     - HamsterWearable
-    - CorgiWearable
+    - PetWearable
     - WhitelistChameleon
   - type: IdentityBlocker
     coverage: EYES
@@ -161,7 +161,7 @@
   - type: Tag
     tags:
     - Sunglasses
-    - CorgiWearable
+    - PetWearable
     - HamsterWearable
     - WhitelistChameleon
 
@@ -184,7 +184,7 @@
   - type: Tag
     tags:
     - HamsterWearable
-    - CorgiWearable
+    - PetWearable
     - WhitelistChameleon
   - type: GuideHelp
     guides:
@@ -209,7 +209,7 @@
   - type: Tag
     tags:
     - HamsterWearable
-    - CorgiWearable
+    - PetWearable
     - WhitelistChameleon
   - type: IdentityBlocker
     coverage: EYES
@@ -265,7 +265,7 @@
       coverage: EYES
     - type: Tag
       tags:
-      - CorgiWearable
+      - PetWearable
       - WhitelistChameleon
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
index c7562277b7..b35109ce17 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -44,7 +44,7 @@
   - type: Tag
     tags:
     - HudMedical
-    - CorgiWearable
+    - PetWearable
     - WhitelistChameleon
 
 - type: entity
@@ -60,7 +60,7 @@
   - type: Tag
     tags:
     - HudSecurity
-    - CorgiWearable
+    - PetWearable
     - WhitelistChameleon
 
 - type: entity
@@ -76,7 +76,7 @@
   - type: ShowJobIcons
   - type: Tag
     tags:
-    - CorgiWearable
+    - PetWearable
     - WhitelistChameleon
 
 - type: entity
@@ -95,7 +95,7 @@
   - type: SolutionScanner
   - type: Tag
     tags:
-    - CorgiWearable
+    - PetWearable
     - WhitelistChameleon
 
 - type: entity
@@ -221,7 +221,7 @@
   - type: ShowSyndicateIcons
   - type: Tag
     tags:
-    - CorgiWearable
+    - PetWearable
     - WhitelistChameleon
 
 - type: entity
@@ -238,7 +238,7 @@
   - type: ShowHealthBars
   - type: Tag
     tags:
-    - CorgiWearable
+    - PetWearable
     - WhitelistChameleon
 
 - type: entity
@@ -258,7 +258,7 @@
     sprite: Clothing/Eyes/Hud/medpatch.rsi
   - type: Tag
     tags:
-    - CorgiWearable
+    - PetWearable
     - WhitelistChameleon
     - HudMedical
 
@@ -279,7 +279,7 @@
     sprite: Clothing/Eyes/Hud/secpatch.rsi
   - type: Tag
     tags:
-    - CorgiWearable
+    - PetWearable
     - WhitelistChameleon
     - HudSecurity
 
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml
index d1b2d636b4..936856fdf7 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml
@@ -7,7 +7,7 @@
   components:
     - type: Tag
       tags: # intentionally no WhitelistChameleon tag
-      - CorgiWearable 
+      - PetWearable 
     - type: Sprite
       sprite: Clothing/Eyes/Glasses/sunglasses.rsi
     - type: Clothing
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index dac5a8946e..e4afec873c 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -91,8 +91,8 @@
         id: blinking
         interpolate: Nearest
         maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
+        startValue: 0.1
+        endValue: 2.0
         isLooped: true
   - type: PowerCellSlot
     cellSlotId: cell_slot
@@ -238,8 +238,8 @@
         id: blinking
         interpolate: Nearest
         maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
+        startValue: 0.1
+        endValue: 2.0
         isLooped: true
   - type: Battery
     maxCharge: 600 #lights drain 3/s but recharge of 2 makes this 1/s. Therefore 600 is 10 minutes of light.
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
index e0c6557c97..ca8f7d4d06 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
@@ -37,8 +37,8 @@
       id: blinking
       interpolate: Nearest
       maxDuration: 1.0
-      minValue: 0.1
-      maxValue: 2.0
+      startValue: 0.1
+      endValue: 2.0
       isLooped: true
   - type: ToggleableVisuals
     spriteLayer: light
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 41027d2414..be07593050 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -651,7 +651,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi
-  - type: ToggleableLightVisuals
+  - type: ToggleableVisuals
     clothingVisuals:
       head:
       - state: equipped-HELMET-light
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index ec7801802b..c2b1c5abbd 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -21,6 +21,8 @@
     sprite: Clothing/Head/Hats/beret.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -40,6 +42,8 @@
     accent: FrenchAccent
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - WhitelistChameleon
@@ -58,6 +62,8 @@
     tags:
     - ClothMade
     - Recyclable
+    - PetWearable
+    - CorgiWearable
     - HamsterWearable
     - WhitelistChameleon
 
@@ -86,6 +92,10 @@
       sprite: Clothing/Head/Hats/casa.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/casa.rsi
+    - type: Tag
+      tags:
+      - PetWearable
+      - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -99,6 +109,8 @@
     sprite: Clothing/Head/Hats/beret_rnd.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -116,6 +128,8 @@
     sprite: Clothing/Head/Hats/beret_engineering.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -133,6 +147,8 @@
     sprite: Clothing/Head/Hats/beret_qm.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -150,6 +166,8 @@
     sprite: Clothing/Head/Hats/beret_hos.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -165,6 +183,10 @@
     sprite: Clothing/Head/Hats/beret_warden.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/beret_warden.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -176,6 +198,10 @@
     sprite: Clothing/Head/Hats/beret_physician.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/beret_physician.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -187,6 +213,10 @@
     sprite: Clothing/Head/Hats/beret_brigmedic.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/beret_brigmedic.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: [ ClothingHeadBase ]
@@ -198,6 +228,10 @@
     sprite: Clothing/Head/Hats/beret_merc.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/beret_merc.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -214,6 +248,8 @@
     - ClothMade
     - HamsterWearable
     - WhitelistChameleon
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -225,6 +261,10 @@
     sprite: Clothing/Head/Hats/bowler_hat.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/bowler_hat.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: [ClothingHeadBase, BaseCommandContraband]
@@ -238,6 +278,8 @@
     sprite: Clothing/Head/Hats/captain.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -268,6 +310,10 @@
     sprite: Clothing/Head/Hats/centcom.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/centcom.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -295,6 +341,8 @@
         - ChefPilot
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -312,6 +360,8 @@
     sprite: Clothing/Head/Hats/brownfedora.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -327,6 +377,10 @@
     sprite: Clothing/Head/Hats/greyfedora.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/greyfedora.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -338,6 +392,10 @@
     sprite: Clothing/Head/Hats/fez.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/fez.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: [ClothingHeadBase, BaseCommandContraband]
@@ -351,6 +409,8 @@
     sprite: Clothing/Head/Hats/hopcap.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -368,6 +428,8 @@
     sprite: Clothing/Head/Hats/hoshat.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -385,6 +447,10 @@
     sprite: Clothing/Head/Hats/outlawhat.rsi
   - type: StaticPrice
     price: 500
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -396,6 +462,10 @@
     sprite: Clothing/Head/Hats/witchhat.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/witchhat.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -407,6 +477,10 @@
     sprite: Clothing/Head/Hats/paper.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/paper.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -418,6 +492,10 @@
     sprite: Clothing/Head/Hats/pirate.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/pirate.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -452,6 +530,7 @@
     sprite: Clothing/Head/Hats/redwizard.rsi
   - type: Tag
     tags:
+    - PetWearable
     - CorgiWearable
     - ClothMade
     - WhitelistChameleon
@@ -484,8 +563,10 @@
     - state: icon-nobeard
       map: [ "foldedLayer" ]
       visible: true
-
-
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -499,6 +580,10 @@
     sprite: Clothing/Head/Hats/sombrero.rsi
   - type: AddAccentClothing
     accent: SpanishAccent
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -554,7 +639,6 @@
       HeadTop : HEAD
       HeadSide : HEAD
 
-
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatTophat
@@ -567,6 +651,8 @@
     sprite: Clothing/Head/Hats/tophat.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -647,6 +733,7 @@
     sprite: Clothing/Head/Hats/violetwizard.rsi
   - type: Tag
     tags:
+    - PetWearable
     - CorgiWearable
     - ClothMade
     - WhitelistChameleon
@@ -663,6 +750,10 @@
     sprite: Clothing/Head/Hats/warden.rsi
   - type: StealTarget
     stealGroup: ClothingHeadHatWarden
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -677,6 +768,8 @@
     sprite: Clothing/Head/Hats/witch.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - WhitelistChameleon
     - ClothMade
     - Recyclable
@@ -719,11 +812,12 @@
     sprite: Clothing/Head/Hats/wizardhat.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
     - WhitelistChameleon
-    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -932,6 +1026,8 @@
     sprite: Clothing/Head/Hats/beret_cmo.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -1055,6 +1151,9 @@
     containers:
       storagebase: !type:Container
   - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -1070,6 +1169,8 @@
     sprite: Clothing/Head/Hats/capcap.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - WhitelistChameleon
@@ -1093,6 +1194,8 @@
     sprite: Clothing/Head/Hats/comcap.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - WhitelistChameleon
@@ -1126,8 +1229,10 @@
     sprite: Clothing/Head/Hats/party_red.rsi
   - type: Tag
     tags:
-      - WhitelistChameleon
-      - HamsterWearable
+    - PetWearable
+    - CorgiWearable
+    - WhitelistChameleon
+    - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatPartyRed
@@ -1138,6 +1243,12 @@
     sprite: Clothing/Head/Hats/party_yellow.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/party_yellow.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
+    - WhitelistChameleon
+    - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatPartyRed
@@ -1148,6 +1259,12 @@
     sprite: Clothing/Head/Hats/party_green.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/party_green.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
+    - WhitelistChameleon
+    - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatPartyRed
@@ -1158,6 +1275,12 @@
     sprite: Clothing/Head/Hats/party_blue.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/party_blue.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
+    - WhitelistChameleon
+    - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatPartyRed
@@ -1169,6 +1292,12 @@
     sprite: Clothing/Head/Hats/party_water_cup.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/party_water_cup.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
+    - WhitelistChameleon
+    - HamsterWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -1211,6 +1340,12 @@
     - type: AddAccentClothing
       accent: ReplacementAccent
       replacement: cowboy
+    - type: Tag
+      tags:
+      - PetWearable
+      - CorgiWearable
+      - WhitelistChameleon
+      - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatCowboyBrown
@@ -1221,6 +1356,12 @@
       sprite: Clothing/Head/Hats/cowboyhatblack.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/cowboyhatblack.rsi
+    - type: Tag
+      tags:
+      - PetWearable
+      - CorgiWearable
+      - WhitelistChameleon
+      - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatCowboyBrown
@@ -1231,6 +1372,12 @@
       sprite: Clothing/Head/Hats/cowboyhatgrey.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/cowboyhatgrey.rsi
+    - type: Tag
+      tags:
+      - PetWearable
+      - CorgiWearable
+      - WhitelistChameleon
+      - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatCowboyBrown
@@ -1241,6 +1388,12 @@
       sprite: Clothing/Head/Hats/cowboyhatred.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/cowboyhatred.rsi
+    - type: Tag
+      tags:
+      - PetWearable
+      - CorgiWearable
+      - WhitelistChameleon
+      - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatCowboyBrown
@@ -1251,6 +1404,12 @@
       sprite: Clothing/Head/Hats/cowboyhatwhite.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/cowboyhatwhite.rsi
+    - type: Tag
+      tags:
+      - PetWearable
+      - CorgiWearable
+      - WhitelistChameleon
+      - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatCowboyBrown
@@ -1261,6 +1420,12 @@
       sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi
+    - type: Tag
+      tags:
+      - PetWearable
+      - CorgiWearable
+      - WhitelistChameleon
+      - HamsterWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -1277,6 +1442,8 @@
     node: strawhat
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - HamsterWearable
   - type: Flammable
     fireSpread: true
@@ -1316,6 +1483,10 @@
     sprite: Clothing/Head/Hats/beret_medic.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/beret_medic.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -1327,6 +1498,10 @@
     sprite: Clothing/Head/Hats/solidheadband.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/solidheadband.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -1360,3 +1535,7 @@
       path: /Audio/Items/flashlight_on.ogg
     soundDeactivate:
       path: /Audio/Items/flashlight_off.ogg
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
diff --git a/Resources/Prototypes/Entities/Clothing/Head/specific.yml b/Resources/Prototypes/Entities/Clothing/Head/specific.yml
index 1e2e55f55b..15f89da106 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/specific.yml
@@ -38,7 +38,7 @@
   - type: Storage
     showVerb: false
     grid:
-    - 0,0,6,3
+    - 0,0,3,2
     maxItemSize: Small
     blacklist:
       tags:
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index e45618b513..e1db710fec 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -324,6 +324,9 @@
   - type: IngestionBlocker
   - type: AddAccentClothing
     accent: MumbleAccent
+  - type: EmoteBlocker
+    blocksCategories:
+    - Vocal
   - type: Construction
     graph: Muzzle
     node: muzzle
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index 218e5b283c..5efd60eae7 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -293,8 +293,8 @@
         id: blinking
         interpolate: Nearest
         maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
+        startValue: 0.1
+        endValue: 2.0
         isLooped: true
   - type: Battery
     maxCharge: 600
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
index 5ba1a63ea5..26fbc0c7ae 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -182,3 +182,30 @@
     price: 75
   - type: Tag
     tags: [ ]
+   
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesBootsJump
+  name: jump boots
+  description: High-tech boots that give you the incredible ability to JUMP! With these boots you can jump over lava, chasms and weird chemicals on the floor!
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Boots/jumpboots.rsi
+    layers:
+    - state: icon
+  - type: Clothing
+    sprite: Clothing/Shoes/Boots/jumpboots.rsi
+  - type: JumpAbility
+    jumpDistance: 4
+    jumpSound: /Audio/Effects/stealthoff.ogg
+  - type: ActionGrant
+    actions:
+    - ActionGravityJump 
+  - type: ItemActionGrant
+    actions:
+    - ActionGravityJump
+    activeIfWorn: true
+  - type: StaticPrice
+    price: 220
+  - type: Tag
+    tags: []
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/animals.yml b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/animals.yml
index 5691d984b7..02d99e81c3 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/animals.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/animals.yml
@@ -86,6 +86,21 @@
     prototypes:
     - MobCockroach
 
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobMoproach
+  name: Moproach Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Animals/mothroach/moproach.rsi
+      state: icon
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobMoproach
+
 - type: entity
   parent: MarkerBase
   id: SpawnMobCow
@@ -210,7 +225,7 @@
     layers:
     - state: green
     - state: parrot
-      sprite: Mobs/Animals/parrot.rsi
+      sprite: Mobs/Animals/parrot/parrot.rsi
   - type: ConditionalSpawner
     prototypes:
     - MobParrot
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
index 0708f9a108..f590bcb508 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
@@ -218,6 +218,21 @@
     prototypes:
     - MobMonkeyPunpun
 
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobPollyParrot
+  name: Polly the parrot Spawner
+  suffix: CE Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: parrot
+      sprite: Mobs/Animals/parrot/parrot.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobPollyParrot
+
 - type: entity
   parent: MarkerBase
   id: SpawnMobPossumMorty
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
index 65f8f66106..9f952db002 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
@@ -172,6 +172,7 @@
     - id: ClothingHeadHatFancyCrown
     - id: GoldenBikeHorn
     - id: ClothingHeadHatCatEars
+    - id: GoldenPersonalAI
     - id: TreasureCoinDiamond
       amount: !type:RangeNumberSelector
         range: 2, 5
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 6def2009cc..c223efe1a0 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -172,6 +172,8 @@
       - id: ClothingUniformJumpsuitFamilyGuy
       - id: WristwatchGold
       - id: RubberStampGreytide
+      - id: MysteryLighterBox
+      - id: GoldenPersonalAI
 
 - type: entity
   name: Maint Loot Spawner
diff --git a/Resources/Prototypes/Entities/Markers/pointing.yml b/Resources/Prototypes/Entities/Markers/pointing.yml
index e347809a47..7c07405c7d 100644
--- a/Resources/Prototypes/Entities/Markers/pointing.yml
+++ b/Resources/Prototypes/Entities/Markers/pointing.yml
@@ -9,7 +9,7 @@
   - type: Sprite
     sprite: Interface/Misc/pointing.rsi
     state: pointing
-    drawDepth: Overlays
+    drawdepth: Overlays
     noRot: true
   - type: PointingArrow
     duration: 4
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
index 8a47856fec..eaca0d719c 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
@@ -165,3 +165,28 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_eye_moth_l
+
+- type: marking
+  id: TattooEyeshadowUpper
+  # there are a lot of deliberate limitations with this marking that should be pointed out. some of them may seem overly restrictive on the surface, but most of them are fully intentional.
+  # this marking is meant to be supplementary so they are transparent. if you give this 255 alpha it will probably be really distracting looking and make the face very difficult to read
+  # the reason these are also not recolorable is because allowing for the full RGB range makes these look not very good (especially considering they are stackable, and ESPECIALLY considering vox can stack 3 at once.)
+  # this is not a very big issue on humans, but is much more pronounced on vox & other nonhuman species, where the skin being more colorful can make for some truly dreadful meshing with the sprite thats definitely not desired.
+  # some of these limitations could possibly be removed with better control over how the marking can be customized - possibly removing stacking, allowing recoloring & clamping higher-end colors for the eyeshadow, etc.
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: eyeshadow_upper
+
+- type: marking
+  id: TattooEyeshadowLower
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: eyeshadow_lower
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
index 7fc3fedaa2..01d88513d8 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
@@ -18,6 +18,16 @@
     - sprite: Mobs/Customization/vox_hair.rsi
       state: braid_s
 
+- type: marking
+  id: VoxHairBushy
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: bushy_s
+
 - type: marking
   id: VoxHairCrestedQuills
   bodyPart: Hair
@@ -58,6 +68,16 @@
     - sprite: Mobs/Customization/vox_hair.rsi
       state: hawk_s
 
+- type: marking
+  id: VoxHairHedgehog
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: hedgehog_s
+
 - type: marking
   id: VoxHairHorns
   bodyPart: Hair
@@ -108,6 +128,16 @@
     - sprite: Mobs/Customization/vox_hair.rsi
       state: long_braid_s
 
+- type: marking
+  id: VoxHairMadScientist
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: mad_scientist_s
+
 - type: marking
   id: VoxHairMange
   bodyPart: Hair
@@ -188,6 +218,16 @@
     - sprite: Mobs/Customization/vox_hair.rsi
       state: shortquills_s
 
+- type: marking
+  id: VoxHairSlick
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: slick_s
+
 - type: marking
   id: VoxHairSpotty
   bodyPart: Hair
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml
index cd3588bf54..f3c0e5d204 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml
@@ -141,5 +141,24 @@
   forcedColoring: true
   sprites:
   - sprite: Mobs/Customization/vox_parts.rsi
-    # Ideally this should use the normal tail sprite and apply an actual mask over it, not just use a butchered sprite
-    state: tail_stenciled
+    state: tail
+
+- type: marking
+  id: VoxTailShort
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_parts.rsi
+    state: tail_short
+
+- type: marking
+  id: VoxTailBig
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_parts.rsi
+    state: tail_big
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml
new file mode 100644
index 0000000000..5998ddc237
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml
@@ -0,0 +1,118 @@
+- type: marking
+  id: VoxScarEyeRight
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_eye_right
+
+- type: marking
+  id: VoxScarEyeLeft
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_eye_left
+
+- type: marking
+  id: VoxScarTopSurgeryShort
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_top_surgery_short
+
+- type: marking
+  id: VoxScarTopSurgeryLong
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_top_surgery_long
+
+- type: marking
+  id: VoxScarChest
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_chest
+
+- type: marking
+  id: VoxScarNeck
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_neck
+
+- type: marking
+  id: VoxScarChestBullets
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_chest_bullets
+
+- type: marking
+  id: VoxScarStomachBullets
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_stomach_bullets
+
+- type: marking
+  id: VoxScarFace1
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_face_1
+
+- type: marking
+  id: VoxScarFace2
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_face_2
+
+- type: marking
+  id: VoxScarEyeRightSmall
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_eye_right_small
+
+- type: marking
+  id: VoxScarEyeLeftSmall
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_eye_left_small
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
index c61cfea0c6..567c3b2620 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
@@ -53,3 +53,80 @@
   sprites:
   - sprite: Mobs/Customization/vox_tattoos.rsi
     state: nightling_s
+
+- type: marking
+  id: TattooVoxTailRing
+  bodyPart: Tail
+  markingCategory: Overlay
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: tail_ring
+
+- type: marking
+  id: TattooEyeVoxRight
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+          negative: true
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: tattoo_eye_vox_r
+
+- type: marking
+  id: TattooEyeVoxLeft
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+          negative: true
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: tattoo_eye_vox_l
+
+- type: marking
+  id: TattooEyeshadowVoxSmall
+  # there are a lot of deliberate limitations with this marking that should be pointed out. some of them may seem overly restrictive on the surface, but most of them are fully intentional.
+  # this marking is meant to be supplementary so they are transparent. if you give this 255 alpha it will probably be really distracting looking and make the face very difficult to read
+  # the reason these are also not recolorable is because allowing for the full RGB range makes these look not very good (especially considering they are stackable, and ESPECIALLY considering vox can stack 3 at once.)
+  # this is not a very big issue on humans, but is much more pronounced on vox & other nonhuman species, where the skin being more colorful can make for some truly dreadful meshing with the sprite thats definitely not desired.
+  # some of these limitations could possibly be removed with better control over how the marking can be customized - possibly removing stacking, allowing recoloring & clamping higher-end colors for the eyeshadow, etc.
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: eyeshadow_small
+
+- type: marking
+  id: TattooEyeshadowVoxMedium
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: eyeshadow_medium
+
+- type: marking
+  id: TattooEyeshadowVoxLarge
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: eyeshadow_large
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 007117f993..ea24542e5a 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -217,8 +217,8 @@
       id: blinking
       interpolate: Nearest
       maxDuration: 1.0
-      minValue: 0.1
-      maxValue: 2.0
+      startValue: 0.1
+      endValue: 2.0
       isLooped: true
   - type: ToggleableVisuals
     spriteLayer: light
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 967dda00db..d46c5657c1 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1464,6 +1464,9 @@
         Piercing: 4
       groups:
         Burn: 3
+    catchingFailDamage:
+      types:
+        Blunt: 1
     clumsySound:
       path: /Audio/Animals/monkey_scream.ogg
 
@@ -1643,6 +1646,9 @@
         Piercing: 7
       groups:
         Burn: 3
+    catchingFailDamage:
+      types:
+        Blunt: 1
     clumsySound:
       path: /Audio/Voice/Reptilian/reptilian_scream.ogg
 
@@ -2168,9 +2174,9 @@
 
 # Would be cool to have some functionality for the parrot to be able to sit on stuff
 - type: entity
-  name: parrot
   parent: [ SimpleMobBase, FlyingMobBase ]
-  id: MobParrot
+  id: MobParrotBase
+  abstract: true
   description: Infiltrates your domain, spies on you, and somehow still a cool pet.
   components:
   - type: MovementSpeedModifier
@@ -2181,7 +2187,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: parrot
-      sprite: Mobs/Animals/parrot.rsi
+      sprite: Mobs/Animals/parrot/parrot.rsi
   - type: Fixtures
     fixtures:
       fix1:
@@ -2211,7 +2217,29 @@
   - type: Vocal
     sounds:
       Unsexed: Parrot
-  - type: ParrotAccent
+  - type: ActiveListener
+  - type: Vocalizer
+  - type: RadioVocalizer
+  - type: ParrotListener
+  - type: ParrotMemory
+  - type: Inventory
+    templateId: parrot
+    speciesId: parrot
+    # transparent displacement map to hide the headset. this should be an animated displacement map to follow the parrot
+    # as it bobs up and down, but this in turn needs some way to change the displacement map on inventory entities when
+    # the parrot dies, otherwise the visuals will be broken
+    displacements:
+      ears:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/parrot/displacement.rsi
+            state: ears
+  - type: InventorySlots
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+      enum.StrippingUiKey.Key:
+        type: StrippableBoundUserInterface
   - type: InteractionPopup
     successChance: 0.6
     interactSuccessString: petting-success-bird
@@ -2222,6 +2250,13 @@
   - type: Bloodstream
     bloodMaxVolume: 50
 
+- type: entity
+  name: parrot
+  parent: MobParrotBase
+  id: MobParrot
+  components:
+  - type: ParrotAccent # regular parrots have a parrotaccent. Polly is special and does not
+
 - type: entity
   name: penguin
   parent: SimpleMobBase
@@ -3761,13 +3796,18 @@
       belt:
         sizeMaps:
           32:
-            sprite: Mobs/Pets/corgi.rsi
-            state: belt_displacement
+            sprite: Mobs/Pets/displacements.rsi
+            state: corgi_belt_displacement
       ears:
         sizeMaps:
           32:
-            sprite: Mobs/Pets/corgi.rsi
-            state: belt_displacement
+            sprite: Mobs/Pets/displacements.rsi
+            state: corgi_belt_displacement
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/displacements.rsi
+            state: corgi_head_displacement
   - type: Hands # HANDS!
   - type: Puller
   - type: Cuffable # bad dog!
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 971f5e1dc6..864d03cd2a 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -76,6 +76,7 @@
       tags:
         - Carp
         - DoorBumpOpener
+        - CannotSuicide
     - type: ReplacementAccent
       accent: genericAggressive
     - type: Speech
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index 7b435a2625..c3fc1ec959 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -399,7 +399,6 @@
     solution: bloodstream
     transferAmount: 5
   - type: DamageStateVisuals
-    rotate: true
     states:
       Alive:
         Base: alive
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/moproach.yml b/Resources/Prototypes/Entities/Mobs/NPCs/moproach.yml
new file mode 100644
index 0000000000..c38b2cedf7
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/moproach.yml
@@ -0,0 +1,55 @@
+- type: entity
+  name: moproach
+  parent: MobMothroach
+  id: MobMoproach
+  description: This little mothroach has mopshoes on its feet! How adorable!
+  components:
+  - type: GhostRole
+    name: ghost-role-information-moproach-name
+    description: ghost-role-information-moproach-description
+  - type: Sprite
+    sprite: Mobs/Animals/mothroach/moproach.rsi
+  - type: Clothing
+    quickEquip: false
+    sprite: Mobs/Animals/mothroach/moproach.rsi
+    equippedPrefix: 0
+    slots:
+    - HEAD
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      45: Critical
+      65: Dead
+  - type: MovementSpeedModifier
+    baseSprintSpeed : 5 # extra speed for that moppin'!
+  - type: HTN
+    rootTask:
+      task: MoproachCompound
+  - type: Absorbent
+    pickupAmount: 2 # small feet
+  - type: UseDelay
+    delay: 0.5 # quick feet
+  - type: SolutionRegeneration
+    solution: absorbed
+    generated:
+      reagents:
+        - ReagentId: Water
+          Quantity: 10
+  - type: SolutionPurge
+    solution: absorbed
+    preserve:
+      - Water
+    quantity: 10
+  - type: SolutionContainerManager
+    solutions:
+      absorbed:
+        maxVol: 50
+      food:
+        reagents:
+        - ReagentId: Slime
+          Quantity: 5
+  - type: DrainableSolution
+    solution: drainBuffer
+  - type: InteractionPopup
+    interactSuccessString: petting-success-cleanbot
+    interactFailureString: petting-failure-cleanbot
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 738b1ac129..75aacadd35 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -13,6 +13,20 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: ian
+  - type: Inventory
+    speciesId: dog
+    templateId: petAdvanced
+    displacements:
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/displacements.rsi
+            state: corgi_head_displacement
+      eyes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/displacements.rsi
+            state: corgi_eyes_displacement
   - type: DamageStateVisuals
     states:
       Alive:
@@ -84,6 +98,20 @@
     attributes:
       proper: true
       gender: female
+  - type: Inventory
+    speciesId: dog
+    templateId: petAdvanced
+    displacements:
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/displacements.rsi
+            state: lisa_head_displacement
+      eyes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/displacements.rsi
+            state: corgi_eyes_displacement
 
 - type: entity
   name: real mouse
@@ -280,6 +308,8 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: mcgriff
+    - map: [ "head" ]
+    - map: [ "eyes" ]
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -294,7 +324,18 @@
         - MobLayer
   - type: Inventory
     speciesId: puppy
-    templateId: pet
+    templateId: petAdvanced
+    displacements:
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/displacements.rsi
+            state: mcgriff_head_displacement
+      eyes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/displacements.rsi
+            state: mcgriff_eyes_displacement
   - type: DamageStateVisuals
     states:
       Alive:
@@ -671,6 +712,8 @@
       types:
         Piercing: 8
         Poison: 8
+  - type: Spider
+    spawnsWebsAsNonPlayer: false
   - type: Grammar
     attributes:
       proper: true
@@ -858,3 +901,21 @@
 #  - type: AlwaysRevolutionaryConvertible
   - type: StealTarget
     stealGroup: AnimalTropico
+
+- type: entity
+  name: Polly the parrot
+  parent: MobParrotBase
+  id: MobPollyParrot
+  description: An expert in quantum cracker theory
+  components:
+  - type: Vocalizer
+    maxVocalizeInterval: 240 # polly is chattier
+  - type: RadioVocalizer
+    radioAttemptChance: 0.8 # polly wants to share with the world
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: male
+  - type: Loadout
+    prototypes: [ MobPollyGear ]
+
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index e27911880f..711a638ec8 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -79,7 +79,6 @@
       Dead: 0
     baseDecayRate: 0.1
   - type: DamageStateVisuals
-    rotate: true
     states:
       Alive:
         Base: regalrat
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 1c70e55d66..13bce86b06 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -6,6 +6,8 @@
   name: revenant
   description: A spooky ghostie.
   components:
+  - type: Emag
+    emagType: All
   - type: Input
     context: "ghost"
   - type: Spectral
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index e0518be3b2..382de8e085 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -159,8 +159,9 @@
     interactFailureString: petting-failure-firebot
     interactSuccessSound:
       path: /Audio/Ambience/Objects/periodic_beep.ogg
-  - type: Advertise
-    pack: FirebotAd
+  - type: Vocalizer
+  - type: DatasetVocalizer
+    dataset: FirebotAd
 
 - type: entity
   parent: MobSiliconBase
@@ -355,8 +356,9 @@
     interactFailureString: petting-failure-medibot
     interactSuccessSound:
       path: /Audio/Ambience/Objects/periodic_beep.ogg
-  - type: Advertise
-    pack: MedibotAds
+  - type: Vocalizer
+  - type: DatasetVocalizer
+    dataset: MedibotAds
   - type: Inventory
     templateId: medibot
   - type: DoAfter
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 8c3b0521be..58c4e9c22b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -79,7 +79,6 @@
       groups:
         Brute: 6
   - type: DamageStateVisuals
-    rotate: true
     states:
       Alive:
         Base: running
@@ -504,7 +503,6 @@
      groups:
        Brute: 5
   - type: DamageStateVisuals
-    rotate: true
     states:
       Alive:
         Base: running
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 53a3b9237a..7c482fdd06 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -110,6 +110,8 @@
   - type: Loadout
     prototypes: [ MobAghostGear ]
   - type: BypassInteractionChecks
+  - type: ExplosionResistance
+    damageCoefficient: 0
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Mobs/Player/clone.yml b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
index 9ca2bfaf6d..bdf741e58a 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/clone.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
@@ -33,6 +33,7 @@
   - MindShield
   - MimePowers
   - SpaceNinja
+  - Thieving
   # accents
   - Accentless
   - BackwardsAccent
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index fc2dddb23d..0d6489744f 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -136,8 +136,12 @@
         Piercing: 15
         Slash: 15
   - type: Devourer
-    foodPreference: Humanoid
-    shouldStoreDevoured: true
+    foodPreferenceWhitelist:
+      components:
+      - HumanoidAppearance
+    stomachStorageWhitelist:
+      components:
+      - MobState
     chemical: Ichor
     healRate: 7.5
     whitelist:
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index 0aee45e28e..1b81b0d099 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -239,6 +239,9 @@
           Piercing: 4
         groups:
           Burn: 3
+      catchingFailDamage:
+        types:
+          Blunt: 1
     - type: MeleeWeapon
       angle: 30
       animation: WeaponArcFist
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index d70c13187f..303f7dc676 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -190,6 +190,7 @@
         acts: [ "Destruction" ]
   - type: ApcPowerReceiver
     powerLoad: 1000
+    needsPower: false
   - type: StationAiCore
   - type: StationAiVision
   - type: InteractionOutline
@@ -218,7 +219,6 @@
     listeningRange: 0
     speakerVolume: Speak
     unlistedNumber: true
-    requiresPower: false
   - type: Holopad
   - type: StationAiWhitelist
   - type: UserInterface
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index eca64cd5ed..3d40ff7433 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -278,6 +278,7 @@
         Asphyxiation: -1.0
   - type: FireVisuals
     alternateState: Standing
+  - type: StunVisuals
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index adde0d88a2..baa89a86cf 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -48,8 +48,8 @@
       Female: UnisexMoth
       Unsexed: UnisexMoth
   - type: MovementSpeedModifier
-    weightlessAcceleration: 1.5 # Move around more easily in space.
-    weightlessFriction: 1
+    baseWeightlessAcceleration: 1.5 # Move around more easily in space.
+    baseWeightlessFriction: 1
     baseWeightlessModifier: 1
   - type: Flammable
     damage:
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index dda61b7c60..2e40de09f0 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -44,6 +44,7 @@
   - type: MovementSpeedModifier
   - type: RequireProjectileTarget
     active: False
+  - type: StunVisuals
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index 11da44f898..c2ac4c606f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -215,6 +215,8 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 5
     fillBaseName: fill-
+    inHandsMaxFillLevels: 3
+    inHandsFillBaseName: -fill-
 
 # Large Glass Bottles
 
@@ -719,9 +721,6 @@
           Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/waterbottle.rsi
-  - type: SolutionContainerVisuals
-    inHandsMaxFillLevels: 2
-    inHandsFillBaseName: -fill-
   - type: Label
     currentLabel: reagent-name-water
   - type: Sealable
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
index ed2324811e..22ff617809 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
@@ -168,3 +168,5 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 5
     fillBaseName: fill-
+    inHandsMaxFillLevels: 3
+    inHandsFillBaseName: -fill-
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index 00df6b5b68..a0cc580118 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -277,7 +277,7 @@
       prob: 0.05
       orGroup: Pizza
     - id: KnifePlastic
-  
+
 - type: entity
   name: pizza box
   parent: FoodBoxPizzaFilled
@@ -372,6 +372,9 @@
     contents:
     - id: FoodDonkpocket
       amount: 6
+    - id: DonkcoLighter
+      amount: 1
+      prob: 0.10
 
 - type: entity
   parent: FoodBoxDonkpocket
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 90a8e98af1..60a4ae9406 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -90,6 +90,8 @@
   components:
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/oat.rsi
+  - type: Item
+    heldPrefix: produce
   - type: SolutionContainerManager
     solutions:
       food:
@@ -435,6 +437,8 @@
     - Recyclable
     - Trash
     - BananaPeel
+    - WhitelistChameleon
+    - HamsterWearable
   - type: SolutionContainerManager
     solutions:
       food:
@@ -447,12 +451,21 @@
   - type: SpaceGarbage
   - type: Food
     requiresSpecialDigestion: true
+  - type: Clothing
+    sprite: Objects/Specific/Hydroponics/banana.rsi
+    equippedState: peel-equipped-HELMET
+    slots:
+    - HEAD
+    quickEquip: false
 
 - type: entity
   name: baked banana peel
   parent: TrashBananaPeel
   id: TrashBakedBananaPeel
   components:
+  - type: Clothing
+    sprite: Objects/Specific/Hydroponics/banana.rsi
+    equippedState: baked-peel-equipped-HELMET
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/banana.rsi
     state: baked-peel
@@ -481,6 +494,9 @@
   - type: Item
     sprite: Objects/Specific/Hydroponics/mimana.rsi
     heldPrefix: peel
+  - type: Clothing
+    sprite: Objects/Specific/Hydroponics/mimana.rsi
+    equippedState: equipped-HELMET
   - type: Slippery
     slipSound:
       path: /Audio/Effects/slip.ogg
@@ -499,6 +515,9 @@
     sprite: Objects/Materials/materials.rsi
     heldPrefix: peel
   - type: Slippery
+  - type: Clothing
+    sprite: Objects/Materials/materials.rsi
+    equippedState: peel-equipped-HELMET
 
 - type: entity
   name: carrot
@@ -1070,6 +1089,8 @@
           Quantity: 4
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/apple.rsi
+  - type: Item
+    heldPrefix: produce
   - type: Produce
     seedId: apple
   - type: Extractable
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
index db4406905a..0a975702aa 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
@@ -19,6 +19,7 @@
   - type: Tag
     tags:
     - Payload
+    - RemoteSignaller
   - type: DeviceNetwork
     deviceNetId: Wireless
     receiveFrequencyId: BasicDevice
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/war_declarator.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/war_declarator.yml
index 78009f1042..13b12c5111 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/war_declarator.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/war_declarator.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, BaseSyndicateContraband ]
   id: NukeOpsDeclarationOfWar
   name: war declarator
   description: Use to send a declaration of hostilities to the target, delaying your shuttle departure while they prepare for your assault. Such a brazen move will attract the attention of powerful benefactors within the Syndicate, who will supply your team with a massive amount of bonus telecrystals. Must be used at start of mission, or your benefactors will lose interest.
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index c5218dea9f..2082d9a152 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -219,7 +219,7 @@
     state: pda-internmed
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
 
 - type: entity
   parent: BaseSecurityPDA
@@ -759,7 +759,7 @@
     state: pda-medical
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
 
 - type: entity
   parent: MedicalPDA
@@ -923,6 +923,7 @@
     id: CentcomIDCard
     penSlot:
       startingItem: PenCentcom
+      priority: -1
       whitelist:
         tags:
         - Write
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
index 2f894cdaf2..3247728b5f 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
@@ -106,6 +106,8 @@
     program: 79
   - type: Sprite
     sprite: Objects/Fun/Instruments/ocarina.rsi
+  - type: Item
+    size: Small
 
 - type: entity
   parent: BaseWoodwindInstrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
index dbbe86678f..6c466ea7c0 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
@@ -133,3 +133,62 @@
       - id: ToyFigurineHamlet
         prob: 0.20
         orGroup: SpacemenFig
+
+- type: entity
+  parent: BaseItem
+  id: MysteryLighterBox
+  name: Novelty lighter mystery box
+  suffix: Filled
+  description: A box of discontinued promotional lighters, many of which have since been declared "contraband".
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/figurines.rsi
+    layers:
+    - state: fig_box
+  - type: SpawnItemsOnUse
+    items:
+      - id: MysteryFigureBoxTrash
+      - id: CybersunFlippo
+        orGroup: Lighterbox
+        weight: 0.15
+      - id: InterdyneFlippo
+        orGroup: Lighterbox
+        weight: 0.15
+      - id: NanotrasenFlippo
+        orGroup: Lighterbox
+        weight: 0.25
+      - id: WaffleCoFlippo
+        orGroup: Lighterbox
+        weight: 0.35
+      - id: HonkCoFlippo
+        orGroup: Lighterbox
+      - id: GorlexMatchbox
+        orGroup: Lighterbox
+        weight: 0.15
+      - id: DonkcoLighter
+        orGroup: Lighterbox
+        weight: 0.25
+      - id: SyndicateFlippo
+        orGroup: Lighterbox
+        weight: 0.15
+
+- type: entity
+  parent: MysteryLighterBox
+  id: UplinkLighterBox
+  suffix: Uplink
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: MysteryFigureBoxTrash
+      - id: CybersunFlippo
+        orGroup: Lighterbox
+      - id: InterdyneFlippo
+        orGroup: Lighterbox
+      - id: WaffleCoFlippo
+        orGroup: Lighterbox
+      - id: GorlexMatchbox
+        orGroup: Lighterbox
+      - id: DonkcoLighter
+        orGroup: Lighterbox
+      - id: SyndicateFlippo
+        orGroup: Lighterbox
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 23227a65ee..6aec812b77 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -93,6 +93,12 @@
       components:
         - SecretStash
         - WrappedParcel
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSilicon
+  - type: Tag
+    tags:
+    - SiliconEmotes
 
 - type: entity
   parent: [ PersonalAI, BaseSyndicateContraband]
@@ -129,6 +135,26 @@
           On: { state: syndicate-pai-on-overlay }
   - type: StaticPrice
     price: 500
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSiliconSyndicate
+
+- type: entity
+  parent: PersonalAI
+  id: GoldenPersonalAI
+  name: golden personal ai device
+  description: Your electronic pal who's fun to be with! Special golden edition!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/pai.rsi
+    layers:
+    - state: golden-pai-base
+    - state: pai-off-overlay
+      shader: unshaded
+      map: ["screen"]
+  - type: Appearance
+  - type: StaticPrice
+    price: 5000
 
 - type: entity
   parent: PersonalAI
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 4daffe1c56..6ed36af773 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -396,6 +396,20 @@
   - type: Sprite
     sprite: Objects/Fun/Balls/basketball.rsi
     state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.25
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.8 # bouncy
+        friction: 0.2
+  - type: Catchable
+    catchChance: 0.8
+    catchSuccessSound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
   - type: EmitSoundOnCollide
     sound:
       path: /Audio/Effects/Footsteps/bounce.ogg
@@ -414,6 +428,23 @@
   - type: Sprite
     sprite: Objects/Fun/Balls/football.rsi
     state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.25
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.5 # a little bouncy
+        friction: 0.2
+  - type: Catchable
+    catchChance: 0.8
+    catchSuccessSound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
   - type: Item
     size: Small
     sprite: Objects/Fun/Balls/football.rsi
@@ -427,6 +458,21 @@
   - type: Sprite
     sprite: Objects/Fun/Balls/beach_ball.rsi
     state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.3
+          position: "0,-0.2"
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.1 # not bouncy
+        friction: 0.2
+  - type: Catchable
+    catchChance: 0.8
+    catchSuccessSound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
   - type: EmitSoundOnCollide
     sound:
       path: /Audio/Effects/Footsteps/bounce.ogg
@@ -525,9 +571,9 @@
   components:
   - type: Sprite
     sprite: Structures/Power/Generation/Tesla/energy_miniball.rsi
-    shader: unshaded
     layers:
     - state: tesla_projectile
+      shader: unshaded
   - type: Item
     inhandVisuals:
       left:
@@ -559,8 +605,9 @@
   components:
   - type: Sprite
     sprite: Objects/Fun/pondering_orb.rsi
-    state: icon
-    shader: unshaded
+    layers:
+    - state: icon
+      shader: unshaded
   - type: PointLight
     radius: 2
     color: "#00CCFF"
@@ -628,7 +675,7 @@
     color: white
     netsync: false
   - type: Appearance
-  - type: ToggleableLightVisuals
+  - type: ToggleableVisuals
     spriteLayer: blade
     inhandVisuals:
       left:
@@ -799,7 +846,6 @@
   - type: Sprite
     sprite: Objects/Fun/whoopie.rsi
     state: icon
-    quickEquip: false
   - type: Tag
     tags:
     - Payload
diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml
index db604f92d3..db0d3c8d51 100644
--- a/Resources/Prototypes/Entities/Objects/Magic/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml
@@ -69,7 +69,7 @@
   components:
     - type: Spellbook
       spellActions:
-        ActionSpawnMagicarpSpell: -1
+        ActionSpawnMagicarpSpell: null
 
 - type: entity
   id: ForceWallSpellbook
@@ -92,7 +92,7 @@
         color: gold
     - type: Spellbook
       spellActions:
-        ActionForceWall: -1
+        ActionForceWall: null
 
 - type: entity
   id: BlinkBook
@@ -113,7 +113,7 @@
         color: gold
     - type: Spellbook
       spellActions:
-        ActionBlink: -1
+        ActionBlink: null
 
 - type: entity
   id: SmiteBook
@@ -136,7 +136,7 @@
       - state: overlay_blood
     - type: Spellbook
       spellActions:
-        ActionSmiteNoReq: -1
+        ActionSmiteNoReq: null
 
 - type: entity
   id: KnockSpellbook
@@ -158,7 +158,7 @@
         color: "#98c495"
     - type: Spellbook
       spellActions:
-        ActionKnock: -1
+        ActionKnock: null
 
 - type: entity
   id: FireballSpellbook
@@ -182,7 +182,7 @@
         shader: unshaded
     - type: Spellbook
       spellActions:
-        ActionFireball: -1
+        ActionFireball: null
 
 - type: entity
   id: ScrollRunes
@@ -197,7 +197,7 @@
     - state: spell_default
   - type: Spellbook
     spellActions:
-      ActionFlashRune: -1
-      ActionExplosionRune: -1
-      ActionIgniteRune: -1
-      ActionStunRune: -1
+      ActionFlashRune: null
+      ActionExplosionRune: null
+      ActionIgniteRune: null
+      ActionStunRune: null
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index eaae4d410a..db3fc4961e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -21,8 +21,8 @@
         id: blinking
         interpolate: Nearest
         maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
+        startValue: 0.1
+        endValue: 2.0
         isLooped: true
   - type: PowerCellSlot
     cellSlotId: cell_slot
diff --git a/Resources/Prototypes/Entities/Objects/Misc/intermediate_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/intermediate_parts.yml
new file mode 100644
index 0000000000..b0774a1c2c
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/intermediate_parts.yml
@@ -0,0 +1,15 @@
+### For items thare are used as intermediate steps on a crafting recipe but have no use outside of it.
+- type: entity
+  parent: BaseItem
+  id: MoproachShoes
+  name: moproach shoes
+  description: Three pairs of tiny mopshoes, perfectly fit for a moproach.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/moproach_shoes.rsi
+    state: mopshoes
+  - type: Construction
+    graph: MoproachShoes
+    node: shoes
+  - type: Item
+    size: Tiny
diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
index bead4786b1..a9329b6782 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
@@ -42,6 +42,20 @@
     damage:
       types:
         Piercing: 3
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PolygonShape
+          vertices:
+          - -0.3,0.1
+          - -0.1,0.3
+          - 0.3,-0.1
+          - 0.1,-0.3
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
 
 #TODO: I want the luxury pen to write a cool font like Merriweather in the future.
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
index 8f4488ba51..18995446b1 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -94,3 +94,58 @@
     useDelay: 1
   - type: InstantAction
     event: !type:SummonActionEvent
+
+- type: entity
+  parent: Bible
+  name: tanakh
+  description: "For God's chosen crewmembers"
+  id: BibleTanakh
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chapel/tanakh.rsi
+  - type: Item
+    sprite: Objects/Specific/Chapel/tanakh.rsi
+
+- type: entity
+  parent: Bible
+  name: druidic tablet
+  description: "It's the mystery of the druids!"
+  id: BibleDruid
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chapel/mysteryofthedruids.rsi
+  - type: Item
+    sprite: Objects/Specific/Chapel/mysteryofthedruids.rsi
+
+- type: entity
+  parent: Bible
+  name: communist manifesto
+  description: "Remove the mask of humanity from Capital."
+  id: BibleCommunistManifesto
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chapel/communistmanifesto.rsi
+  - type: Item
+    sprite: Objects/Specific/Chapel/communistmanifesto.rsi
+
+- type: entity
+  parent: Bible
+  name: satanic bible
+  description: "What could possibly go wrong?"
+  id: BibleSatanic
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chapel/satanicbible.rsi
+  - type: Item
+    sprite: Objects/Specific/Chapel/satanicbible.rsi
+
+- type: entity
+  parent: Bible
+  name: codex nanotrasimus
+  description: "A familiar book containing the Sacred Operating Procedures."
+  id: BibleNanoTrasen
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chapel/codexnanotrasimus.rsi
+  - type: Item
+    sprite: Objects/Specific/Chapel/codexnanotrasimus.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 49287d4a2a..f23bd43866 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -240,7 +240,7 @@
       projectile:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.1,-0.1,0.1,0.1"
+          bounds: "-0.2,-0.4,0.2,-0.1"
         hard: false
         mask:
         - Impassable
@@ -248,6 +248,7 @@
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/pop.ogg
     embedOnThrow: True
+    offset: "0,-0.1"
   - type: ThrowingAngle
     angle: 0
   - type: LandAtCursor
@@ -301,6 +302,7 @@
     SpacemenFigureSpawner: 28
     SpawnMobCockroach: 5
     MaintenanceToolSpawner: 5
+    SpawnMobMoproach: 2
 
 - type: entity
   parent: BaseItem
@@ -352,3 +354,39 @@
     - type: Fiber
       fiberColor: fibers-white
     - type: DnaSubstanceTrace
+
+- type: entity
+  parent: BaseItem
+  id: WireBrush
+  name: wire brush
+  description: A bristly steel wire brush, perfect for scraping away even the toughest patches of rust.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Janitorial/wirebrush.rsi
+    state: icon
+  - type: Item
+    storedSprite:
+      sprite: Objects/Specific/Janitorial/wirebrush.rsi
+      state: storage
+    size: Small
+  - type: Tag
+    tags:
+    - WireBrush
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 50
+      Plastic: 50
+  - type: Tool
+    qualities:
+    - Brushing
+    useSound:
+      path: /Audio/Items/wirebrushing.ogg
+  - type: StaticPrice
+    price: 22
+  - type: MeleeWeapon
+    wideAnimationRotation: 45
+    damage:
+      types:
+        Piercing: 3
+    soundHit:
+      path: "/Audio/Weapons/bladeslice.ogg"
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
index 1b9f32009a..5fc9883306 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
@@ -73,7 +73,6 @@
   description: Get out there and slang some dogs.
   components:
     - type: Sprite
-      netSync: false
       noRot: true
       sprite: Objects/Specific/Kitchen/food_carts.rsi
       layers:
@@ -154,7 +153,6 @@
   description: It's the Ice Cream Man! It's the Ice Cream Man!
   components:
     - type: Sprite
-      netSync: false
       noRot: true
       sprite: Objects/Specific/Kitchen/food_carts.rsi
       layers:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
index eb07b695aa..894454b05c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
@@ -39,7 +39,7 @@
       price: 30
     - type: GuideHelp
       guides:
-      - Medical Doctor
+      - MedicalDoctor
 
 - type: entity
   id: Defibrillator
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
index 845e274490..0f2259f7e9 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
@@ -40,7 +40,7 @@
           False: { visible: false }
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
 
 - type: entity
   id: HandheldHealthAnalyzer
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 86214ca224..ebd785ab7e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -473,7 +473,7 @@
     inHandsMaxFillLevels: 3
     inHandsFillBaseName: -fill-
   - type: EmbeddableProjectile
-    offset: "-0.1,0"
+    offset: "0,-0.1"
     minimumSpeed: 3
     removalTime: 0.25
     embedOnThrow: false
diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
index 52a730f773..0d8a7d49d6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
@@ -116,6 +116,15 @@
     possibleSpawns:
     - MobMothroach
 
+- type: entity
+  parent: RehydratableAnimalCube
+  id: MoproachCube
+  name: moproach cube
+  components:
+  - type: Rehydratable
+    possibleSpawns:
+    - MobMoproach
+
 - type: entity
   parent: RehydratableAnimalCube
   id: MouseCube
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
index c63265ef7d..6fd27c4302 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -24,8 +24,8 @@
         id: blinking
         interpolate: Nearest
         maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
+        startValue: 0.1
+        endValue: 2.0
         isLooped: true
   - type: ToggleableVisuals
     spriteLayer: light
diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
index c577cd8e58..e000b99638 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
@@ -134,8 +134,8 @@
         - !type:PulseBehaviour
           interpolate: Cubic
           maxDuration: 10.0
-          minValue: 1.0
-          maxValue: 7.0
+          startValue: 1.0
+          endValue: 7.0
           isLooped: true
           property: Energy
           enabled: true
@@ -198,7 +198,7 @@
           interpolate: Nearest
           minDuration: 0.2
           maxDuration: 1.0
-          maxValue: 0.2
+          endValue: 0.2
           property: AnimatedEnable
           isLooped: true
           enabled: true
@@ -237,8 +237,8 @@
         - !type:FadeBehaviour
           interpolate: Cubic
           maxDuration: 5.0
-          minValue: 0.0
-          maxValue: 10.0
+          startValue: 0.0
+          endValue: 10.0
           isLooped: true
           property: Energy
           enabled: true
@@ -269,8 +269,8 @@
           interpolate: Cubic
           minDuration: 1.0
           maxDuration: 5.0
-          minValue: 2.0
-          maxValue: 10.0
+          startValue: 2.0
+          endValue: 10.0
           isLooped: true
           enabled: true
 
@@ -300,7 +300,7 @@
         - !type:RandomizeBehaviour
           interpolate: Nearest
           maxDuration: 0.5
-          minValue: 10.0
-          maxValue: 25.0
+          startValue: 10.0
+          endValue: 25.0
           isLooped: true
           enabled: true
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
index 24fdb88ed5..93a0f927e1 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -21,8 +21,8 @@
         id: blinking
         interpolate: Nearest
         maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
+        startValue: 0.1
+        endValue: 2.0
         isLooped: true
     - type: Sprite
       sprite: Objects/Tools/lantern.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index a5e0afbc7f..a55c020825 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -20,7 +20,7 @@
     activatedSize: Small
   - type: ItemToggleHot
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: icon_map
     - state: cheap_icon_base
@@ -62,7 +62,7 @@
         shader: unshaded
   - type: Item
     size: Tiny
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
   - type: UseDelay
   - type: RefillableSolution
     solution: Welder
@@ -97,7 +97,7 @@
   description: "A dangerously inexpensive plastic lighter, don't burn your thumb!"
   components:
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: icon_map
     - state: cheap_icon_base
@@ -126,7 +126,7 @@
   description: "A rugged metal lighter, lasts quite a while."
   components:
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: zippo_icon_base
       map: ["base"]
@@ -159,7 +159,7 @@
   - type: ItemToggleHot
   - type: Item
     size: Tiny
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     heldPrefix: zippo
   - type: Appearance
   - type: GenericVisualizer
@@ -219,7 +219,7 @@
   description: "A rugged golden lighter, lasts quite a while. Engravings serve no tactical advantage whatsoever."
   components:
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: zippo_engraved_icon_base
       map: ["base"]
@@ -235,3 +235,404 @@
       shader: unshaded
   - type: StealTarget
     stealGroup: FlippoEngravedLighter
+
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BaseBrandedLighter
+  components:
+  - type: ItemToggle
+    predictable: false
+    soundActivate:
+      path: /Audio/Items/Lighters/zippo_open.ogg
+      params:
+        volume: -5
+    soundDeactivate:
+      path: /Audio/Items/Lighters/zippo_close.ogg
+      params:
+        volume: -5
+  - type: ItemToggleMeleeWeapon
+    activatedDamage:
+        types:
+            Heat: 1
+  - type: ItemToggleSize
+    activatedSize: Small
+  - type: ItemToggleHot
+  - type: Item
+    size: Tiny
+  - type: Appearance
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 12
+        maxVol: 12
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "base" ]
+    - state: top
+      map: [ "top" ]
+      visible: false
+    - state: open
+      map: [ "open" ]
+      visible: false
+    - state: flame
+      map: [ "flame" ]
+      visible: false
+      shader: unshaded
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleableVisuals.Enabled:
+        flame:
+          True: { visible: true }
+          False: { visible: false }
+        open:
+          True: { visible: true }
+          False: { visible: false }
+        top:
+          True: { visible: true }
+          False: { visible: false }
+        base:
+          True: { visible: false }
+          False: { visible: true }
+  - type: ToggleableVisuals
+    spriteLayer: lighter_flame
+    inhandVisuals:
+      left:
+      - state: inhand-left-lit
+        shader: unshaded
+      right:
+      - state: inhand-right-lit
+        shader: unshaded
+  - type: ItemTogglePointLight
+  - type: UseDelay
+  - type: IgnitionSource
+    ignited: false
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: SyndicateFlippo
+  name: Blood-red flippo
+  description: "A 'Valid' choice in lighters. Contains no copper."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/syndielighter.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/syndielighter.rsi
+  - type: Welder
+    fuelConsumption: 0.005
+    fuelLitCost: 0.01
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: green
+
+- type: entity
+  parent: Lighter
+  id: DiscountDanLighter
+  name: Discount Dan's lighter
+  description: "The worst lighter ever produced, lighterburn is inevitable, do not refuel while lit."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/lighters.rsi
+    layers:
+    - state: icon_map
+    - state: discount_icon_base
+      map: [ "skin" ]
+    - state: basic_icon_top
+    - state: lighter_flame
+      visible: false
+      shader: unshaded
+      map: [ "flame" ]
+  - type: Welder # the single worst lighter invented by mankind
+    fuelConsumption: 0.2
+    fuelLitCost: 0.1
+    tankSafe: false
+  - type: Item
+    sprite: Objects/Tools/Lighters/lighters.rsi
+  - type: ToggleableVisuals
+    spriteLayer: lighter_flame
+    inhandVisuals:
+      left:
+      - state: inhand-left-flame
+        shader: unshaded
+      right:
+      - state: inhand-right-flame
+        shader: unshaded
+  - type: RandomSprite
+    available:
+      - skin:
+          discount_icon_base: ""
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 1.5
+    color: yellow
+  - type: ComponentToggler
+    components:
+    - type: DamageOnHolding
+      damage:
+        types:
+          Heat: 2
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 3
+        maxVol: 3
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: CybersunFlippo
+  name: CyberSun Flippo
+  description: "A Sleek black and magenta flippo lighter, bearing the logo and iconography of CyberSun Industries."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/cybersun.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/cybersun.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 0.01
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: magenta
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: InterdyneFlippo
+  name: Interdyne Flippo
+  description: "A deep blue flippo lighter, decorated with the logo of Interdyne Pharmaceuticals' 'Gene Clean' clinics. Become the master of your own cigarette."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/interdyne.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/interdyne.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 0.01
+    tankSafe: true
+  - type: ItemToggleMeleeWeapon
+    activatedDamage:
+        types:
+          Radiation: 1
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: cyan
+
+- type: entity
+  parent: [BaseBrandedLighter]
+  id: NanotrasenFlippo
+  name: Nanotrasen Flippo
+  description: "A navy blue luxury flippo, generally handed out to loyal heads of staff instead of a payraise. Fueled with liquid plasma"
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/nanotrasen.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/nanotrasen.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 1
+    fuelReagent: Plasma
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: blue
+  - type: RefillableSolution
+    solution: Welder
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 10
+        maxVol: 10
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseCentcommContraband]
+  id: CentCommFlippo
+  name: Gilded CentComm Flippo
+  description: "An Ornate, jade embossed and gilded flippo frame containing a bluespace powered jet. The latch is secured by a miniature access reader that only responds to CentComm officials. The nicest lighter known to man."
+  suffix: DO NOT MAP
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/centcomm.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/centcomm.rsi
+  - type: ItemToggleRequiresLock
+    requireLocked: false
+  - type: Welder #
+    fuelConsumption: 0.0
+    fuelLitCost: 10
+    fuelReagent: Plasma
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 4 #Excessively powerful
+    color: Gold
+  - type: RefillableSolution
+    solution: Welder
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 999
+        maxVol: 999
+  - type: Tool
+    useSound:
+      collection: Welder
+    qualities: Welding
+  - type: SolutionRegeneration
+    solution: Welder
+    generated:
+      reagents:
+      - ReagentId: Plasma
+        Quantity: 0.1
+  - type: Lock
+  - type: AccessReader
+    access: [["CentralCommand"]]
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseMajorContraband]
+  id: SpiderclanFlippo
+  name: Spider-Clan lighter
+  description: "A high tech jet lighter, engineered to function even in deep space. Runs on a tiny microfusion cell."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/spiderclan.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/spiderclan.rsi
+  - type: Welder #
+    fuelConsumption: 0
+    fuelLitCost: 0
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: green
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: WaffleCoFlippo
+  name: Waffle Co. flippo
+  description: "A robust mass produced lighter. The Waffle Co. logo turns the spark wheel when pushed up, minimising risk of lighter burns for even the most inept user."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/waffleco.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/waffleco.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 0.05
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: brown
+
+- type: entity
+  parent: [BaseBrandedLighter]
+  id: HonkCoFlippo
+  name: Honk Co. flippo
+  description: "A slippery gag lighter produced by Honk Co. hidden inside of a real banana peel."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/honkco.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/honkco.rsi
+  - type: ComponentToggler
+    components:
+    - type: Slippery
+    - type: StepTrigger
+      intersectRatio: 0.2
+    - type: CollisionWake
+      enabled: false
+    - type: Physics
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures:
+        slips:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.4,-0.3,0.4,0.3"
+          layer:
+          - SlipLayer
+          hard: false
+        fix1:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.4,-0.3,0.4,0.3"
+          density: 10
+          mask:
+          - ItemMask
+  - type: Welder #
+    fuelConsumption: 0.1
+    fuelLitCost: 1
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: yellow
+
+- type: entity
+  parent: [BaseBrandedLighter]
+  id: DonkcoLighter
+  name: Donk Co. flippo
+  description: "The flippo of choice for the seasoned traitor. A Breaded novelty lighter made by Donk Co. Somehow edible while lit."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/donkco.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/donkco.rsi
+  - type: Welder #
+    fuelConsumption: 0.02
+    fuelLitCost: 0.1
+    tankSafe: true
+  - type: Tag
+    tags:
+    - DonkPocket
+    - Meat
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 12
+        maxVol: 12
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Omnizine
+          Quantity: 10
+  - type: FlavorProfile
+    flavors:
+      - bread
+      - meaty
+      - cheap
+  - type: ComponentToggler
+    components:
+    - type: Food
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: orange
diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
index ee5100c999..c701a400d5 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -108,3 +108,43 @@
     tags:
     - Trash
   - type: SpaceGarbage
+
+- type: entity
+  parent: [Matchbox, BaseSyndicateContraband]
+  id: GorlexMatchbox
+  name: Gorlex match box
+  description: "A pneumatic match box styled after the Gorlex Marauders' equipment. Contains 24 matches."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/gorlex.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/gorlex.rsi
+  - type: Storage
+    grid:
+    - 0,0,11,1
+  - type: StorageFill
+    contents:
+      - id: GorlexMatchstick
+        amount: 24
+  - type: Matchbox
+
+- type: entity
+  name: match stick
+  parent: [Matchstick, BaseSyndicateContraband]
+  id: GorlexMatchstick
+  description: A military grade match stick, used for lighting fine smokables and noncombatants alike.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/gorlexmatch.rsi
+    layers:
+      - state: match_unlit
+  - type: Item
+    sprite: Objects/Tools/Lighters/gorlexmatch.rsi
+    heldPrefix: unlit
+    size: Tiny
+  - type: PointLight
+    enabled: false
+    radius: 3
+    color: green
+  - type: Matchstick
+    duration: 30
diff --git a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
index 679c6f22fe..23d7b68d37 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
@@ -2,7 +2,7 @@
   parent: BaseItem
   id: SprayPainter
   name: spray painter
-  description: A spray painter for painting airlocks and pipes.
+  description: A spray painter for painting airlocks, pipes, and other items.
   components:
   - type: Sprite
     sprite: Objects/Tools/spray_painter.rsi
@@ -32,6 +32,45 @@
       mix: '#947507'
   - type: StaticPrice
     price: 40
+  - type: LimitedCharges
+    maxCharges: 15
+    lastCharges: 15
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
+
+- type: entity
+  parent: SprayPainter
+  id: SprayPainterRecharging
+  suffix: Admeme
+  components:
+  - type: AutoRecharge
+    rechargeDuration: 1
+
+- type: entity
+  parent: SprayPainter
+  id: SprayPainterEmpty
+  suffix: Empty
+  components:
+  - type: LimitedCharges
+    lastCharges: -1
+
+- type: entity
+  parent: BaseItem
+  id: SprayPainterAmmo
+  name: compressed paint
+  description: A cartridge of highly compressed paint, commonly used in spray painters.
+  components:
+  - type: SprayPainterAmmo
+  - type: Sprite
+    sprite: Objects/Tools/spray_painter.rsi
+    state: ammo
+  - type: Item
+    sprite: Objects/Tools/spray_painter.rsi
+    heldPrefix: ammo
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 10
+      Plastic: 10
+  - type: StaticPrice
+    price: 30
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
index 27a6188584..73c021748c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
@@ -102,6 +102,11 @@
       - !type:TriggerBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Recyclable
+    - Trash
+    - BananaPeel
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
index 148a64ec92..4c3207b9c5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@@ -32,25 +32,6 @@
     zeroVisible: false
   - type: Appearance
 
-- type: entity
-  id: BaseMagazineCaselessRifleShort
-  name: "caseless rifle short magazine (.25 caseless)"
-  parent: BaseMagazineCaselessRifle
-  abstract: true
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifle
-    capacity: 10
-  - type: Item
-    size: Tiny
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: BaseMagazinePistolCaselessRifle
   name: "pistol magazine (.25 caseless)"
@@ -81,21 +62,6 @@
     zeroVisible: false
   - type: Appearance
 
-- type: entity
-  id: MagazineCaselessRifle10x24
-  name: "box magazine (.25 caseless)"
-  parent: BaseMagazineCaselessRifle
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifle
-    capacity: 99
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi
-  - type: MagazineVisuals
-    magState: mag
-    steps: 8
-    zeroVisible: false
-
 - type: entity
   id: MagazinePistolCaselessRifle
   name: "pistol magazine (.25 caseless)"
@@ -106,7 +72,7 @@
     proto: CartridgeCaselessRifle
     capacity: 10
   - type: Sprite
-    slayers:
+    layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
@@ -202,51 +168,3 @@
       - state: inhand-right-mag
       - state: inhand-right-stripe
         color: "#dbdbdb"
-
-- type: entity
-  id: MagazineCaselessRifleShort
-  name: "short magazine (.25 caseless)"
-  parent: BaseMagazineCaselessRifleShort
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifle
-    capacity: 20
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      right:
-      - state: inhand-right-mag
-
-- type: entity
-  id: MagazineCaselessRifleShortPractice
-  name: "short magazine (.25 caseless practice)"
-  parent: BaseMagazineCaselessRifleShort
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRiflePractice
-    capacity: 20
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#dbdbdb"
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#dbdbdb"
-      right:
-      - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#dbdbdb"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
index f56092ba1f..c94e819615 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -178,36 +178,3 @@
       - state: inhand-right-mag
       - state: inhand-right-stripe
         color: "#ff6e52"
-
-- type: entity
-  id: MagazineLightRifleMaxim
-  name: "pan magazine (.30 rifle)"
-  parent: BaseMagazineLightRifle
-  components:
-  - type: Tag
-    tags:
-      - MagazineLightRiflePan
-  - type: BallisticAmmoProvider
-    proto: CartridgeLightRifle
-    capacity: 96
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi
-
-- type: entity
-  id: MagazineLightRiflePkBox
-  name: "PK munitions box (.30 rifle)"
-  parent: BaseMagazineLightRifle
-  components:
-  - type: Tag
-    tags:
-      - MagazineLightRifleBox
-  - type: BallisticAmmoProvider
-    proto: CartridgeLightRifle
-    capacity: 80
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/pk_box.rsi
-  - type: MagazineVisuals
-    magState: mag
-    steps: 8
-    zeroVisible: false
-  - type: Appearance
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
index 705601870f..b3b26be0d1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -14,39 +14,6 @@
         - CartridgeMagnum
     capacity: 7
 
-- type: entity
-  id: BaseMagazineMagnumSubMachineGun
-  name: SMG magazine (.45 magnum)
-  parent: BaseItem
-  abstract: true
-  components:
-  - type: Tag
-    tags:
-      - MagazineMagnumSubMachineGun
-  - type: BallisticAmmoProvider
-    mayTransfer: true
-    whitelist:
-      tags:
-        - CartridgeMagnum
-    capacity: 25
-  - type: Item
-    size: Small
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: mag
-    steps: 2
-    zeroVisible: false
-  - type: Appearance
-
 - type: entity
   id: MagazineMagnumEmpty
   name: pistol magazine (.45 magnum any)
@@ -170,122 +137,3 @@
       - state: inhand-right-mag
       - state: inhand-right-stripe
         color: "#540000"
-
-- type: entity
-  id: MagazineMagnumSubMachineGunEmpty
-  name: SMG magazine (.45 magnum any)
-  suffix: empty
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: null
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      right:
-      - state: inhand-right-mag
-
-- type: entity
-  id: MagazineMagnumSubMachineGun
-  name: SMG magazine (.45 magnum)
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnum
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      right:
-      - state: inhand-right-mag
-
-- type: entity
-  id: MagazineMagnumSubMachineGunPractice
-  name: SMG magazine (.45 magnum practice)
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumPractice
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#dbdbdb"
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#dbdbdb"
-      right:
-      - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#dbdbdb"
-
-- type: entity
-  id: MagazineMagnumSubMachineGunUranium
-  name: SMG magazine (.45 magnum uranium)
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumUranium
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#00cd42"
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#00cd42"
-      right:
-      - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#00cd42"
-
-- type: entity
-  id: MagazineMagnumSubMachineGunPiercing
-  name: SMG magazine (.45 magnum armour-piercing)
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumAP
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#540000"
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#540000"
-      right:
-      - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#540000"
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 560b7bbc2a..d5f4681a9b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -103,7 +103,7 @@
 
 - type: entity
   name: svalinn laser pistol
-  parent: [ BaseWeaponPowerCellSmall, BaseSecurityContraband ]
+  parent: [BaseWeaponPowerCellSmall, BaseSecurityContraband]
   id: WeaponLaserSvalinn
   description: A cheap and widely used laser pistol.
   components:
@@ -124,7 +124,7 @@
 
 - type: entity
   name: retro laser blaster
-  parent: [ BaseWeaponBatterySmall, BaseMajorContraband ]
+  parent: [BaseWeaponBatterySmall, BaseMajorContraband]
   id: WeaponLaserGun
   description: A weapon using light amplified by the stimulated emission of radiation.
   components:
@@ -147,7 +147,7 @@
 
 - type: entity
   name: makeshift laser pistol
-  parent: BaseWeaponBatterySmall
+  parent: [BaseWeaponBatterySmall, BaseMinorContraband]
   id: WeaponMakeshiftLaser
   description: Better pray it won't burn your hands off.
   components:
@@ -175,7 +175,7 @@
 
 - type: entity
   name: tesla gun
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseMajorContraband]
   id: WeaponTeslaGun
   description: The power of the primordial element of lightning in your hands.
   components:
@@ -247,7 +247,7 @@
 
 - type: entity
   name: pulse pistol
-  parent: BaseWeaponBatterySmall
+  parent: [BaseWeaponBatterySmall, BaseCentcommContraband]
   id: WeaponPulsePistol
   description: A state of the art energy pistol favoured as a sidearm by the NT operatives.
   components:
@@ -317,7 +317,7 @@
 
 - type: entity
   name: pulse rifle
-  parent: [BaseWeaponBattery, BaseGunWieldable]
+  parent: [BaseWeaponBattery, BaseGunWieldable, BaseCentcommContraband]
   id: WeaponPulseRifle
   description: A weapon that is almost as infamous as its users.
   components:
@@ -381,7 +381,7 @@
 
 - type: entity
   name: portable particle decelerator
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseEngineeringContraband]
   id: WeaponParticleDecelerator
   description: A portable particle decelerator capable of decomposing a tesla or singularity.
   components:
@@ -479,7 +479,7 @@
 
 - type: entity
   name: disabler
-  parent: [ WeaponDisablerPractice, BaseSecurityCommandContraband ]
+  parent: [WeaponDisablerPractice, BaseSecurityCommandContraband]
   id: WeaponDisabler
   description: A self-defense weapon that exhausts organic targets, weakening them until they collapse.
   components:
@@ -507,7 +507,7 @@
 
 - type: entity
   name: disabler SMG
-  parent: [ BaseWeaponBattery, BaseSecurityContraband ]
+  parent: [BaseWeaponBattery, BaseSecurityContraband]
   id: WeaponDisablerSMG
   description: Advanced weapon that exhausts organic targets, weakening them until they collapse.
   components:
@@ -545,7 +545,7 @@
 
 - type: entity
   name: taser
-  parent: [ BaseWeaponBatterySmall, BaseSecurityContraband ]
+  parent: [BaseWeaponBatterySmall, BaseSecurityContraband]
   id: WeaponTaser
   description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range.
   components:
@@ -625,7 +625,7 @@
 
 - type: entity
   name: advanced laser pistol
-  parent: [ BaseWeaponBatterySmall, BaseSecurityContraband]
+  parent: [BaseWeaponBatterySmall, BaseSecurityContraband]
   id: WeaponAdvancedLaser
   description: An experimental high-energy laser pistol with a self-charging nuclear battery.
   components:
@@ -708,7 +708,7 @@
   name: experimental C.H.I.M.P. handcannon
   parent: [WeaponPistolCHIMP, BaseSyndicateContraband]
   id: WeaponPistolCHIMPUpgraded
-  description: This C.H.I.M.P. seems to have a greater punch than is usual...
+  description: This C.H.I.M.P. seems to have a greater punch than usual...
   components:
   - type: BatteryWeaponFireModes
     fireModes:
@@ -806,7 +806,7 @@
 
 - type: entity
   name: temperature gun
-  parent: [BaseWeaponBattery, BaseGunWieldable]
+  parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband]
   id: WeaponTemperatureGun
   description: An advanced gun that shoots body-temperature-changing beams. This probably constitutes as some kind of war crime.
   components:
@@ -850,12 +850,12 @@
 
 - type: entity
   name: xenoborg laser gun
-  parent: [ WeaponAdvancedLaser, BaseXenoborgContraband ]
+  parent: [WeaponAdvancedLaser, BaseXenoborgContraband]
   id: XenoborgLaserGun
 
 - type: entity
   name: xenoborg heavy laser gun
-  parent: [ WeaponAdvancedLaser, BaseXenoborgContraband ]
+  parent: [WeaponAdvancedLaser, BaseXenoborgContraband]
   id: XenoborgHeavyLaserGun
   components:
   - type: HitscanBatteryAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index e1de308b12..cbed4c7760 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -8,6 +8,11 @@
   - type: Sprite
   - type: Item
     size: Ginormous
+  - type: MultiHandedItem
+  - type: ClothingSpeedModifier
+    walkModifier: 0.8
+    sprintModifier: 0.8
+  - type: HeldSpeedModifier
   - type: Gun
     fireRate: 20
     selectedMode: FullAuto
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
index 2c770adaa0..e9a0c6a381 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
@@ -20,7 +20,7 @@
       projectile:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.1,-0.1,0.1,0.1"
+          bounds: "-0.1,-0.3,0.1,-0.1"
         hard: false
         mask:
         - Impassable
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 2710ee4818..7c9332891b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -182,7 +182,7 @@
 
 - type: entity
   name: WT550
-  parent: [ BaseWeaponSubMachineGun, BaseSecurityContraband ]
+  parent: [BaseWeaponSubMachineGun, BaseSecurityContraband]
   id: WeaponSubMachineGunWt550
   description: A truly unique firearm, the WT550 was designed by Nanotrasen's Small Arms Division as a compact submachine gun fully controllable with one hand. It contains an exotic internal recoil buffer and feeds from special top-mounted .35 magazines.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 420650afc1..655f866f77 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -46,6 +46,45 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
+    layers:
+    - state: base
+    - state: base1
+      map: [ "enum.SolutionContainerLayers.Fill" ]
+      visible: false
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    fillBaseName: base
+    inHandsFillBaseName: -fill-
+    inHandsMaxFillLevels: 1
+    equippedFillBaseName: -fill-
+    equippedMaxFillLevels: 1
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Piercing: 12
+    angle: 0
+    animation: WeaponArcThrust
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+  - type: MeleeRequiresWield
+  - type: AltFireMelee
+    attackType: Heavy
+  - type: SolutionContainerManager
+    solutions:
+      melee:
+        maxVol: 2
+  - type: MeleeChemicalInjector
+    solution: melee
+  - type: RefillableSolution
+    solution: melee
+  - type: InjectableSolution
+    solution: melee
+  - type: SolutionTransfer
+    maxTransferAmount: 2
+  - type: Sharp
+    butcherDelayModifier: 2 #It's a bayonet
   - type: GunRequiresWield
   - type: StaticPrice
     price: 500
@@ -54,7 +93,7 @@
   name: Hristov
   parent: [BaseWeaponSniper, BaseGunWieldable, BaseSyndicateContraband]
   id: WeaponSniperHristov
-  description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo.
+  description: For when you absolutely, positively need to make someone regret their life choices from a safe distance. Uses .60 anti-materiel ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index 204302b395..de75ae4be4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -53,7 +53,7 @@
 - type: entity
   id: FireAxeFlaming
   name: fire axe
-  parent: [ BaseSyndicateContraband, FireAxe ]
+  parent: [BaseSyndicateContraband, FireAxe]
   description: Why fight fire with an axe when you can fight with fire and axe? Now featuring rugged rubberized handle!
   components:
   - type: MeleeWeapon
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index edab0e8a94..71e6d16382 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -111,6 +111,21 @@
     malus: 0.225
   - type: ThrowingAngle
     angle: 225
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PolygonShape
+          radius: 0.01
+          vertices:
+          - -0.4,-0.2
+          - -0.2,-0.4
+          - 0.4,0.2
+          - 0.2,0.4
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
 
 - type: entity
   name: survival knife
@@ -304,3 +319,18 @@
     angle: 225
   - type: StaticPrice
     price: 500 # 2000 for a set of 4
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PolygonShape
+          radius: 0.01
+          vertices:
+          - -0.475,-0.225
+          - -0.225,-0.475
+          - 0.525,0.275
+          - 0.275,0.525
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 3ed57e0495..cc09a5a378 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -195,6 +195,21 @@
     malus: 0.225
   - type: ThrowingAngle
     angle: 225
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PolygonShape
+          radius: 0.01
+          vertices:
+          - -0.4,-0.2
+          - -0.2,-0.4
+          - 0.4,0.2
+          - 0.2,0.4
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
 
 # Less mark damage in exchange for more healing. Also has a better ratio of blunt to slash damage, but less structural.
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
index 7e4071b37e..69f3700426 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
@@ -49,3 +49,13 @@
     canMoveBreakout: true
     maxEnsnares: 1
   - type: LandAtCursor
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.4
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index fbc7bc74ea..4d65cc0806 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -38,6 +38,16 @@
   - type: Tag
     tags:
     - HandGrenade
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
 
 - type: entity
   name: explosive grenade
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
index b6e235292c..bdd8370b10 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
@@ -28,6 +28,16 @@
   - type: Tag
     tags:
     - HandGrenade
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
 
 - type: entity
   parent: [ProjectileGrenadeBase, BaseSecurityContraband]
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
index ba32fa7a5f..bb96cdce4c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
@@ -23,6 +23,16 @@
   - type: Tag
     tags:
     - HandGrenade
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
 
 - type: entity
   parent: [ScatteringGrenadeBase, BaseSecurityContraband]
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
index f61b97076f..67e46649ef 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -15,8 +15,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/engineering.rsi
-  - type: PaintableAirlock
-    department: Engineering
   - type: Wires
     layoutId: AirlockEngineering
 
@@ -35,8 +33,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/cargo.rsi
-  - type: PaintableAirlock
-    department: Cargo
   - type: Wires
     layoutId: AirlockCargo
 
@@ -67,8 +63,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/medical.rsi
-  - type: PaintableAirlock
-    department: Medical
   - type: Wires
     layoutId: AirlockMedical
 
@@ -95,8 +89,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/science.rsi
-  - type: PaintableAirlock
-    department: Science
   - type: Wires
     layoutId: AirlockScience
 
@@ -109,8 +101,6 @@
     sprite: Structures/Doors/Airlocks/Standard/command.rsi
   - type: WiresPanelSecurity
     securityLevel: medSecurity
-  - type: PaintableAirlock
-    department: Command
   - type: Wires
     layoutId: AirlockCommand
 
@@ -121,8 +111,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/security.rsi
-  - type: PaintableAirlock
-    department: Security
   - type: Wires
     layoutId: AirlockSecurity
 
@@ -151,6 +139,8 @@
     sprite: Structures/Doors/Airlocks/Standard/mining.rsi
   - type: Wires
     layoutId: AirlockCargo
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: AirlockCommand # if you get centcom door somehow it counts as command, also inherit panel
@@ -167,6 +157,8 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/hatch.rsi
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: Airlock
@@ -175,6 +167,8 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/hatch_maint.rsi
+  - type: Paintable
+    group: null
 
 # Glass
 - type: entity
@@ -184,8 +178,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/engineering.rsi
-  - type: PaintableAirlock
-    department: Engineering
   - type: Wires
     layoutId: AirlockEngineering
 
@@ -212,8 +204,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/cargo.rsi
-  - type: PaintableAirlock
-    department: Cargo
   - type: Wires
     layoutId: AirlockCargo
 
@@ -244,8 +234,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/medical.rsi
-  - type: PaintableAirlock
-    department: Medical
   - type: Wires
     layoutId: AirlockMedical
 
@@ -272,8 +260,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/science.rsi
-  - type: PaintableAirlock
-    department: Science
   - type: Wires
     layoutId: AirlockScience
 
@@ -284,8 +270,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/command.rsi
-  - type: PaintableAirlock
-    department: Command
   - type: WiresPanelSecurity
     securityLevel: medSecurity
   - type: Wires
@@ -298,8 +282,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/security.rsi
-  - type: PaintableAirlock
-    department: Security
   - type: Wires
     layoutId: AirlockSecurity
 
@@ -318,6 +300,8 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/mining.rsi
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: AirlockCommandGlass # see standard
@@ -342,6 +326,8 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/xeno.rsi
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: AirlockGlass
@@ -350,3 +336,5 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/xeno.rsi
+  - type: Paintable
+    group: null
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index 3e70b5ccbe..437076b0a2 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -158,9 +158,8 @@
     - board
   - type: PlacementReplacement
     key: walls
-  - type: PaintableAirlock
-    group: Standard
-    department: Civilian
+  - type: Paintable
+    group: AirlockStandard
   - type: StaticPrice
     price: 150
   - type: LightningTarget
@@ -220,8 +219,8 @@
   - type: Construction
     graph: Airlock
     node: glassAirlock
-  - type: PaintableAirlock
-    group: Glass
+  - type: Paintable
+    group: AirlockGlass
   - type: RadiationBlocker
     resistance: 2
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml
index f6eeb9ee37..123f1ef2c7 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml
@@ -10,6 +10,8 @@
     node: airlock
     containers:
     - board
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: AirlockGlass
@@ -25,3 +27,5 @@
     - board
   - type: StaticPrice
     price: 165
+  - type: Paintable
+    group: null
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
index 7f5c019025..773065bea0 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
@@ -16,11 +16,10 @@
       path: /Audio/Machines/airlock_deny.ogg
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/external.rsi
-  - type: PaintableAirlock
-    group: External
-    department: null
   - type: Wires
     layoutId: AirlockExternal
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: AirlockExternal
@@ -33,8 +32,6 @@
     enabled: false
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/external.rsi
-  - type: PaintableAirlock
-    group: ExternalGlass
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index 3752821e46..cad40324c8 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -52,14 +52,13 @@
   - type: Tag
     tags:
       - ForceNoFixRotations
-  - type: PaintableAirlock
-    group: Shuttle
-    department: null
   - type: Construction
     graph: AirlockShuttle
     node: airlock
   - type: StaticPrice
     price: 350
+  - type: Paintable
+    group: null
 
 - type: entity
   id: AirlockGlassShuttle
@@ -72,8 +71,6 @@
     sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi
   - type: Occluder
     enabled: false
-  - type: PaintableAirlock
-    group: ShuttleGlass
   - type: Door
     occludes: false
   - type: Fixtures
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml
index 4aa959455a..cc8fd35f32 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml
@@ -6,6 +6,7 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Windoors/clockwork_windoor.rsi
+  - type: Destructible
     thresholds:
     - trigger:
         !type:DamageTrigger
@@ -23,8 +24,8 @@
             min: 1
             max: 2
           SheetBrass1:
-            min: 2
-            max: 4
+            min: 0
+            max: 2
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Construction
diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
deleted file mode 100644
index 76b21acfcd..0000000000
--- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-- type: AirlockGroup
-  id: Standard
-  iconPriority: 100
-  stylePaths:
-    atmospherics: Structures/Doors/Airlocks/Standard/atmospherics.rsi
-    basic:       Structures/Doors/Airlocks/Standard/basic.rsi
-    cargo:       Structures/Doors/Airlocks/Standard/cargo.rsi
-    chemistry:   Structures/Doors/Airlocks/Standard/chemistry.rsi
-    command:     Structures/Doors/Airlocks/Standard/command.rsi
-    engineering: Structures/Doors/Airlocks/Standard/engineering.rsi
-    freezer:     Structures/Doors/Airlocks/Standard/freezer.rsi
-    hydroponics: Structures/Doors/Airlocks/Standard/hydroponics.rsi
-    maintenance: Structures/Doors/Airlocks/Standard/maint.rsi
-    medical:     Structures/Doors/Airlocks/Standard/medical.rsi
-    salvage:     Structures/Doors/Airlocks/Standard/salvage.rsi
-    science:     Structures/Doors/Airlocks/Standard/science.rsi
-    security:    Structures/Doors/Airlocks/Standard/security.rsi
-    virology:    Structures/Doors/Airlocks/Standard/virology.rsi
-
-- type: AirlockGroup
-  id: Glass
-  iconPriority: 90
-  stylePaths:
-    atmospherics: Structures/Doors/Airlocks/Glass/atmospherics.rsi
-    basic:       Structures/Doors/Airlocks/Glass/basic.rsi
-    cargo:       Structures/Doors/Airlocks/Glass/cargo.rsi
-    command:     Structures/Doors/Airlocks/Glass/command.rsi
-    chemistry:   Structures/Doors/Airlocks/Glass/chemistry.rsi
-    science:     Structures/Doors/Airlocks/Glass/science.rsi
-    engineering: Structures/Doors/Airlocks/Glass/engineering.rsi
-    glass:       Structures/Doors/Airlocks/Glass/glass.rsi
-    hydroponics: Structures/Doors/Airlocks/Glass/hydroponics.rsi
-    maintenance: Structures/Doors/Airlocks/Glass/maint.rsi
-    medical:     Structures/Doors/Airlocks/Glass/medical.rsi
-    salvage:     Structures/Doors/Airlocks/Glass/salvage.rsi
-    security:    Structures/Doors/Airlocks/Glass/security.rsi
-    virology:    Structures/Doors/Airlocks/Glass/virology.rsi
-
-- type: AirlockGroup
-  id: Windoor
-  iconPriority: 80
-  stylePaths:
-    basic:       Structures/Doors/Airlocks/Glass/glass.rsi
-
-- type: AirlockGroup
-  id: External
-  iconPriority: 70
-  stylePaths:
-    external:    Structures/Doors/Airlocks/Standard/external.rsi
-
-- type: AirlockGroup
-  id: ExternalGlass
-  iconPriority: 60
-  stylePaths:
-    external:    Structures/Doors/Airlocks/Glass/external.rsi
-
-- type: AirlockGroup
-  id: Shuttle
-  iconPriority: 50
-  stylePaths:
-    shuttle:     Structures/Doors/Airlocks/Standard/shuttle.rsi
-
-- type: AirlockGroup
-  id: ShuttleGlass
-  iconPriority: 40
-  stylePaths:
-    shuttle:     Structures/Doors/Airlocks/Glass/shuttle.rsi
-
-# fun
-- type: airlockDepartments
-  id: Departments
-  departments:
-    atmospherics: Engineering
-    basic: Civilian
-    cargo: Cargo
-    chemistry: Medical
-    command: Command
-    engineering: Engineering
-    freezer: Civilian
-    glass: Civilian
-    hydroponics: Civilian
-    maintenance: Civilian
-    medical: Medical
-    salvage: Cargo
-    science: Science
-    security: Security
-    virology: Medical
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
index 4b8e90d919..d16c65dffe 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
@@ -83,7 +83,7 @@
     node: medicalbed
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
 
 - type: entity
   parent: Bed
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index d57e1c4bf8..84df160258 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -170,10 +170,12 @@
         type: WiresBoundUserInterface
   - type: Computer
     board: SpaceVillainArcadeComputerCircuitboard
-  - type: Advertise
-    pack: SpaceVillainAds
-    minimumWait: 60 # Arcades are noisy
-    maximumWait: 240
+  - type: Vocalizer
+    minVocalizeInterval: 1m # Arcades are noisy
+    maxVocalizeInterval: 4m
+    hideChat: true
+  - type: DatasetVocalizer
+    dataset: SpaceVillainAds
   - type: SpeakOnUIClosed
     pack: SpaceVillainGoodbyes
 
@@ -215,9 +217,11 @@
         type: WiresBoundUserInterface
   - type: Computer
     board: BlockGameArcadeComputerCircuitboard
-  - type: Advertise
-    pack: BlockGameAds
-    minimumWait: 60 # Arcades are noisy
-    maximumWait: 240
+  - type: Vocalizer
+    minVocalizeInterval: 1m # Arcades are noisy
+    maxVocalizeInterval: 4m
+    hideChat: true
+  - type: DatasetVocalizer
+    dataset: BlockGameAds
   - type: SpeakOnUIClosed
     pack: BlockGameGoodbyes
diff --git a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
index 770a17a8ff..c4b26e043b 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
@@ -101,8 +101,11 @@
   - type: Appearance
   - type: Speech
     speechVerb: Robotic
-  - type: Advertise
-    pack: FatExtractorFacts
+  - type: Vocalizer
+    hideChat: true
+  - type: VocalizerRequiresPower
+  - type: DatasetVocalizer
+    dataset: FatExtractorFacts
   - type: StaticPrice
     price: 1000
   - type: ResistLocker
diff --git a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
index 748b3426c4..8ea6fee938 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
@@ -5,8 +5,11 @@
   description: A refrigerated storage unit for keeping items cold and fresh.
   components:
   - type: StationAiWhitelist
-  - type: Advertise
-    pack: SmartFridgeAds
+  - type: Vocalizer
+    hideChat: true
+  - type: VocalizerRequiresPower
+  - type: DatasetVocalizer
+    dataset: SmartFridgeAds
   - type: Speech
   - type: Appearance
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
index 4dd1197593..89d24b35d3 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
@@ -18,8 +18,13 @@
     - state: icon
     - state: unlit
       shader: unshaded
-      map: ["enum.StasisBedVisualLayers.IsOn"]
-  - type: StasisBedVisuals
+      map: ["unlit"]
+  - type: GenericVisualizer
+    visuals:
+      enum.PowerDeviceVisuals.Powered:
+        unlit:
+          True: { visible: true }
+          False: { visible: false }
   - type: Appearance
   - type: ApcPowerReceiver
     powerLoad: 1000
@@ -58,5 +63,5 @@
         - LowImpassable
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
   - type: PowerSwitch
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 54cb396fdc..9cc83cf32c 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -73,6 +73,11 @@
   - type: Speech
     speechVerb: Robotic
     speechSounds: Vending
+  - type: Vocalizer
+    minVocalizeInterval: 8m
+    maxVocalizeInterval: 10m
+    hideChat: true
+  - type: VocalizerRequiresPower
   - type: SpookySpeaker
     messageSet: SpookySpeakerMessagesGeneric
     speakChance: 0.2
@@ -126,8 +131,8 @@
         layer:
         - MachineLayer
         density: 190
-  - type: Advertise
-    pack: CondimentVendAds
+  - type: DatasetVocalizer
+    dataset: CondimentVendAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Transform
@@ -144,8 +149,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: AmmoVendAds
+  - type: DatasetVocalizer
+    dataset: CondimentVendAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -172,8 +177,8 @@
     normalState: normal-unshaded
     denyState: deny-unshaded
     loopDeny: false
-  - type: Advertise
-    pack: BoozeOMatAds
+  - type: DatasetVocalizer
+    dataset: BoozeOMatAds
   - type: SpeakOnUIClosed
     pack: BoozeOMatGoodbyes
   - type: Sprite
@@ -206,8 +211,8 @@
     normalState: normal-unshaded
     denyState: deny-unshaded
     loopDeny: false
-  - type: Advertise
-    pack: BruiseOMatAds
+  - type: DatasetVocalizer
+    dataset: BruiseOMatAds
   - type: SpeakOnUIClosed
     pack: BruiseOMatGoodbyes
   - type: Sprite
@@ -269,8 +274,8 @@
     brokenState: broken
     normalState: normal-unshaded
     ejectState: eject-unshaded
-  - type: Advertise
-    pack: ChefvendAds
+  - type: DatasetVocalizer
+    dataset: ChefvendAds
   - type: SpeakOnUIClosed
     pack: ChefvendGoodbyes
   - type: Sprite
@@ -305,8 +310,8 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: CigaretteMachineAds
+  - type: DatasetVocalizer
+    dataset: CigaretteMachineAds
   - type: SpeakOnUIClosed
     pack: CigaretteMachineGoodbyes
   - type: Sprite
@@ -332,8 +337,8 @@
     brokenState: broken
     normalState: normal-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: ClothesMateAds
+  - type: DatasetVocalizer
+    dataset: ClothesMateAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -363,8 +368,8 @@
     brokenState: broken
     normalState: normal-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: ClothesMateAds
+  - type: DatasetVocalizer
+    dataset: ClothesMateAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -401,8 +406,8 @@
     ejectDelay: 5
     soundVend: /Audio/Machines/machine_vend_hot_drink.ogg
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: HotDrinksMachineAds
+  - type: DatasetVocalizer
+    dataset: HotDrinksMachineAds
   - type: SpeakOnUIClosed
     pack: HotDrinksMachineGoodbyes
   - type: Sprite
@@ -440,8 +445,8 @@
     denyState: deny-unshaded
     ejectDelay: 1.9
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: RobustSoftdrinksAds
+  - type: DatasetVocalizer
+    dataset: RobustSoftdrinksAds
   - type: SpeakOnUIClosed
     pack: RobustSoftdrinksGoodbyes
   - type: Sprite
@@ -585,8 +590,8 @@
     denyState: deny-unshaded
     ejectDelay: 1.9
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: RobustSoftdrinksAds
+  - type: DatasetVocalizer
+    dataset: RobustSoftdrinksAds
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/shamblersjuice.rsi
     layers:
@@ -619,8 +624,8 @@
     denyState: deny-unshaded
     ejectDelay: 1.9
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: RobustSoftdrinksAds
+  - type: DatasetVocalizer
+    dataset: RobustSoftdrinksAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -655,8 +660,8 @@
     denyState: deny-unshaded
     ejectDelay: 1.9
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: DrGibbAds
+  - type: DatasetVocalizer
+    dataset: DrGibbAds
   - type: SpeakOnUIClosed
     pack: DrGibbGoodbyes
   - type: Sprite
@@ -701,8 +706,8 @@
     denyState: deny-unshaded
     ejectDelay: 1.9
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: SmiteAds
+  - type: DatasetVocalizer
+    dataset: SmiteAds
   - type: SpeakOnUIClosed
     pack: SmiteGoodbyes
   - type: PointLight
@@ -722,8 +727,8 @@
     brokenState: broken
     normalState: normal-unshaded
     ejectState: eject-unshaded
-  - type: Advertise
-    pack: DinnerwareAds
+  - type: DatasetVocalizer
+    dataset: DinnerwareAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -754,8 +759,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: MagiVendAds
+  - type: DatasetVocalizer
+    dataset: MagiVendAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -787,8 +792,8 @@
     brokenState: broken
     normalState: normal-unshaded
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: DiscountDansAds
+  - type: DatasetVocalizer
+    dataset: DiscountDansAds
   - type: SpeakOnUIClosed
     pack: DiscountDansGoodbyes
   - type: Sprite
@@ -850,8 +855,8 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
     ejectDelay: 0.6
-  - type: Advertise
-    pack: NanoMedAds
+  - type: DatasetVocalizer
+    dataset: NanoMedAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -872,7 +877,7 @@
     color: "#9dc5c9"
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
 
 - type: entity
   parent: VendingMachine
@@ -887,8 +892,8 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: NutriMaxAds
+  - type: DatasetVocalizer
+    dataset: NutriMaxAds
   - type: SpeakOnUIClosed
     pack: NutriMaxGoodbyes
   - type: Sprite
@@ -921,8 +926,8 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: SecTechAds
+  - type: DatasetVocalizer
+    dataset: SecTechAds
   - type: SpeakOnUIClosed
     pack: SecTechGoodbyes
   - type: Sprite
@@ -960,8 +965,8 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: MegaSeedAds
+  - type: DatasetVocalizer
+    dataset: MegaSeedAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1003,8 +1008,8 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: GetmoreChocolateCorpAds
+  - type: DatasetVocalizer
+    dataset: GetmoreChocolateCorpAds
   - type: SpeakOnUIClosed
     pack: GetmoreChocolateCorpGoodbyes
   - type: Sprite
@@ -1148,8 +1153,8 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: BodaAds
+  - type: DatasetVocalizer
+    dataset: BodaAds
   - type: SpeakOnUIClosed
     pack: BodaGoodbyes
   - type: Sprite
@@ -1182,8 +1187,8 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
     screenState: screen
-  - type: Advertise
-    pack: AutoDrobeAds
+  - type: DatasetVocalizer
+    dataset: AutoDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1217,8 +1222,8 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: VendomatAds
+  - type: DatasetVocalizer
+    dataset: VendomatAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1249,8 +1254,8 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: VendomatAds
+  - type: DatasetVocalizer
+    dataset: VendomatAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1314,8 +1319,8 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     ejectDelay: 1.8
-  - type: Advertise
-    pack: GoodCleanFunAds
+  - type: DatasetVocalizer
+    dataset: GoodCleanFunAds
   - type: SpeakOnUIClosed
     pack: GoodCleanFunGoodbyes
   - type: Sprite
@@ -1347,8 +1352,8 @@
     brokenState: broken
     normalState: normal-unshaded
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: ChangAds
+  - type: DatasetVocalizer
+    dataset: ChangAds
   - type: SpeakOnUIClosed
     pack: ChangGoodbyes
   - type: Sprite
@@ -1412,8 +1417,8 @@
     brokenState: broken
     normalState: normal-unshaded
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: DonutAds
+  - type: DatasetVocalizer
+    dataset: DonutAds
   - type: SpeakOnUIClosed
     pack: DonutGoodbyes
   - type: Sprite
@@ -1497,8 +1502,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: HyDrobeAds
+  - type: DatasetVocalizer
+    dataset: HyDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1529,8 +1534,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: LawDrobeAds
+  - type: DatasetVocalizer
+    dataset: LawDrobeAds
   - type: SpeakOnUIClosed
     pack: LawDrobeGoodbyes
   - type: Sprite
@@ -1557,8 +1562,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: SecDrobeAds
+  - type: DatasetVocalizer
+    dataset: SecDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1589,8 +1594,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: BarDrobeAds
+  - type: DatasetVocalizer
+    dataset: BarDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1645,8 +1650,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: CargoDrobeAds
+  - type: DatasetVocalizer
+    dataset: CargoDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1677,8 +1682,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: MediDrobeAds
+  - type: DatasetVocalizer
+    dataset: MediDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1705,8 +1710,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: ChemDrobeAds
+  - type: DatasetVocalizer
+    dataset: ChemDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1733,8 +1738,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: CuraDrobeAds
+  - type: DatasetVocalizer
+    dataset: CuraDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1761,8 +1766,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: AtmosDrobeAds
+  - type: DatasetVocalizer
+    dataset: AtmosDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1793,8 +1798,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: EngiDrobeAds
+  - type: DatasetVocalizer
+    dataset: EngiDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1825,8 +1830,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: ChefDrobeAds
+  - type: DatasetVocalizer
+    dataset: ChefDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1853,8 +1858,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: DetDrobeAds
+  - type: DatasetVocalizer
+    dataset: DetDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1881,8 +1886,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: JaniDrobeAds
+  - type: DatasetVocalizer
+    dataset: JaniDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1913,8 +1918,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: SciDrobeAds
+  - type: DatasetVocalizer
+    dataset: SciDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1941,8 +1946,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: SyndieDrobeAds
+  - type: DatasetVocalizer
+    dataset: SyndieDrobeAds
   - type: SpeakOnUIClosed
     pack: SyndieDrobeGoodbyes
   - type: Sprite
@@ -1973,8 +1978,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: RoboDrobeAds
+  - type: DatasetVocalizer
+    dataset: RoboDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -2001,8 +2006,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: GeneDrobeAds
+  - type: DatasetVocalizer
+    dataset: GeneDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -2029,8 +2034,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: ViroDrobeAds
+  - type: DatasetVocalizer
+    dataset: ViroDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -2105,8 +2110,8 @@
     radius: 1.5
     energy: 1.6
     color: "#3c5eb5"
-  - type: Advertise
-    pack: HappyHonkAds
+  - type: DatasetVocalizer
+    dataset: HappyHonkAds
   - type: SpeakOnUIClosed
     pack: HappyHonkGoodbyes
   - type: AccessReader
@@ -2125,8 +2130,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: PrideDrobeAds
+  - type: DatasetVocalizer
+    dataset: PrideDrobeAds
   - type: SpeakOnUIClosed
     pack: PrideDrobeGoodbyes
   - type: Speech
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
index 1e439ddae4..d57af0a41c 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
@@ -77,10 +77,10 @@
       - GhostOnlyWarp
   - type: Sprite
     sprite: Structures/Power/Generation/Singularity/singularity_1.rsi
-    shader: unshaded
     layers:
     - map: [ "VisualLevel" ]
       state: singularity_1
+      shader: unshaded
   - type: GenericVisualizer
     visuals:
       enum.SingularityAppearanceKeys.Singularity:
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
index d31f7526ab..52e82847cb 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
@@ -101,9 +101,9 @@
   - type: Sprite
     drawdepth: Effects
     sprite: Structures/Power/Generation/Tesla/energy_ball.rsi
-    shader: unshaded
     layers:
     - state: energy_ball
+      shader: unshaded
   - type: EmitSoundOnSpawn
     sound:
       path: /Audio/Effects/tesla_collapse.ogg
@@ -149,8 +149,8 @@
   - type: Sprite
     drawdepth: Effects
     sprite: Structures/Power/Generation/Tesla/energy_miniball.rsi
-    shader: unshaded
     layers:
     - state: tesla_projectile
+      shader: unshaded
   - type: Electrified
     requirePower: false
diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml
index 428d935eaa..1e1441a3ee 100644
--- a/Resources/Prototypes/Entities/Structures/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -173,7 +173,6 @@
     sprite: Structures/Power/Cables/lv_cable.rsi
     state: lvcable_0
   - type: Icon
-    color: Green
     sprite: Structures/Power/Cables/lv_cable.rsi
     state: lvcable_4
   - type: NodeContainer
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
index 2b046b0182..638947af75 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -72,6 +72,8 @@
   - type: Anomaly
     corePrototype: AnomalyCorePyroclastic
     coreInertPrototype: AnomalyCorePyroclasticInert
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyPyroSupercritical
   - type: Sprite
     sprite: Structures/Specific/Anomalies/pyro_anom.rsi
     layers:
@@ -124,6 +126,9 @@
   - type: Anomaly
     corePrototype: AnomalyCoreGravity
     coreInertPrototype: AnomalyCoreGravityInert
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyGravitySupercritical
+    supercriticalDuration: 15s
   - type: Sprite
     layers:
     - state: anom2
@@ -156,6 +161,8 @@
   - type: Anomaly
     corePrototype: AnomalyCoreElectricity
     coreInertPrototype: AnomalyCoreElectricityInert
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyElectricitySupercritical
   - type: Sprite
     layers:
     - state: anom3
@@ -181,6 +188,8 @@
     coreInertPrototype: AnomalyCoreFleshInert
     minPulseLength: 180
     maxPulseLength: 300
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyFleshSupercritical
   - type: Sprite
     layers:
     - state: anom5
@@ -306,6 +315,8 @@
   - type: Anomaly
     corePrototype: AnomalyCoreBluespace
     coreInertPrototype: AnomalyCoreBluespaceInert
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyBluespaceSupercritical
     pulseSound:
       collection: RadiationPulse
       params:
@@ -332,6 +343,8 @@
   - type: Anomaly
     corePrototype: AnomalyCoreIce
     coreInertPrototype: AnomalyCoreIceInert
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyIceSupercritical
   - type: ExplosionAnomaly
     supercriticalExplosion: Cryo
     explosionTotalIntensity: 300
@@ -376,6 +389,8 @@
     coreInertPrototype: AnomalyCoreRockInert
     minPulseLength: 180
     maxPulseLength: 300
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyRockSupercritical
   - type: Sprite
     layers:
     - state: anom6
@@ -778,6 +793,8 @@
     coreInertPrototype: AnomalyCoreFloraInert
     minPulseLength: 60
     maxPulseLength: 120
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyFloraSupercritical
   - type: TileSpawnAnomaly
     entries:
     - settings:
@@ -881,6 +898,8 @@
     coreInertPrototype: AnomalyCoreLiquidInert
     minPulseLength: 60
     maxPulseLength: 120
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyFluidSupercritical
   - type: EntitySpawnAnomaly
     entries:
     - settings:
@@ -994,6 +1013,8 @@
     maxPulseLength: 120
     animationTime: 4
     offset: "-0.1,0.1"
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyShadowSupercritical
   - type: EntitySpawnAnomaly
     entries:
     - settings:
@@ -1054,6 +1075,8 @@
     coreInertPrototype: AnomalyCoreTechInert
     minPulseLength: 60
     maxPulseLength: 120
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyTechSupercritical
   - type: TechAnomaly
   - type: DeviceLinkSource
     ports:
@@ -1112,6 +1135,8 @@
     coreInertPrototype: AnomalyCoreSantaInert
     minPulseLength: 60
     maxPulseLength: 120
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyPresentSupercritical
   - type: EntitySpawnAnomaly
     entries:
     - settings:
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
index a5f6f32128..0ad1aa17f4 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
@@ -47,6 +47,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCorePyroclastic
         coreInertPrototype: AnomalyCorePyroclasticInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyPyroSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionPyroclastic
         startMessage: inner-anomaly-start-message-pyro
@@ -77,6 +79,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreElectricity
         coreInertPrototype: AnomalyCoreElectricityInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyElectricitySupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionElectric
         startMessage: inner-anomaly-start-message-shock
@@ -107,6 +111,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreShadow
         coreInertPrototype: AnomalyCoreShadowInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyShadowSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionShadow
         startMessage: inner-anomaly-start-message-shadow
@@ -137,6 +143,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreIce
         coreInertPrototype: AnomalyCoreIceInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyIceSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionIce
         startMessage: inner-anomaly-start-message-frost
@@ -167,6 +175,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreFlora
         coreInertPrototype: AnomalyCoreFloraInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyFloraSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionFlora
         startMessage: inner-anomaly-start-message-flora
@@ -197,6 +207,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreBluespace
         coreInertPrototype: AnomalyCoreBluespaceInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyBluespaceSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionBluespace
         startMessage: inner-anomaly-start-message-bluespace
@@ -227,6 +239,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreFlesh
         coreInertPrototype: AnomalyCoreFleshInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyFleshSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionFlesh
         startMessage: inner-anomaly-start-message-flesh
@@ -257,6 +271,9 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreGravity
         coreInertPrototype: AnomalyCoreGravityInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyGravitySupercritical
+        supercriticalDuration: 15
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionGravity
         startMessage: inner-anomaly-start-message-grav
@@ -287,6 +304,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreTech
         coreInertPrototype: AnomalyCoreTechInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyTechSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionTech
         startMessage: inner-anomaly-start-message-tech
@@ -318,6 +337,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreRock
         coreInertPrototype: AnomalyCoreRockInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyRockSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionRock
         startMessage: inner-anomaly-start-message-rock
@@ -348,6 +369,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreSanta
         coreInertPrototype: AnomalyCoreSantaInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyPresentSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionSanta
         startMessage: inner-anomaly-start-message-santa
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index e7e1481c3e..0662094143 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -112,6 +112,8 @@
     - type: GuideHelp
       guides:
       - GasCanisters
+    - type: Paintable
+      group: Canisters
 
 - type: entity
   parent: GasCanister
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
index 8e2d1a6e54..a30ae00e96 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
@@ -54,6 +54,8 @@
     node: done
     containers:
     - entity_storage
+  - type: Paintable
+    group: Locker
 
 - type: entity
   id: LockerBaseSecure
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 6713a8303d..52f29168fd 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -17,6 +17,8 @@
       path: /Audio/Effects/woodenclosetclose.ogg
     openSound:
       path: /Audio/Effects/woodenclosetopen.ogg
+  - type: Paintable
+    group: null # not shaped like other lockers
 
 # Basic
 - type: entity
@@ -190,6 +192,8 @@
     node: done
     containers:
     - entity_storage
+  - type: Paintable
+    group: null
 
 - type: entity
   id: LockerFreezer
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index 211eee609a..c38a20a698 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -124,6 +124,8 @@
     node: done
     containers:
     - entity_storage
+  - type: Paintable
+    group: Closet
 
 #Wall Closet
 - type: entity
@@ -205,6 +207,8 @@
     node: done
     containers:
     - entity_storage
+  - type: Paintable
+    group: WallCloset
 
 #Wall locker
 - type: entity
@@ -228,6 +232,8 @@
     - state: welded
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
+  - type: Paintable
+    group: WallLocker
 
 #Base suit storage unit
 #I am terribly sorry for duplicating the closet almost-wholesale, but the game malds at me if I don't so here we are.
@@ -316,7 +322,7 @@
             max: 1
   - type: Appearance
   - type: EntityStorageVisuals
-    stateBase: base
+    # stateBase: base  // This field does not exist. this is probably a bug. TODO
     stateDoorOpen: base
     stateDoorClosed: door
   - type: LockVisuals
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index 55f4dee041..635cdee16e 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -154,3 +154,5 @@
     - Energy
     reflectProb: 0.2
     spread: 90
+  - type: Paintable
+    group: CrateSecure
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index c4f8182870..70d79aa912 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -12,6 +12,8 @@
     - Energy
     reflectProb: 0.2
     spread: 90
+  - type: Paintable
+    group: CrateSteel
   - type: RadiationBlockingContainer
     resistance: 2.5
 
@@ -31,6 +33,8 @@
     - entity_storage
   - type: StaticPrice
     price: 100
+  - type: Paintable
+    group: CratePlastic
 
 - type: entity
   parent: CratePlastic
@@ -49,6 +53,8 @@
     node: done
     containers:
     - entity_storage
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: CratePlastic
@@ -840,6 +846,8 @@
       sprite: Structures/Storage/Crates/labels.rsi
       offset: "0.0,0.03125"
       map: ["enum.PaperLabelVisuals.Layer"]
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: CrateBaseSecure
@@ -866,6 +874,8 @@
       map: ["enum.PaperLabelVisuals.Layer"]
   - type: AccessReader
     access: [["Janitor"]]
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: CrateBaseWeldable
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
index 1f2a5ebeb0..278d93df68 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
@@ -66,7 +66,7 @@
     color: FloralWhite
     textOffset: 0,6
     timerOffset: 0,6
-    textLength: 5
+    # textLength: 5 This field does not exist. Bug?
     rows: 1
   - type: Sprite
     drawdepth: WallMountedItems
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index 1b04ea885c..2070635676 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -2003,7 +2003,7 @@
     - map: [ "enum.EdgeLayer.West" ]
       state: rock_chromite_west
     - state: rock_coal
-    map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+      map: [ "enum.MiningScannerVisualLayers.Overlay" ]
 
 - type: entity
   id: WallRockChromiteGold
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
index a319d06224..cf7303b7bb 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
@@ -77,6 +77,9 @@
   name: plastitanium window
   parent: PlastitaniumWindowSquareBase
   suffix: indestructible
+  components:
+  - type: ExaminableDamage
+    messages: null
 
 - type: entity
   id: PlastitaniumWindow
@@ -167,6 +170,9 @@
   name: plastitanium window
   parent: PlastitaniumWindowDiagonalBase
   suffix: diagonal, indestructible
+  components:
+  - type: ExaminableDamage
+    messages: null
 
 - type: entity
   id: PlastitaniumWindowDiagonal
diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index b7241b3d27..0c8ada8f76 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -257,6 +257,7 @@
   - type: Tag
     tags:
     - Diagonal
+    - Window
   - type: IconSmooth
     mode: Diagonal
     key: windows
diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index 6dd81058ca..e4348b4efb 100644
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -1479,3 +1479,7 @@
   flavorType: Base
   description: flavor-base-trashy
 
+- type: flavor
+  id: artifactglue
+  flavorType: Complex
+  description: flavor-complex-artifact-glue
diff --git a/Resources/Prototypes/GameRules/pests.yml b/Resources/Prototypes/GameRules/pests.yml
index c0a746a138..9ddee3d709 100644
--- a/Resources/Prototypes/GameRules/pests.yml
+++ b/Resources/Prototypes/GameRules/pests.yml
@@ -82,6 +82,8 @@
       prob: 0.03
     - id: MobMothroach
       prob: 0.008
+    - id: MobMoproach
+      prob: 0.004
 
 - type: entity
   id: SnailMigrationLowPop
diff --git a/Resources/Prototypes/Guidebook/medical.yml b/Resources/Prototypes/Guidebook/medical.yml
index 0c7b1c781e..74b433e04f 100644
--- a/Resources/Prototypes/Guidebook/medical.yml
+++ b/Resources/Prototypes/Guidebook/medical.yml
@@ -3,13 +3,13 @@
   name: guide-entry-medical
   text: "/ServerInfo/Guidebook/Medical/Medical.xml"
   children:
-  - Medical Doctor
+  - MedicalDoctor
   - Chemist
   - Cloning
   - Cryogenics
 
 - type: guideEntry
-  id: Medical Doctor
+  id: MedicalDoctor
   name: guide-entry-medicaldoctor
   text: "/ServerInfo/Guidebook/Medical/MedicalDoctor.xml"
 
diff --git a/Resources/Prototypes/InventoryTemplates/parrot_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/parrot_inventory_template.yml
new file mode 100644
index 0000000000..5460d730eb
--- /dev/null
+++ b/Resources/Prototypes/InventoryTemplates/parrot_inventory_template.yml
@@ -0,0 +1,10 @@
+- type: inventoryTemplate
+  id: parrot
+  slots:
+  - name: ears
+    slotTexture: ears
+    slotFlags: EARS
+    stripTime: 3
+    uiWindowPos: 0,2
+    strippingWindowPos: 0,0
+    displayName: Ears
diff --git a/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml
index e6c2984221..b800995038 100644
--- a/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml
@@ -9,8 +9,7 @@
     displayName: Mask
     whitelist:
       tags:
-        - PetWearable
-
+      - PetWearable
   - name: suitstorage
     slotTexture: suit_storage
     slotFlags: SUITSTORAGE
@@ -20,6 +19,45 @@
     displayName: Suit Storage
     whitelist:
       components:
-        - GasTank
-
+      - GasTank
 
+- type: inventoryTemplate
+  id: petAdvanced
+  slots:
+  - name: mask
+    slotTexture: mask
+    slotFlags: MASK
+    uiWindowPos: 0,2
+    strippingWindowPos: 1,1
+    displayName: Mask
+    whitelist:
+      tags:
+      - PetWearable
+  - name: suitstorage
+    slotTexture: suit_storage
+    slotFlags: SUITSTORAGE
+    stripTime: 3
+    uiWindowPos: 0,1
+    strippingWindowPos: 2,5
+    displayName: Suit Storage
+    whitelist:
+      components:
+      - GasTank
+  - name: head
+    slotTexture: head
+    slotFlags: HEAD
+    uiWindowPos: 1,3
+    strippingWindowPos: 1,0
+    displayName: Head
+    whitelist:
+      tags:
+      - PetWearable
+  - name: eyes
+    slotTexture: glasses
+    slotFlags: EYES
+    uiWindowPos: 1,2
+    strippingWindowPos: 1,2
+    displayName: Head
+    whitelist:
+      tags:
+      - PetWearable
diff --git a/Resources/Prototypes/InventoryTemplates/smartcorgi_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/smartcorgi_inventory_template.yml
index a775b6373b..0f4650141d 100644
--- a/Resources/Prototypes/InventoryTemplates/smartcorgi_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/smartcorgi_inventory_template.yml
@@ -64,7 +64,7 @@
     displayName: Eyes
     whitelist:
       tags:
-      - CorgiWearable
+      - PetWearable
   - name: head
     slotTexture: head
     slotFlags: HEAD
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
index 27e41e6461..eb252a0c43 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
@@ -77,3 +77,34 @@
   id: ChaplainHoodie
   equipment:
     outerClothing: ClothingOuterHoodieChaplain
+
+# Bible/Holy Book
+- type: loadout
+  id: Bible
+  storage:
+    back:
+    - Bible
+
+- type: loadout
+  id: BibleDruid
+  storage:
+    back:
+    - BibleDruid
+
+- type: loadout
+  id: BibleNanoTrasen
+  storage:
+    back:
+    - BibleNanoTrasen
+
+- type: loadout
+  id: BibleSatanic
+  storage:
+    back:
+    - BibleSatanic
+
+- type: loadout
+  id: BibleTanakh
+  storage:
+    back:
+    - BibleTanakh
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 39b6be2b04..32f73bbf83 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -369,6 +369,17 @@
   loadouts:
   - ChaplainNeck
 
+- type: loadoutGroup
+  id: ChaplainBible
+  name: loadout-group-chaplain-bible
+  minLimit: 1
+  loadouts:
+  - Bible
+  - BibleDruid
+  - BibleNanoTrasen
+  - BibleSatanic
+  - BibleTanakh
+
 - type: loadoutGroup
   id: JanitorHead
   name: loadout-group-janitor-head
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index cf4b443285..43ede4a05f 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -124,6 +124,7 @@
   - ChaplainJumpsuit
   - CommonBackpack
   - ChaplainOuterClothing
+  - ChaplainBible
   - Glasses
   - Survival
   - Trinkets
diff --git a/Resources/Prototypes/NPCs/mob.yml b/Resources/Prototypes/NPCs/mob.yml
index dd3378618a..77969ab92d 100644
--- a/Resources/Prototypes/NPCs/mob.yml
+++ b/Resources/Prototypes/NPCs/mob.yml
@@ -31,6 +31,19 @@
     - tasks:
         - !type:HTNCompoundTask
           task: IdleCompound
+          
+- type: htnCompound
+  id: MoproachCompound
+  branches:
+  - tasks:
+    - !type:HTNCompoundTask
+      task: FoodCompound
+  - tasks:
+    - !type:HTNCompoundTask
+      task: BufferNearbyPuddlesCompound
+  - tasks:
+    - !type:HTNCompoundTask
+      task: IdleCompound
 
 - type: htnCompound
   id: GlockroachCompound
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index 93a946df4a..c687c52a46 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -169,7 +169,7 @@
   id: FlippoEngravedLighter
   name: steal-target-groups-flippo-engraved-lighter
   sprite:
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     state: zippo_engraved_icon_base
 
 - type: stealTargetGroup
diff --git a/Resources/Prototypes/Paintables/airlock_groups.yml b/Resources/Prototypes/Paintables/airlock_groups.yml
new file mode 100644
index 0000000000..58b54b2dce
--- /dev/null
+++ b/Resources/Prototypes/Paintables/airlock_groups.yml
@@ -0,0 +1,40 @@
+- type: paintableGroup
+  id: AirlockStandard
+  time: 3
+  cost: 3
+  defaultStyle: basic
+  styles:
+    atmospherics: AirlockAtmospherics
+    basic: Airlock
+    cargo: AirlockCargo
+    chemistry: AirlockChemistry
+    command: AirlockCommand
+    engineering: AirlockEngineering
+    freezer: AirlockFreezer
+    hydroponics: AirlockHydroponics
+    maintenance: AirlockMaint
+    medical: AirlockMedical
+    salvage: AirlockSalvage
+    science: AirlockScience
+    security: AirlockSecurity
+    virology: AirlockVirology
+
+- type: paintableGroup
+  id: AirlockGlass
+  time: 3
+  cost: 3
+  defaultStyle: basic
+  styles:
+    atmospherics: AirlockAtmosphericsGlass
+    basic: AirlockGlass
+    cargo: AirlockCargoGlass
+    chemistry: AirlockChemistryGlass
+    command: AirlockCommandGlass
+    engineering: AirlockEngineeringGlass
+    hydroponics: AirlockHydroponicsGlass
+    maintenance: AirlockMaintGlass
+    medical: AirlockMedicalGlass
+    salvage: AirlockSalvageGlass
+    science: AirlockScienceGlass
+    security: AirlockSecurityGlass
+    virology: AirlockVirologyGlass
diff --git a/Resources/Prototypes/Paintables/canister_groups.yml b/Resources/Prototypes/Paintables/canister_groups.yml
new file mode 100644
index 0000000000..5485f07662
--- /dev/null
+++ b/Resources/Prototypes/Paintables/canister_groups.yml
@@ -0,0 +1,16 @@
+- type: paintableGroup
+  cost: 2
+  id: Canisters
+  defaultStyle: storage
+  styles:
+    air: AirCanister
+    ammonia: AmmoniaCanister
+    carbon-dioxide: CarbonDioxideCanister
+    frezon: FrezonCanister
+    nitrogen: NitrogenCanister
+    nitrous-oxide: NitrousOxideCanister
+    oxygen: OxygenCanister
+    plasma: PlasmaCanister
+    storage: StorageCanister
+    tritium: TritiumCanister
+    water-vapor: WaterVaporCanister
diff --git a/Resources/Prototypes/Paintables/categories.yml b/Resources/Prototypes/Paintables/categories.yml
new file mode 100644
index 0000000000..75998c31ba
--- /dev/null
+++ b/Resources/Prototypes/Paintables/categories.yml
@@ -0,0 +1,25 @@
+- type: paintableGroupCategory
+  id: Airlocks
+  groups:
+  - AirlockStandard
+  - AirlockGlass
+
+- type: paintableGroupCategory
+  id: Canisters
+  groups:
+  - Canisters
+
+- type: paintableGroupCategory
+  id: Crates
+  groups:
+  - CrateSteel
+  - CratePlastic
+  - CrateSecure
+
+- type: paintableGroupCategory
+  id: Lockers
+  groups:
+  - Locker
+  - Closet
+  - WallLocker
+  - WallCloset
diff --git a/Resources/Prototypes/Paintables/crate_groups.yml b/Resources/Prototypes/Paintables/crate_groups.yml
new file mode 100644
index 0000000000..117b1df12f
--- /dev/null
+++ b/Resources/Prototypes/Paintables/crate_groups.yml
@@ -0,0 +1,38 @@
+- type: paintableGroup
+  id: CrateSteel
+  cost: 2
+  defaultStyle: basic
+  styles:
+    basic: CrateGenericSteel
+    electrical: CrateElectrical
+    engineering: CrateEngineering
+    radiation: CrateRadiation
+    science: CrateScience
+    surgery: CrateSurgery
+
+- type: paintableGroup
+  id: CratePlastic
+  cost: 2
+  defaultStyle: basic
+  styles:
+    basic: CratePlastic
+    hydroponics: CrateHydroponics
+    medical: CrateMedical
+    oxygen: CrateInternals
+
+- type: paintableGroup
+  id: CrateSecure
+  cost: 2
+  defaultStyle: basic
+  styles:
+    basic: CrateSecure
+    chemistry: CrateChemistrySecure
+    command: CrateCommandSecure
+    engineering: CrateEngineeringSecure
+    hydroponics: CrateHydroSecure
+    medical: CrateMedicalSecure
+    plasma: CratePlasma
+    private: CratePrivateSecure
+    science: CrateScienceSecure
+    secgear: CrateSecgear
+    weapon: CrateWeaponSecure
diff --git a/Resources/Prototypes/Paintables/locker_groups.yml b/Resources/Prototypes/Paintables/locker_groups.yml
new file mode 100644
index 0000000000..b9bdf1c89f
--- /dev/null
+++ b/Resources/Prototypes/Paintables/locker_groups.yml
@@ -0,0 +1,80 @@
+- type: paintableGroup
+  id: Locker
+  cost: 2
+  defaultStyle: basic
+  styles:
+    atmospherics: LockerAtmospherics
+    basic: ClosetSteelBase
+    botanist: LockerBotanist
+    brigmedic: LockerBrigmedic
+    captain: LockerCaptain
+    ce: LockerChiefEngineer
+    chemical: LockerChemistry
+    clown: LockerClown
+    cmo: LockerChiefMedicalOfficer
+    doctor: LockerMedical
+    electrical: LockerElectricalSupplies
+    engineer: LockerEngineer
+    evac: LockerEvacRepair
+    hop: LockerHeadOfPersonnel
+    hos: LockerHeadOfSecurity
+    mime: LockerMime
+    medicine: LockerMedicine
+    paramedic: LockerParamedic
+    quartermaster: LockerQuarterMaster
+    rd: LockerResearchDirector
+    representative: LockerRepresentative
+    salvage: LockerSalvageSpecialist
+    scientist: LockerScientist
+    security: LockerSecurity
+    welding: LockerWeldingSupplies
+
+- type: paintableGroup
+  id: Closet
+  cost: 2
+  defaultStyle: basic
+  styles:
+    basic: ClosetSteelBase
+    biohazard: ClosetL3
+    biohazard-janitor: ClosetL3Janitor
+    biohazard-science: ClosetL3Science
+    biohazard-security: ClosetL3Security
+    biohazard-virology: ClosetL3Virology
+    bomb: ClosetBomb
+    bomb-janitor: ClosetJanitorBomb
+    chef: ClosetChef
+    fire: ClosetFire
+    janitor: ClosetJanitor
+    legal: ClosetLegal
+    nitrogen: ClosetEmergencyN2
+    oxygen: ClosetEmergency
+    radiation: ClosetRadiationSuit
+    tool: ClosetTool
+
+- type: paintableGroup
+  id: WallCloset
+  cost: 2
+  defaultStyle: basic
+  styles:
+    atmospherics: ClosetWallAtmospherics
+    basic: ClosetWall
+    black: ClosetWallBlack
+    blue: ClosetWallBlue
+    fire: ClosetWallFire
+    green: ClosetWallGreen
+    grey: ClosetWallGrey
+    mixed: ClosetWallMixed
+    nitrogen: ClosetWallEmergencyN2
+    orange: ClosetWallOrange
+    oxygen: ClosetWallEmergency
+    pink: ClosetWallPink
+    white: ClosetWallWhite
+    yellow: ClosetWallYellow
+
+- type: paintableGroup
+  id: WallLocker
+  cost: 2
+  defaultStyle: medical
+  styles:
+    evac: LockerWallEvacRepair
+    medical: LockerWallMedical
diff --git a/Resources/Prototypes/Parallaxes/amber.yml b/Resources/Prototypes/Parallaxes/amber.yml
index 83bf8cb0a5..7cd60a83a4 100644
--- a/Resources/Prototypes/Parallaxes/amber.yml
+++ b/Resources/Prototypes/Parallaxes/amber.yml
@@ -48,5 +48,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/aspid.yml b/Resources/Prototypes/Parallaxes/aspid.yml
index efcce1500d..85f3443782 100644
--- a/Resources/Prototypes/Parallaxes/aspid.yml
+++ b/Resources/Prototypes/Parallaxes/aspid.yml
@@ -36,5 +36,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/bagel.yml b/Resources/Prototypes/Parallaxes/bagel.yml
index abf51b9bdf..2939a3919c 100644
--- a/Resources/Prototypes/Parallaxes/bagel.yml
+++ b/Resources/Prototypes/Parallaxes/bagel.yml
@@ -37,5 +37,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/core.yml b/Resources/Prototypes/Parallaxes/core.yml
index 773104c33f..a56f230a1c 100644
--- a/Resources/Prototypes/Parallaxes/core.yml
+++ b/Resources/Prototypes/Parallaxes/core.yml
@@ -37,5 +37,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/default.yml b/Resources/Prototypes/Parallaxes/default.yml
index 4a84b4618b..02fe72c05d 100644
--- a/Resources/Prototypes/Parallaxes/default.yml
+++ b/Resources/Prototypes/Parallaxes/default.yml
@@ -34,7 +34,7 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
 
 # Because hyperspace and the menu need their own.
@@ -71,6 +71,6 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.5
+      slowness: 0.5
   layersLQUseHQ: false
 
diff --git a/Resources/Prototypes/Parallaxes/exo.yml b/Resources/Prototypes/Parallaxes/exo.yml
index 0fcc7361b0..26b3b6d075 100644
--- a/Resources/Prototypes/Parallaxes/exo.yml
+++ b/Resources/Prototypes/Parallaxes/exo.yml
@@ -36,5 +36,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/kettle.yml b/Resources/Prototypes/Parallaxes/kettle.yml
index 8f2972e178..c99306ae80 100644
--- a/Resources/Prototypes/Parallaxes/kettle.yml
+++ b/Resources/Prototypes/Parallaxes/kettle.yml
@@ -36,5 +36,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/origin.yml b/Resources/Prototypes/Parallaxes/origin.yml
index 174f21a3ca..550057ed47 100644
--- a/Resources/Prototypes/Parallaxes/origin.yml
+++ b/Resources/Prototypes/Parallaxes/origin.yml
@@ -37,5 +37,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/plasma.yml b/Resources/Prototypes/Parallaxes/plasma.yml
index 6110248539..5964ea0edc 100644
--- a/Resources/Prototypes/Parallaxes/plasma.yml
+++ b/Resources/Prototypes/Parallaxes/plasma.yml
@@ -49,5 +49,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/train.yml b/Resources/Prototypes/Parallaxes/train.yml
index e506043c85..e47cedfc2a 100644
--- a/Resources/Prototypes/Parallaxes/train.yml
+++ b/Resources/Prototypes/Parallaxes/train.yml
@@ -63,6 +63,6 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
       scrolling: "0, -0.475"
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml
index 4542c97565..45c55ce4dd 100644
--- a/Resources/Prototypes/Reagents/chemicals.yml
+++ b/Resources/Prototypes/Reagents/chemicals.yml
@@ -81,6 +81,23 @@
         - !type:ReagentThreshold
           min: 5
 
+- type: reagent
+  parent: Artifexium
+  id: ArtifactGlue
+  name: reagent-name-artifact-glue
+  desc: reagent-desc-artifact-glue
+  flavor: artifactglue
+  physicalDesc: reagent-physical-desc-non-newtonian
+  color: "#827394"
+  reactiveEffects:
+    Acidic:
+      methods: [ Touch ]
+      effects:
+      - !type:ArtifactDurabilityRestore
+        conditions:
+        - !type:ReagentThreshold
+          min: 5
+
 - type: reagent
   id: Benzene
   name: reagent-name-benzene
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
index 5d83ba31c7..f59aa689a8 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
@@ -510,6 +510,10 @@
           steps:
             - tool: Welding
               doAfter: 5
+        - to: wall
+          steps:
+            - tool: Brushing
+              doAfter: 12
 
     - node: reinforcedWallRust
       entity: WallReinforcedRust
@@ -518,3 +522,7 @@
           steps:
             - tool: Welding
               doAfter: 5
+        - to: reinforcedWall
+          steps:
+            - tool: Brushing
+              doAfter: 12
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 13462b86da..d576d5789e 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -2422,3 +2422,16 @@
     FoodMeat: 1
     FoodTomato: 1
     FoodSoybeans: 2 # replace these with green beans once those become a thing
+
+- type: microwaveMealRecipe
+  id: RecipeMoproach # TODO: Move this to be an actual surgery instead, once surgery gets implemented.
+  name: moproach recipe
+  result: MobMoproach
+  time: 30
+  group: Other
+  reagents:
+    SpaceCleaner: 15
+  solids:
+    MobMothroach: 1
+    OrganAnimalHeart: 1
+    MoproachShoes: 1
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
index e756f9518e..44959d4fb6 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
@@ -36,3 +36,50 @@
         doAfter: 5
   - node: suit
     entity: ClothingOuterSuitIan
+
+- type: constructionGraph
+  id: MoproachShoes
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: shoes
+      steps:
+      - tag: MopBasic
+        name: construction-graph-tag-mop-basic
+        icon:
+          sprite: Objects/Specific/Janitorial/mop.rsi
+          state: mop
+        doAfter: 5
+      - tag: MopBasic
+        name: construction-graph-tag-mop-basic
+        icon:
+          sprite: Objects/Specific/Janitorial/mop.rsi
+          state: mop
+        doAfter: 5
+      - tag: MopBasic
+        name: construction-graph-tag-mop-basic
+        icon:
+          sprite: Objects/Specific/Janitorial/mop.rsi
+          state: mop
+        doAfter: 5
+      - tag: MopBasic
+        name: construction-graph-tag-mop-basic
+        icon:
+          sprite: Objects/Specific/Janitorial/mop.rsi
+          state: mop
+        doAfter: 5
+      - tag: MopBasic
+        name: construction-graph-tag-mop-basic
+        icon:
+          sprite: Objects/Specific/Janitorial/mop.rsi
+          state: mop
+        doAfter: 5
+      - tag: MopBasic
+        name: construction-graph-tag-mop-basic
+        icon:
+          sprite: Objects/Specific/Janitorial/mop.rsi
+          state: mop
+        doAfter: 5
+  - node: shoes
+    entity: MoproachShoes
diff --git a/Resources/Prototypes/Recipes/Crafting/toys.yml b/Resources/Prototypes/Recipes/Crafting/toys.yml
index a3bc1bdf72..374f96fa47 100644
--- a/Resources/Prototypes/Recipes/Crafting/toys.yml
+++ b/Resources/Prototypes/Recipes/Crafting/toys.yml
@@ -13,3 +13,11 @@
   targetNode: suit
   category: construction-category-misc
   objectType: Item
+
+- type: construction
+  id: MoproachShoes
+  graph: MoproachShoes
+  startNode: start
+  targetNode: shoes
+  category: construction-category-misc
+  objectType: Item
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml b/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml
index 3ecd39cc98..1f504e3ae4 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml
@@ -12,6 +12,7 @@
   - NetworkConfigurator
   - Signaller
   - SprayPainter
+  - SprayPainterAmmo
   - FlashlightLantern
   - HandheldGPSBasic
   - TRayScanner
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
index 16d28fa9bf..164a85dc44 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
@@ -30,6 +30,7 @@
   - SignallerAdvanced
   - DeviceQuantumSpinInverter
   - DeviceDesynchronizer
+  - ClothingBackpackHarmpack
 
 - type: latheRecipePack
   id: ScienceClothing
@@ -37,6 +38,7 @@
   - ClothingShoesBootsMagSci
   - ClothingShoesBootsMoon
   - ClothingShoesBootsSpeed
+  - ClothingShoesBootsJump
   - ClothingBackpackHolding
   - ClothingBackpackSatchelHolding
   - ClothingBackpackDuffelHolding
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
index 4beee0f9d1..f3e8891b25 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
@@ -75,6 +75,7 @@
   - PowerCageMedium
   - PowerCageSmall
   - TelescopicShield
+  - ClothingBackpackHarmpack
 
 - type: latheRecipePack
   id: SecurityBoards
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/service.yml b/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
index 07a3e08a4b..9669937ffc 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
@@ -25,6 +25,7 @@
   - MopItem
   - Holoprojector
   - WetFloorSign
+  - WireBrush
 
 - type: latheRecipePack
   id: ServiceBoardsStatic
diff --git a/Resources/Prototypes/Recipes/Lathes/janitorial.yml b/Resources/Prototypes/Recipes/Lathes/janitorial.yml
index 9ba7dfa188..e230a09a4a 100644
--- a/Resources/Prototypes/Recipes/Lathes/janitorial.yml
+++ b/Resources/Prototypes/Recipes/Lathes/janitorial.yml
@@ -104,3 +104,11 @@
   materials:
     Steel: 250
     Glass: 1000
+
+- type: latheRecipe
+  id: WireBrush
+  result: WireBrush
+  completetime: 2
+  materials:
+    Steel: 100
+    Plastic: 100
diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index 9d4ecf7697..40d155b1fd 100644
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -167,6 +167,16 @@
     Plastic: 1000
     Silver: 500
 
+- type: latheRecipe
+  id: ClothingShoesBootsJump
+  result: ClothingShoesBootsJump
+  completetime: 2
+  materials:
+    Steel: 1400
+    Plastic: 600
+    Silver: 200
+    Plasma: 200
+
 - type: latheRecipe
   id: ModularReceiver
   result: ModularReceiver
@@ -265,4 +275,5 @@
   result: Ashtray
   completetime: 1
   materials:
-    Steel: 30
\ No newline at end of file
+    Steel: 30
+    
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 606e628669..71f815e5aa 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -84,6 +84,18 @@
     Plasma: 500
     Glass: 500
 
+- type: latheRecipe
+  id: ClothingBackpackHarmpack
+  result: ClothingBackpackHarmpack
+  categories:
+  - Clothing
+  completetime: 15
+  materials:
+    Steel: 2000
+    Plastic: 1000
+    Plasma: 500
+    Gold: 500
+
 # Shields
 - type: latheRecipe
   parent: BaseShieldRecipe
diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml
index 8a8c88d1e6..f54da83d25 100644
--- a/Resources/Prototypes/Recipes/Lathes/tools.yml
+++ b/Resources/Prototypes/Recipes/Lathes/tools.yml
@@ -154,11 +154,19 @@
 - type: latheRecipe
   parent: BaseToolRecipe
   id: SprayPainter
-  result: SprayPainter
+  result: SprayPainterEmpty
   materials:
     Steel: 300
     Plastic: 100
 
+- type: latheRecipe
+  parent: BaseToolRecipe
+  id: SprayPainterAmmo
+  result: SprayPainterAmmo
+  materials:
+    Steel: 150
+    Plastic: 50
+
 - type: latheRecipe
   parent: BaseToolRecipe
   id: UtilityBelt
diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
index 537a792e85..b405956e2d 100644
--- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
@@ -501,3 +501,13 @@
       amount: 1
   products:
     Tazinide: 1
+
+- type: reaction
+  id: ArtifactGlue
+  reactants:
+    SpaceGlue:
+      amount: 1
+    Artifexium:
+      amount: 1
+  products:
+    ArtifactGlue: 2
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 7ba7cea9da..bb12a2c25f 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -191,6 +191,18 @@
   technologyPrerequisites:
   - SalvageWeapons
 
+- type: technology
+  id: DualWieldingTechnology
+  name: research-technology-dual-wielding-technology
+  icon:
+    sprite: Clothing/Back/Specific/harmpack.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - ClothingBackpackHarmpack
+
 # Tier 3
 
 - type: technology
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index 467afe5fef..08d2083e3b 100644
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -14,6 +14,7 @@
   - MineralScannerEmpty
   - OreProcessorIndustrialMachineCircuitboard
   - ClothingMaskWeldingGas
+  - ClothingShoesBootsJump
 
 - type: technology
   id: SpaceScanning
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
index d50fa14775..3b87d984aa 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -23,7 +23,6 @@
     ears: ClothingHeadsetService
   storage:
     back:
-    - Bible
     - RubberStampChaplain
 
 - type: chameleonOutfit
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
index 74ed4af7c4..e8179f09b1 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -20,6 +20,9 @@
           Piercing: 4
         groups:
           Burn: 3
+      catchingFailDamage:
+        types:
+          Blunt: 1
     - type: SleepEmitSound
       snore: /Audio/Voice/Misc/silly_snore.ogg
       interval: 10
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index 1448a07cba..a3d316d214 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -103,6 +103,11 @@
     jumpsuit: ClothingUniformJumpsuitJacketMonkey
     id: PunPunIDCard
 
+- type: startingGear
+  id: MobPollyGear
+  equipment:
+    ears: ClothingHeadsetEngineering
+
 # Emotional Support Scurret
 
 - type: startingGear
@@ -143,7 +148,7 @@
 - type: startingGear
   id: MobAghostGear
   equipment:
-    back: ClothingBackpackSatchelHolding
+    back: ClothingBackpackSatchelAdmin
     id: AdminPDA
   storage:
     back:
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
index 310f36e8b1..d3bb481ff7 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
@@ -194,7 +194,7 @@
     neck: ClothingNeckCloakQm
     id: VisitorPDA
     back: ClothingBackpackCargo
-    ears: ClothingHeadsetRD
+    ears: ClothingHeadsetQM
     outerClothing: ClothingOuterWinterQM
     pocket1: WeaponDisabler
     pocket2: AppraisalTool
@@ -282,7 +282,7 @@
     outerClothing: ClothingOuterArmorBasicSlim
     pocket1: WeaponPistolMk58
     pocket2: MagazinePistol
-  inhand: 
+  inhand:
   - FlashlightSeclite
 
 - type: startingGear
@@ -859,7 +859,7 @@
     eyes: ClothingEyesHudMedical
     pocket1: RegenerativeMesh
     pocket2: PillCanisterBicaridine
-  inhand: 
+  inhand:
   - ScalpelAdvanced
   - MedicatedSuture
 
diff --git a/Resources/Prototypes/SoundCollections/anomaly.yml b/Resources/Prototypes/SoundCollections/anomaly.yml
new file mode 100644
index 0000000000..291b5d4a27
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/anomaly.yml
@@ -0,0 +1,59 @@
+- type: soundCollection
+  id: AnomalyFleshSupercritical
+  files:
+  - /Audio/Items/Anomaly/flesh_crit.ogg
+
+- type: soundCollection
+  id: AnomalyShadowSupercritical
+  files:
+  - /Audio/Items/Anomaly/shadow_crit.ogg
+
+- type: soundCollection
+  id: AnomalyTechSupercritical
+  files:
+  - /Audio/Items/Anomaly/tech_crit.ogg
+
+- type: soundCollection
+  id: AnomalyPresentSupercritical
+  files:
+  - /Audio/Items/Anomaly/present_crit.ogg
+
+- type: soundCollection
+  id: AnomalyPyroSupercritical
+  files:
+  - /Audio/Items/Anomaly/pyro_crit.ogg
+
+- type: soundCollection
+  id: AnomalyGravitySupercritical
+  files:
+  - /Audio/Items/Anomaly/grav_crit.ogg
+
+- type: soundCollection
+  id: AnomalyElectricitySupercritical
+  files:
+  - /Audio/Items/Anomaly/electricity_crit.ogg
+
+- type: soundCollection
+  id: AnomalyBluespaceSupercritical
+  files:
+  - /Audio/Items/Anomaly/bluespace_crit.ogg
+
+- type: soundCollection
+  id: AnomalyIceSupercritical
+  files:
+  - /Audio/Items/Anomaly/ice_crit.ogg
+
+- type: soundCollection
+  id: AnomalyFluidSupercritical
+  files:
+  - /Audio/Items/Anomaly/fluid_crit.ogg
+
+- type: soundCollection
+  id: AnomalyFloraSupercritical
+  files:
+  - /Audio/Items/Anomaly/flora_crit.ogg
+
+- type: soundCollection
+  id: AnomalyRockSupercritical
+  files:
+  - /Audio/Items/Anomaly/rock_crit.ogg
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index cdcd6c8afc..8c36cc2886 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -890,9 +890,6 @@
 - type: Tag
   id: MagazineShotgun
 
-- type: Tag
-  id: MagazineMagnumSubMachineGun
-
 - type: Tag
   id: MagazinePistolSubMachineGun
 
@@ -1151,6 +1148,9 @@
 - type: Tag
   id: ReinforcedGlassShard
 
+- type: Tag
+  id: RemoteSignaller
+
 - type: Tag
   id: ReptilianFood
 
@@ -1475,6 +1475,9 @@
 - type: Tag
   id: Wine
 
+- type: Tag
+  id: WireBrush
+
 - type: Tag
   id: Wirecutter
 
diff --git a/Resources/Prototypes/tool_qualities.yml b/Resources/Prototypes/tool_qualities.yml
index ff55d9fcf1..5bb8a06200 100644
--- a/Resources/Prototypes/tool_qualities.yml
+++ b/Resources/Prototypes/tool_qualities.yml
@@ -67,3 +67,10 @@
   toolName: tool-quality-rolling-tool-name
   spawn: RollingPin
   icon: { sprite: Objects/Tools/rolling_pin.rsi, state: icon }
+
+- type: tool
+  id: Brushing
+  name: tool-quality-brushing-name
+  toolName: tool-quality-brushing-tool-name
+  spawn: WireBrush
+  icon: { sprite: Objects/Specific/Janitorial/wirebrush.rsi, state: icon }
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml b/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
index 2572c906b0..4e6daf8ba2 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
@@ -8,7 +8,7 @@
 
   ## Various Antagonists
   Antagonists can take many forms, like:
-  - [textlink="Traitors" link="Traitors"] amongst the crew who must assassinate, steal and decieve.
+  - [textlink="Traitors" link="Traitors"] amongst the crew who must assassinate, steal and deceive.
   - [textlink="Thieves" link="Thieves"] driven by kleptomania, determined to get their fix using their special gloves.
   - [textlink="Revolutionaries" link="Revolutionaries"] who are intent on taking control of the station from the inside.
   - [textlink="Nuclear operatives" link="Nuclear Operatives"], with the goal of infiltrating and destroying the station.
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
index e051f1e9d1..52a7986963 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
@@ -1,7 +1,7 @@
 <Document>
   # Minor Antagonists
 
-  Most if not all Minor Antagonists are ghost-controlled roles that gives dead people new ways to cause chaos around the station. They are spawned by random events.
+  Minor Antagonists are ghost-controlled roles that give dead people a second chance to interact (and cause chaos!) around the station. They are spawned by random events.
 
   # Paradox Clone
 
@@ -9,7 +9,9 @@
     <GuideEntityEmbed Entity="ParadoxCloneDummy"/>
   </Box>
 
-  A perfect copy of a random crewmember that was thrown into our universe by a space-time anomaly. To fix the paradox and survive they have to find and kill their original counterpart. They have no special abilities, but are have identical appearance, DNA, fingerprints, clothing, equipment and IDs, making it hard to figure out who is the orginal and who is the clone, unless you know your fellow crewmembers well.
+  A perfect copy of a random crewmember that was thrown into our universe by a space-time anomaly. To fix the paradox and survive they have to find and kill their original counterpart.
+
+They have no special abilities, but are identical in appearance, DNA, fingerprints, clothing, equipment and IDs, making it hard to figure out who is the original and who is the clone... unless you know your fellow crewmembers well!
 
   # Revenant
 
@@ -70,5 +72,5 @@
 
   Slimes and spiders have no remarkable features, but will [color=cyan]infest the station[/color] from time to time regardless. Both will give chase and attack anything they see.
   - Slimes may [bold]deal extra cellular or poison damage[/bold], based upon their color. Water hurts them just as it would hurt a slime person.
-  - Spiders have a venomous bite and can [bold]create webs[/bold] that are hard to move though. Webs are easily destroyed with a blade. They can also pry open doors, windoors, and airlocks.
+  - Spiders have a venomous bite and can [bold]create webs[/bold] that are hard to move through, but are easily destroyed with a blade. They can also pry open doors, windoors, and airlocks.
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml b/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
index 11149bab66..83288140c1 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml	
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml	
@@ -16,16 +16,16 @@
   ## Operatives
   Your team will be made up of several different roles, which are:
   - [bold]Operatives[/bold], standard soldiers who can take up the grunt work.
-  - The [bold]Agent[/bold] who works with reagents to make medicines or chemical weapons.
+  - The [bold]Corpsman[/bold] who works with reagents to make medicines or chemical weapons.
   - The [bold]Commander[/bold] who draws up the plan and leads the team.
 
   <Box>
     <GuideEntityEmbed Entity="ClothingOuterHardsuitSyndie"/>
-    <GuideEntityEmbed Entity="ClothingOuterHardsuitSyndieMedic" Caption="agent's hardsuit"/>
+    <GuideEntityEmbed Entity="ClothingOuterHardsuitSyndieMedic" Caption="corpsman's hardsuit"/>
     <GuideEntityEmbed Entity="ClothingOuterHardsuitSyndieCommander" Caption="commander's hardsuit"/>
   </Box>
 
-  If you have been selected as the Agent or Commander but don't feel ready, one of your teammates can take responsibility.
+  If you have been selected as the Corpsman or Commander but don't feel ready, one of your teammates can take over your responsibilities.
 
   ## The Disk
 
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
index 5943f52bbf..cc15d01feb 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
@@ -68,12 +68,12 @@
 
   Alternatively, your objectives may require you to [italic][color=cyan]die a glorious death.[/color][/italic] [bold]Make sure you don't come back from the dead,[/bold] or else you may wake up in cuffs.
 
-  ## Appropiation
+  ## Appropriation
   More often than not, you'll have to [italic][color=cyan]steal a possession of a department head.[/color][/italic]
 
   The target may be in their office, or on their person. It may become necessary to kill whoever is carrying it, if you cannot pickpocket them.
 
-  You may be tasked with:
+  Some of the things you may be tasked with include:
   - Stealing the [color=yellow]Captain[/color]'s [bold]ID Card[/bold], [bold]antique laser pistol[/bold], [bold]jetpack[/bold], or [bold]nuclear authentication disk[/bold].
   <Box>
     <GuideEntityEmbed Entity="CaptainIDCard" Caption=""/>
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml b/Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
index c932092a63..2d0056c21f 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
@@ -1,6 +1,6 @@
 <Document>
   # Zombies
-  
+
   <Box>
     [color=#999999][italic]"They're coming to get you, Barbara!"[/italic][/color]
   </Box>
@@ -11,10 +11,10 @@
   Zombies are conversion antagonists that infect all beings that they bite with [color=#7e916e]Romerol[/color], a deadly, contagious virus that can easily spread if not contained.
 
   <Box>
-    <GuideReagentEmbed Reagent="Romerol"></GuideReagentEmbed>
+    <GuideReagentEmbed Reagent="Romerol"/>
   </Box>
 
-  ## Inital Infected
+  ## Initial Infected
   You are patient zero. You have [color=#7e916e]Romerol[/color] coursing through your veins and you have a grand desire to share it with every single flesh being you see.
 
   Upon learning of your infection, [italic]all bets are off[/italic]. You have only so much time before you turn, and you want to [bold]maximize your chances of taking over the station.[/bold]
@@ -43,10 +43,10 @@
   If you're infected but not zombified yet, using [color=#86caf7]Ambuzol[/color] will cure you but won't prevent re-infection. [color=#1274b5]Ambuzol Plus[/color] will cure and prevent re-infection only while alive.
 
   <Box>
-    <GuideReagentEmbed Reagent="Ambuzol"></GuideReagentEmbed>
+    <GuideReagentEmbed Reagent="Ambuzol"/>
   </Box>
   <Box>
-    <GuideReagentEmbed Reagent="AmbuzolPlus"></GuideReagentEmbed>
+    <GuideReagentEmbed Reagent="AmbuzolPlus"/>
   </Box>
 
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml b/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
index 7e74d5d796..e9fdebc805 100644
--- a/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
+++ b/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
@@ -23,11 +23,11 @@
     <GuideEntityEmbed Entity="AppraisalTool"/>
   </Box>
 
-  With the [color=cyan]Bounty Manifest[/color], it is now up to you to collect the required goods. Most departments will give you what you need by asking for it with a Bounty Manifest.
+  With the [color=cyan]Bounty Manifest[/color], it is now up to you to collect the required goods, but most departments will give you what you need if you ask for it with a Bounty Manifest.
 
   Once you have collected the goods, return to the cargo bay and put the goods inside an empty [color=cyan]Crate[/color]. After everything is in the crate, close it, and then apply the Bounty Manifest to it.
 
-  To verify the completion of a bounty, use the [color=cyan]Appraisal Tool[/color] on it. It should say that it confirms that the bounty has been completed.
+  To verify the completion of a bounty, use the [color=cyan]Appraisal Tool[/color] on it. It should show a confirmation that the bounty has been completed.
 
   ## Selling Bounties
 
diff --git a/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml b/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
index 9e9c3833f9..9cab9aced2 100644
--- a/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
+++ b/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
@@ -7,7 +7,7 @@
 
   ## Preparations
 
-  Before leaving the station, ensure you are prepared with all the required equipment. Otherwise, you will die before seeing any profits!
+  Before leaving the station, ensure you are prepared with all the required equipment. Otherwise, you will likely die before seeing any profits!
 
   <Box>
     <GuideEntityEmbed Entity="SuitStorageSalv"/>
@@ -15,7 +15,7 @@
     <GuideEntityEmbed Entity="VendingMachineSalvage"/>
   </Box>
 
-  Everything needed before leaving the station is provided inside Salvage's starting room. While Science can research better weapons and equipment, it is best to be equipped with something rather than nothing.
+  Everything needed before leaving the station is provided inside Salvage's starting room. While Science can research better weapons and equipment, it is best to be equipped with your starting gear rather than nothing.
 
   <Box>
     <GuideEntityEmbed Entity="ClothingOuterHardsuitSpatio"/>
@@ -44,7 +44,7 @@
 
   While you can technically mine and gather ore with just a PKA and a Backpack, Salvagers start with more specialized gear for the task.
 
-  - [color=cyan]Pickaxe[/color]: This is required for mining at any reasonable speed when wielded. Also, it works as a melee weapon!
+  - [color=cyan]Pickaxe[/color]: This is required for mining at any reasonable speed when wielded. It also works as a handy melee weapon!
   - [color=cyan]Ore Bag[/color]: When equipped in your belt slot, this magnetizes nearby ore and automatically picks it up for you.
 
   <Box>
@@ -109,7 +109,7 @@
     <GuideEntityEmbed Entity="Recycler"/>
   </Box>
 
-  [color=cyan]Space Debris[/color] is a versatile option, providing vital basic materials (such as steel, glass, etc) in short supply at the start of the shift. Items and scrap are scattered across the debris, and must be collected. Consider dragging along one of the lockers or crates aboard the debris for easier storage.
+  [color=cyan]Space Debris[/color] is a versatile option, providing vital basic materials (such as steel, glass, etc.) in short supply at the start of the shift. Items and scrap are scattered across the debris, and must be collected. Consider dragging along one of the lockers or crates aboard the debris for easier storage.
 
   Debris is sprinkled with numerous threats. Bloodthirsty [color=red]Space Carp[/color] and [color=red]Sharkminnows[/color] infest them, eager to rush any Salvagers that come nearby. [color=red]Landmines[/color] are also rarely found aboard debris, capable of incapacitating the unwary explorer.
 
@@ -160,7 +160,7 @@
 
   The [color=purple]Science Department[/color] is a crucial partner for Salvage. Science depends on Salvage for both basic materials (steel, plastic, glass) and advanced materials (silver, gold, plasma, and uranium), and Salvage relies on Science for the upgraded equipment that makes their work easier.
 
-  Whenever possible, communicate with Science and try to prioritize their requests. While Science will need large quantities of basic materials, they rely entirely on you for their supply of [color=yellow]Gold, Silver and Uranium,[/color] all of which are required for your advanced gear. If you want Science to help you, you have to help them - and vice-versa.
+  Whenever possible, communicate with Science and try to prioritize their requests. While Science will need large quantities of basic materials, they rely entirely on you for their supply of [color=yellow]Gold, Silver and Uranium,[/color] all of which are required for your advanced gear. If you want Science to help you, you have to help them - and vice versa.
 
   <Box>
     <GuideEntityEmbed Entity="MiningDrill"/>
diff --git a/Resources/ServerInfo/Guidebook/Science/Robotics.xml b/Resources/ServerInfo/Guidebook/Science/Robotics.xml
index 0244c1da42..599befc252 100644
--- a/Resources/ServerInfo/Guidebook/Science/Robotics.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Robotics.xml
@@ -1,6 +1,6 @@
 <Document>
   # Robotics
-  The science team has the ability to create several unique types of robots to suit the station's needs. In order to begin, you'll want to research [color=#a4885c]Robotics[/color] technology.
+  The science team has the ability to create several unique types of robots to suit the station's needs. In order to begin, you'll want to research the [color=#a4885c]Robotics[/color] technology.
 
   ## Exosuit Fabricator
 <Box>
@@ -28,7 +28,7 @@
 </Box>
   [color=#a4885c]Bots[/color] are small, simple automata which can perform simple tasks, such as cleaning. They don't use power cells, but are quite fragile. Making these will require parts which can be made at an exosuit fabricator.
 
-  To make a bot, open the [color=#a4885c]Construction Menu[/color] and go to the "Utilities" category  (or just search "bot") and you'll have the whole list of recipes. In order to assemble the bot, you must have the parts outlined by the recipe close to you and click [color=#a4885c]Build[/color], after a few seconds your newly created silicon servant should appear at your feet!
+  To make a bot, open the [color=#a4885c]Construction Menu[/color] and go to the "Utilities" category (or just search "bot") and you'll have the whole list of recipes. In order to assemble the bot, you must have the parts outlined by the recipe close to you and click [color=#a4885c]Build[/color], after a few seconds your newly created silicon servant should appear at your feet!
 
   ## Mechs
 <Box>
@@ -47,7 +47,7 @@
 <GuideEntityEmbed Entity="RipleyPeripheralsElectronics" Caption="Ripley peripherals control module"/>
 </Box>
 
-  For example, both of the circuit boards above are necessary to create a ripley mech, and cannot be used to make any other mech.
+  For example, both of the circuit boards above are necessary to create a Ripley mech, and cannot be used to make any other mech.
 
   To start making a mech, print their harness in the fabricator and insert the limbs, you can [color=#a4885c]examine[/color] it to see how to proceed with construction once all limbs are in place.
   - Every mech requires some combination of wires, tool usage, and their own unique circuit boards to construct after the chassis has been assembled. Most mechs have two or more unique circuit boards. For example, the [color=#a4885c]Ripley[/color] mech requires a [color=#a4885c]ripley controls module[/color] board and a [color=#a4885c]ripley peripherals module[/color] board.
diff --git a/Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml b/Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml
index d2662519cb..c42e28fc39 100644
--- a/Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml
+++ b/Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml
@@ -1,7 +1,7 @@
 <Document>
 ## Anomaly Scanner
 
-The Anomaly Scanner is used to gather various information on anomalies. They can be found inside of the lockers in the science department.
+The Anomaly Scanner is used to gather various information on anomalies. They can be found inside the lockers in the science department.
 
 <Box>
 <GuideEntityEmbed Entity="AnomalyScanner"/>
diff --git a/Resources/ServerInfo/Guidebook/Science/Science.xml b/Resources/ServerInfo/Guidebook/Science/Science.xml
index e3de7738c7..99bcd714cf 100644
--- a/Resources/ServerInfo/Guidebook/Science/Science.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Science.xml
@@ -1,6 +1,6 @@
 <Document>
 # Science
-[color=#c96dbf]Science[/color], often called Research and Development, is a job made up of both generating research points to unlock new technologies as well as using said technologies to produce new items at lathes to help out the station.
+[color=#c96dbf]Science[/color], often called Research and Development, is a job consisting of generating research points to unlock new technologies and using said technologies to produce new items at lathes to help out the station.
 
 ## Personnel
 [color=#c96dbf]Science[/color]'s staff is made up of Research Assistants and Scientists. [color=#c96dbf]Science[/color] is run by the Research Director.
@@ -9,7 +9,7 @@
    <GuideEntityEmbed Entity="ToyFigurineScientist" Caption="Scientist"/>
    <GuideEntityEmbed Entity="ToyFigurineResearchDirector" Caption="RD"/>
   </Box>
-  
+
 ## Technologies
   <Box>
     <GuideEntityEmbed Entity="ComputerResearchAndDevelopment"/>
@@ -37,7 +37,7 @@ Each Discipline tree has up to 3 tiers of technologies. At the start the only ti
 
 In order to progress further, you have to research up to [color=brown]75%[/color] of the current tier to move to the next one. So in order to unlock T2 researches you need to research 75% of T1.
 
-Now [color=green]Tier 3[/color] is where it gets interesting. If you research a T3 tech, you [color=brown]lock out[/color] T3 techs from other Discipline trees. That is, unless... you find some other way around it, probably should ask your [color=purple]Research Director[/color].
+Now [color=green]Tier 3[/color] is where it gets interesting. If you research a T3 tech, you [color=brown]lock out[/color] T3 techs from other Discipline trees. That is, unless you can find some other way around it... you should probably ask your [color=purple]Research Director[/color].
 
 ## Lathes
   <Box>
diff --git a/Resources/ServerInfo/Guidebook/Security/Defusal.xml b/Resources/ServerInfo/Guidebook/Security/Defusal.xml
index 583b8a34c7..8ebd71a346 100644
--- a/Resources/ServerInfo/Guidebook/Security/Defusal.xml
+++ b/Resources/ServerInfo/Guidebook/Security/Defusal.xml
@@ -69,5 +69,5 @@
   - [color=green]Mend the wire[/color]: Mending the wire will re-enable the bolts.
 
   [color=#a4885c]Dummy Wire[/color]
-  - Dummy wires don't do anything. You can pulse, cut, and mend them freely and they will not affect the bomb at all.
+  - Dummy wires don't do anything. You can pulse, cut, and mend them freely without affecting the bomb at all.
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Security/Forensics.xml b/Resources/ServerInfo/Guidebook/Security/Forensics.xml
index 733969b5a6..936bf299c0 100644
--- a/Resources/ServerInfo/Guidebook/Security/Forensics.xml
+++ b/Resources/ServerInfo/Guidebook/Security/Forensics.xml
@@ -3,7 +3,7 @@
 
   There are a lot of tools to help you gather and examine the evidence at your disposal
 
-  # Log probe
+  # LogProbe
 
   This little add-on to your PDA is incredibly useful, just install the cartridge and your PDA will acquire the ability to scan anything with access (like airlocks) and see who has used them recently.
 
@@ -26,11 +26,11 @@
   </Box>
   So be careful before fighting with someone.
 
-  Same scanner can also get fingerprint information about who touched pretty much any object. If the possible perpetrator was using gloves, then your scanner will print out which fibers were left on the crimescene.
+   That same forensic scanner can also get fingerprint information about who touched pretty much any object. If the possible perpetrator was using gloves, then your scanner will print out which fibers were left on the crime scene.
 
   ## I got DNA. How do I recognize whose it is?
 
-  You can print the forensic information of the object you scanned so you never miss it. Now with the paper containing DNA you can simply find a [color=#a4885c]Station Records Computer[/color] and look for a person whose DNA matches. Same applies to finding whose fingerprint is is.
+  You can print the forensic information of the object you scanned so you never miss it. Now with the paper containing DNA you can simply find a [color=#a4885c]Station Records Computer[/color] and look for a person whose DNA matches. Same applies to finding whose fingerprint it is.
 
   ## Taking Fingerprints
   It is also possible to take someone's fingerprints while on scene if you make them take off their gloves and apply a forensic pad to their fingers. No need to run back to [color=#a4885c]Station Records Computer[/color] to check if the butler did it!
@@ -38,7 +38,7 @@
   <GuideEntityEmbed Entity="ForensicPad"/>
 
   ## Fibers
-  Whenenever people wearing gloves touch anything on the station, they are bound to leave behind some fibers. This complicates things, but nothing is unsolvable for a real detective.
+  Whenever people wearing gloves touch anything on the station, they are bound to leave behind some fibers. This complicates things, but nothing is unsolvable for a real detective.
 
   There are up to [color=red]26[/color] different types of fibers possible. Can that stop you from solving the case?
 
diff --git a/Resources/ServerInfo/Guidebook/Security/Security.xml b/Resources/ServerInfo/Guidebook/Security/Security.xml
index 3df94c6b9b..452d75458f 100644
--- a/Resources/ServerInfo/Guidebook/Security/Security.xml
+++ b/Resources/ServerInfo/Guidebook/Security/Security.xml
@@ -33,7 +33,7 @@ It is worth noting that flashes can be both used in a large area ([color=yellow]
   </Box>
 
 ## Lethals
-Should the situation dictate, [color=#cb0000]Security[/color] have access to laser rifles, shotguns, handguns and automatic rifles able to put down substancial fire against any who would stand against the station.
+Should the situation dictate, [color=#cb0000]Security[/color] have access to laser rifles, shotguns, handguns and automatic rifles able to put down substantial fire against any who would stand against the station.
   <Box>
     <GuideEntityEmbed Entity="WeaponLaserCarbine"/>
     <GuideEntityEmbed Entity="WeaponShotgunKammerer"/>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml b/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml
index 3daabbb623..3b209380b7 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml
@@ -18,7 +18,6 @@
   - Roundstart Captain granting all heads AA
   - Roundstart HoP takes Ian to ATS because “He’s a high profile target”
   - Creating duplicates of high-value or unique items to hand off to others
-  - Using low-effort roleplay to skirt the metashield
   - Bolting doors to areas to increase their security before a threat is confirmed that makes that security inefficient
   - Setting the alert level to Blue or Red when the situation does not have a need for the severity implied (this includes maintaining these levels far past when said threats have been confirmed as no longer in play)
   - General situations where a character is preemptively preparing for situations that have yet to happen in ways that logically do not make sense
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml
index 5ed53c3f2c..f980fbb504 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml
@@ -1,92 +1,56 @@
 <Document>
-  # Roleplay Rule 4 - Do not metagame, obey the Metashield
-  Something that is "shielded" cannot be known by your character during a round until the "revealing condition" happens. This also means that your character cannot do things based on "shielded" information. Knowing or acting on something that is shielded before the revealing condition is met is referred to as metagaming.
+  # Roleplay Rule 4 -# Do not use information your character would not have knowledge of.
+Metagaming in Space station 14 is the term used to typically describe actions based on knowledge during a round that is inaccessible to your character. You cannot use information gained while dead or a ghost if you are alive. Use of information gained while dead is considered metagaming. This does not apply to knowledge of what antagonists are capable of doing. We expect players to understand what options are avaliable to antagonists.
 
-  Revealing conditions reveal the shielded information for the round, not for a specific instance. This means that once a revealing condition is met in a round, the shield no longer applies in any case for the remainder of the round.
+## Out of character information and metagaming.
+Unless otherwise specified, when playing as a different character (such as taking a ghost role or being changed to another character via admin intervention), you are to act without knowledge of what occurred in the round as any prior characters and as a ghost while playing a character (ghosts are not considered a character for this rule). Mindswap spells and polymorphs are not considered changing characters for this rule. Failure to follow this is metagaming.
 
-  ## Never Revealed IC
-  Some shields are never revealed IC. This means that your character can never act as if they know about that shielded thing.
+The knowledge that a round will end is out of character information. Knowledge that the shift will end however, is not out of character information. The intention of this rule is to prevent preparation for End of round griefing (EORG). Utilising the knowledge that the round will end is metagaming.
 
-  The following are shielded:
-  - Current game mode and possible antags during the current game mode.
-  - Events from previous rounds.
-  - Events you experienced as a different character.
-  - All information related to the player of a character rather than the character itself. (See "Metafriending and Metagrudging" below.)
-  - All information gained while dead or a ghost.
-  - The fact that a round will end.
+### Knowledge from past lives
+Except when otherwise specified, you cannot use any information gained in a past life in the same round.
+For example, if you were killed by an antagonist, you cannot warn the crew of said antagonist when you respawn as a mothroach.
+This does _not_ apply when being brought back from death as the same character, having your brain transferred to another body, or being cloned.
+For example, if you were killed by an antagonist, your body was found and your brain was placed in a borg, you can recall what happened prior to your original death and could warn the of the antagonist.
 
-  This does not prevent knowing that a shift will end, but does prohibit things like preparing to kill people at central command when roleplay rules stop being enforced on LRP.
+### Knowledge that the round will end (and your character will, ergo, cease to exist)
+Your character will, or should, know that their current shift on Space Station 14 will end and that they will return to Centcomm. They do not know that this represents the effective end of their existence from the perspective of their player.
+You cannot preprepare for end-of-round griefing (EORG) or perform other actions that only make sense in the context that, your characters life ultimately doesn't matter.
 
-  ## Nuclear Operatives
+### Knowledge gained via LOOC
+You cannot use any knowledge gained via LOOC chat that is not in the context of assisting a player with controls, game mechanics, or being made to feel welcome. No in character information should be shared via LOOC, and no actions should be taken or altered because of LOOC or OOC chats.
 
-  The existence of Nuclear Operatives beyond a myth that no one would act on is shielded.
+### MRP Amendment
+Being in the critically injured state or otherwise unconscious (includes sleeping) prevents your character from remembering anything that happened to or around them while unconscious. If brought out of the critical state to the alive state, you may remember what caused you to enter critical state. Entering the dead state causes your character to forget all events related to their death (if you can tie it to how you died, do not remember it). If revived, placed in a MMI, or in the case of Diona, splitting, the character is aware of the fact that they have died but not how.
 
-  The fact that the nuke disk must be protected and could be used by a bad actor to try to destroy the station is not shielded.
+## Do Not Metafriend or Metagrudge
+Giving a person or character preferential treatment based on the events of a previous round is considered metafriending. Treating a person or character negatively based on the events of a previous round is considered metagrudging.
 
-  The revealing condition for this shield is any of the following:
-  - discovering a blood red hardsuit
-  - discovering a nuclear operative's shuttle
-  - an operative name
-  - a War Ops announcement
-  - being a nuclear operative
+#### Metafriending Examples
+These are all examples of things that are prohibited.
+- Giving a character additional access or a job because you are friends with the player who is playing that character.
+- Trusting a character because you are friends with the player who is playing that character.
+- Not fighting a character because you are friends with the player who is playing that character.
+- Ignoring your objective to kill a character because your character and theirs became friends in a previous round.
 
-  ## Chameleon Items
+#### Metagrudging Examples
+These are all examples of things that are prohibited.
 
-  Chameleon items are shielded.
+- Not giving a character additional access or a job because you are mad at or don't like the player who is playing that character.
+- Not trusting a character because you are mad at or don't like the player who is playing that character.
+- Starting a fight with a character because of something that they did in a previous round.
+- Starting a fight with a character because of a major event that happened in a previous round.
+- Starting a fight with a character because they killed you while you were playing a different character.
+- Targeting or harassing a character based on anything which that character did in a previous round.
+- Targeting or harassing a character based on anything which the character's player did while not playing the character.
 
-  Being suspicious of an item being fake or stolen is not shielded, but testing items or calling them chameleon is covered by this shield.
 
-  The revealing condition for this shield is any of the following:
-  - seeing someone else cause any chameleon item to change
-  - finding holographic nanomachine fibers
-  - experiencing a situation where absolutely no other explanation is possible
-  - discovering an unlocked uplink
+## Explicitly Not Metagaming
 
-  ## Stealth Items
-
-  The fact that an item can be something other than what its visual appearance and examine description indicate is shielded.
-
-  This shield protects stealth items, including protecting them from being tested.
-
-  The revealing condition for this shield is any of the following:
-  - seeing the item behave differently than the expected behavior for the item
-  - seeing the item used for its hidden purpose
-  - experiencing a situation where absolutely no other explanation is possible
-  - discovering an unlocked uplink
-
-  ## MRP Amendment 1
-  A shield prevents your character from remembering anything that happened while unconscious. This shield is never revealed IC.
-
-  ## MRP Amendment 2
-  There is a "New Life Rule" shield. It prevents you from remembering anything that lead to your death, even if you are put into an MMI. If you are cloned, it also prevents you from remembering everything from that round. This shield is never revealed IC.
-
-  ## Metafriending and Metagrudging
-  This section provides additional information on a concept that is prohibited by multiple metashield items that are never revealed IC. Giving a person or character preferential treatment based on something that your character should not know is considered metafriending. Treating a person or character negatively based on something that your character should not know is considered metagrudging.
-
-  ## Metafriending Examples
-  These are all examples of things that are prohibited by at least one metashield item that is never revealed IC.
-  - Giving a character additional access or a job because you are friends with the player who is playing that character.
-  - Trusting a character because you are friends with the player who is playing that character.
-  - Not fighting a character because you are friends with the player who is playing that character.
-  - Ignoring your objective to kill a character because your character and theirs became friends in a previous round.
-
-  ## Metagrudging Examples
-  These are all examples of things that are prohibited by at least one metashield item that is never revealed IC.
-  - Not giving a character additional access or a job because you are mad at or don't like the player who is playing that character.
-  - Not trusting a character because you are mad at or don't like the player who is playing that character.
-  - Starting a fight with a character because of something that they did last round.
-  - Starting a fight with a character because they killed you while you were playing a different character.
-  - Targeting or harassing a character based on anything which that character did outside the current round.
-  - Targeting or harassing a character based on anything which the character's player did while not playing the character.
-
-  ## Explicitly Not Shielded
-  The following is a list of things that are explicitly not shielded. If something is not on this list, it doesn't mean that it is shielded, but if something is on it then it definitely is not shielded.
-  - The fact that the nuke disk must be protected and could be used by a bad actor to try to destroy the station.
-  - Items that are of high value or are desired by the Syndicate, and therefore are likely targets of theft.
-  - The idea that any Syndicate agent or other bad actor has goals or objectives that they are attempting to accomplish.
-  - The number of goals or objectives that a Syndicate agent or other bad actor has.
-  - The fact that the Syndicate are enemies of Nanotrasen, and that they regularly attempt to send covert agents to spy on, sabotage, or attack Nanotrasen.
-  - A character's typical appearance. Though you should keep in mind that multiple characters can share the same name.
-  - The fact that the Syndicate have covert items capable of getting items to them, and that these items are known as uplinks.
-  - The fact that the Syndicate can provide subdermal implants to their agents with various capabilities.
+- Protecting high value crew items (will be labeled as such), such as the nuke disk, with the understanding that a bad actor may attempt to steal or use them.
+- Remembering the general events of previous rounds (shifts) up to the extent that you do not metagrudge or metafriend any other player or character, remembering that you survived a violent shooting in the medbay is acceptable for example, stating who the shooter was is not. Avoid making remarks about specific characters, such as calling out someone who was an antagonist in a prior round.
+- The fact that antagonists exist and may be present on or off the station in any form.
+- Knowledge of a characters typical appearance.
+- Using knowledge of a characters typical appearance including your own for a disguise, such as a nuclear operative disguising as themselves as crew.
+- Knowing that enemies may have concealed items that may have function that are not immediately apparent.
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml b/Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml
index 583043675c..6e96faee59 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml
@@ -36,7 +36,7 @@
   - [textlink="1. Silicons must follow Silicon Rules" link="RuleR1"]
   - [textlink="2. Familiars must obey their master" link="RuleR2"]
   - [textlink="3. Roleplay a normal person" link="RuleR3"]
-  - [textlink="4. Do not metagame, obey the Metashield" link="RuleR4"]
+  - [textlink="4. Do not metagame, do not metagrudge" link="RuleR4"]
   - [textlink="5. Don't interfere with arrivals" link="RuleR5"]
   - [textlink="6. Don't act like an antagonist unless the game tells you that you are one" link="RuleR6"]
   - [textlink="7. Do not stall the round" link="RuleR7"]
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml b/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml
index 222acaebb5..0954a79859 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml
@@ -36,7 +36,7 @@
   - [textlink="1. Silicons must follow Silicon Rules" link="RuleR1"]
   - [textlink="2. Familiars must obey their master" link="RuleR2"]
   - [textlink="3. Roleplay a normal person" link="RuleR3"]
-  - [textlink="4. Do not metagame, obey the Metashield" link="RuleR4"]
+  - [textlink="4. Do not metagame, do not metagrudge" link="RuleR4"]
   - [textlink="5. Don't interfere with arrivals" link="RuleR5"]
   - [textlink="6. Don't act like an antagonist unless the game tells you that you are one" link="RuleR6"]
   - [textlink="7. Do not stall the round" link="RuleR7"]
diff --git a/Resources/ServerInfo/Guidebook/Service/Janitorial.xml b/Resources/ServerInfo/Guidebook/Service/Janitorial.xml
index dd41ba11bf..2bd6ff7657 100644
--- a/Resources/ServerInfo/Guidebook/Service/Janitorial.xml
+++ b/Resources/ServerInfo/Guidebook/Service/Janitorial.xml
@@ -23,6 +23,7 @@ You keep things clean, it's a rough job sometimes, but someone's gotta do it. Th
 <GuideEntityEmbed Entity="WetFloorSign"/>
 <GuideEntityEmbed Entity="Holoprojector" Caption="holosign projector"/>
 <GuideEntityEmbed Entity="LightReplacer"/>
+<GuideEntityEmbed Entity="WireBrush"/>
 </Box>
 <Box>
 <GuideEntityEmbed Entity="AdvMopItem" Caption="Advanced mop, ask in R&D"/>
diff --git a/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000..f1f9e5aff7
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/icon.png b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/icon.png
new file mode 100644
index 0000000000..ddf8af9119
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/inhand-left.png
new file mode 100644
index 0000000000..6b3dfd73ed
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/inhand-right.png
new file mode 100644
index 0000000000..224065dc68
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/meta.json b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/meta.json
new file mode 100644
index 0000000000..37ee2d1693
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Created by EmoGarbage404 (github) for Space Station 14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
index d6c4a337c0..ac7d927d23 100644
--- a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark, omnisexual pin by juliangiebel, genderqueer and genderfluid by centcomofficer24, ally by FairlySadPanda, aroace by momochitters, plural by CubixThree",
+  "copyright": "Aromantic, asexual, bisexual, intersex, lesbian, lgbt, non-binary, pansexual and transgender pins by PixelTK, gay pin by BackeTako, autism pins by Terraspark, omnisexual pin by juliangiebel, genderqueer and genderfluid by centcomofficer24, ally by FairlySadPanda, aroace by momochitters, plural by CubixThree",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET-vox.png
new file mode 100644
index 0000000000..e01c5d3638
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET-vox.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET.png
new file mode 100644
index 0000000000..06c62f2869
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/icon.png
new file mode 100644
index 0000000000..8a548ba6a4
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-left.png
new file mode 100644
index 0000000000..7c1c8fa122
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-right.png
new file mode 100644
index 0000000000..f7ee26e9a8
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/meta.json
new file mode 100644
index 0000000000..faaa2fe6bb
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cd6ba31a1b5891133c14b9ebba4a4479143b5167",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-FEET-vox",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Interface/Actions/jump.rsi/icon.png b/Resources/Textures/Interface/Actions/jump.rsi/icon.png
new file mode 100644
index 0000000000..46af10ae27
Binary files /dev/null and b/Resources/Textures/Interface/Actions/jump.rsi/icon.png differ
diff --git a/Resources/Textures/Interface/Actions/jump.rsi/meta.json b/Resources/Textures/Interface/Actions/jump.rsi/meta.json
new file mode 100644
index 0000000000..7a2119f3fb
--- /dev/null
+++ b/Resources/Textures/Interface/Actions/jump.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a373b4cb08298523d40acc14f9c390a0c403fc31",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Interface/AdminActions/clear-parrot.png b/Resources/Textures/Interface/AdminActions/clear-parrot.png
new file mode 100644
index 0000000000..bf027c421d
Binary files /dev/null and b/Resources/Textures/Interface/AdminActions/clear-parrot.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/0-equipped-HELMET.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/0-equipped-HELMET.png
new file mode 100644
index 0000000000..f756efee72
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/0-equipped-HELMET.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/icon.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/icon.png
new file mode 100644
index 0000000000..1923b5d594
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/icon.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-left.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-left.png
new file mode 100644
index 0000000000..7b6b9a28a3
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-right.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-right.png
new file mode 100644
index 0000000000..f184340af0
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/meta.json b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/meta.json
new file mode 100644
index 0000000000..3629b336ee
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/meta.json
@@ -0,0 +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, all edited by lzk228",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "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/moproach.rsi/mothroach-moving.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach-moving.png
new file mode 100644
index 0000000000..929cf998c8
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach-moving.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach.png
new file mode 100644
index 0000000000..8bc772c31f
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach_dead.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach_dead.png
new file mode 100644
index 0000000000..83cbc86e4d
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach_dead.png differ
diff --git a/Resources/Textures/Mobs/Animals/parrot.rsi/parrot.png b/Resources/Textures/Mobs/Animals/parrot.rsi/parrot.png
deleted file mode 100644
index fd9079fd66..0000000000
Binary files a/Resources/Textures/Mobs/Animals/parrot.rsi/parrot.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/parrot/displacement.rsi/ears.png b/Resources/Textures/Mobs/Animals/parrot/displacement.rsi/ears.png
new file mode 100644
index 0000000000..7244b37f5c
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/parrot/displacement.rsi/ears.png differ
diff --git a/Resources/Textures/Mobs/Animals/parrot/displacement.rsi/meta.json b/Resources/Textures/Mobs/Animals/parrot/displacement.rsi/meta.json
new file mode 100644
index 0000000000..ad46a0b6ed
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/parrot/displacement.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-3.0",
+  "copyright": "Made by Crude Oil",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "load": {
+    "srgb": false
+  },
+  "states": [
+    {
+      "name": "ears",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Animals/parrot.rsi/dead.png b/Resources/Textures/Mobs/Animals/parrot/parrot.rsi/dead.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/parrot.rsi/dead.png
rename to Resources/Textures/Mobs/Animals/parrot/parrot.rsi/dead.png
diff --git a/Resources/Textures/Mobs/Animals/parrot.rsi/icon.png b/Resources/Textures/Mobs/Animals/parrot/parrot.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/parrot.rsi/icon.png
rename to Resources/Textures/Mobs/Animals/parrot/parrot.rsi/icon.png
diff --git a/Resources/Textures/Mobs/Animals/parrot.rsi/meta.json b/Resources/Textures/Mobs/Animals/parrot/parrot.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Mobs/Animals/parrot.rsi/meta.json
rename to Resources/Textures/Mobs/Animals/parrot/parrot.rsi/meta.json
diff --git a/Resources/Textures/Mobs/Animals/parrot/parrot.rsi/parrot.png b/Resources/Textures/Mobs/Animals/parrot/parrot.rsi/parrot.png
new file mode 100644
index 0000000000..48b71f7b25
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/parrot/parrot.rsi/parrot.png differ
diff --git a/Resources/Textures/Mobs/Animals/parrot.rsi/sit.png b/Resources/Textures/Mobs/Animals/parrot/parrot.rsi/sit.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/parrot.rsi/sit.png
rename to Resources/Textures/Mobs/Animals/parrot/parrot.rsi/sit.png
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_lower.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_lower.png
new file mode 100644
index 0000000000..7a10a15fda
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_lower.png differ
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_upper.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_upper.png
new file mode 100644
index 0000000000..56615b3dc6
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_upper.png differ
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json
index bd8400a374..fbaf3ae193 100644
--- a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi",
+  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi. eyeshadow_upper and eyeshadow_lower made by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -54,6 +54,14 @@
     {
       "name": "tattoo_eye_moth_l",
       "directions": 4
+    },
+    {
+      "name": "eyeshadow_upper",
+      "directions": 4
+    },
+    {
+      "name": "eyeshadow_lower",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/bushy_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/bushy_s.png
new file mode 100644
index 0000000000..71883f9e78
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/bushy_s.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/hedgehog_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/hedgehog_s.png
new file mode 100644
index 0000000000..b0982ca5c0
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/hedgehog_s.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/mad_scientist_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/mad_scientist_s.png
new file mode 100644
index 0000000000..b21fde3e16
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/mad_scientist_s.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
index 99004ffaf8..446bbd5c95 100644
--- a/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
@@ -1,12 +1,16 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/dcd1f5d88a8c5ba9634fc3fce67a76ada45f71dc/icons/mob/sprite_accessories/vox/vox_hair.dmi and greyscaled. wise_braid_s modified from braid_s by Flareguy, spotty by Flareguy",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/dcd1f5d88a8c5ba9634fc3fce67a76ada45f71dc/icons/mob/sprite_accessories/vox/vox_hair.dmi and greyscaled. wise_braid_s modified from braid_s by Flareguy. mad_scientist_s modified from keelquills_s by Flareguy. spotty_s, bushy_s, hedgehog_s, and slick_s by Flareguy",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
+    {
+      "name": "bushy_s",
+      "directions": 4
+    },
     {
       "name": "crestedquills_s",
       "directions": 4
@@ -51,10 +55,18 @@
       "name": "razor_clipped_s",
       "directions": 4
     },
+    {
+      "name": "mad_scientist_s",
+      "directions": 4
+    },
     {
       "name": "mohawk_s",
       "directions": 4
     },
+    {
+      "name": "hedgehog_s",
+      "directions": 4
+    },
     {
       "name": "horns_s",
       "directions": 4
@@ -102,6 +114,10 @@
     {
       "name": "flowing_s",
       "directions": 4
+    },
+    {
+      "name": "slick_s",
+      "directions": 4
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/slick_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/slick_s.png
new file mode 100644
index 0000000000..69e9671294
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/slick_s.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/wise_braid_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/wise_braid_s.png
index d35ddc4842..d4a7a5bde5 100644
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/wise_braid_s.png and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/wise_braid_s.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json
index fd5c14b6a3..183e3c0338 100644
--- a/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant and Flareguy",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant and Flareguy. tail_big and tail_short modified from tail by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -48,7 +48,15 @@
       "directions": 4
     },
     {
-      "name": "tail_stenciled",
+      "name": "tail_full",
+      "directions": 4
+    },
+    {
+      "name": "tail_short",
+      "directions": 4
+    },
+    {
+      "name": "tail_big",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail.png
index 0e63d3327b..7edd5f40f5 100644
Binary files a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail.png and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_big.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_big.png
new file mode 100644
index 0000000000..a9dfd0f6d6
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_big.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_full.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_full.png
new file mode 100644
index 0000000000..9582d39d9d
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_full.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_short.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_short.png
new file mode 100644
index 0000000000..c714a65e89
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_short.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png
deleted file mode 100644
index 9072c9f4fc..0000000000
Binary files a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json
new file mode 100644
index 0000000000..7e74ffb8b6
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json
@@ -0,0 +1,59 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "vox_scar_chest, vox_scar_eye_left, vox_scar_eye_right, vox_scar_top_surgery_long and vox_scar_top_surgery_short drawn by Ubaser, vox_scar_neck, vox_scar_chest_bullets, vox_scar_stomach_bullets, vox_scar_face_1 and vox_scar_face_2 originally drawn by Ktyria(discord) edited by TrixxedHeart, vox_scar_eye_left_small and vox_scar_eye_right_small modified from vox_scar_eye_left and vox_scar_eye_right originally by Boaz1111(github) edited by TrixxedHeart.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "vox_scar_eye_left",
+      "directions": 4
+    },
+    {
+      "name": "vox_scar_eye_right",
+      "directions": 4
+    },
+    {
+      "name": "vox_top_surgery_short",
+      "directions": 4
+    },
+    {
+      "name": "vox_top_surgery_long",
+      "directions": 4
+    },
+    {
+      "name": "vox_scar_chest",
+      "directions": 4
+    },
+    {
+      "name": "vox_scar_neck",
+      "directions": 4
+    },
+    {
+      "name": "vox_scar_chest_bullets",
+      "directions": 4
+    },
+    {
+      "name": "vox_scar_stomach_bullets",
+      "directions": 4
+    },
+    {
+      "name": "vox_scar_face_1",
+      "directions": 4
+    },
+    {
+      "name": "vox_scar_face_2",
+      "directions": 4
+    }, 
+    {
+      "name": "vox_scar_eye_left_small",
+      "directions": 4
+    }, 
+    {
+      "name": "vox_scar_eye_right_small",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest.png
new file mode 100644
index 0000000000..59c04641bd
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest_bullets.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest_bullets.png
new file mode 100644
index 0000000000..ff9bff2276
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest_bullets.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left.png
new file mode 100644
index 0000000000..b369711f3b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left_small.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left_small.png
new file mode 100644
index 0000000000..5fc01b19b0
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left_small.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right.png
new file mode 100644
index 0000000000..ff86c3882c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right_small.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right_small.png
new file mode 100644
index 0000000000..76efe1412f
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right_small.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_1.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_1.png
new file mode 100644
index 0000000000..c19ce0cf39
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_2.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_2.png
new file mode 100644
index 0000000000..32f7f6a938
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_neck.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_neck.png
new file mode 100644
index 0000000000..9feed1955e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_neck.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_stomach_bullets.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_stomach_bullets.png
new file mode 100644
index 0000000000..2eb9538a49
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_stomach_bullets.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_long.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_long.png
new file mode 100644
index 0000000000..5624b47c8c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_long.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_short.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_short.png
new file mode 100644
index 0000000000..aaa4e10d17
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_short.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_large.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_large.png
new file mode 100644
index 0000000000..ff8f5ef304
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_large.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_medium.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_medium.png
new file mode 100644
index 0000000000..8884d1c5d9
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_medium.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_small.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_small.png
new file mode 100644
index 0000000000..4027e9a893
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_small.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
index 725fbb6a0d..e1d263c9ac 100644
--- a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/ef7a4d962915cb36b138eeb59663f0053d4906fe/icons/mob/sprite_accessories/vox/vox_body_markings.dmi and modified by Flareguy",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/ef7a4d962915cb36b138eeb59663f0053d4906fe/icons/mob/sprite_accessories/vox/vox_body_markings.dmi and modified by Flareguy. eyeshadow & tail_ring states by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -22,6 +22,30 @@
     {
       "name": "nightling_s",
       "directions": 4
+    },
+    {
+      "name": "tattoo_eye_vox_r",
+      "directions": 4
+    },
+    {
+      "name": "tattoo_eye_vox_l",
+      "directions": 4
+    },
+    {
+      "name": "eyeshadow_small",
+      "directions": 4
+    },
+    {
+      "name": "eyeshadow_medium",
+      "directions": 4
+    },
+    {
+      "name": "eyeshadow_large",
+      "directions": 4
+    },
+    {
+      "name": "tail_ring",
+      "directions": 4
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tail_ring.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tail_ring.png
new file mode 100644
index 0000000000..3e3f2ab413
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tail_ring.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_l.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_l.png
new file mode 100644
index 0000000000..b0351eeb2b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_l.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_r.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_r.png
new file mode 100644
index 0000000000..f748cef2d4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_r.png differ
diff --git a/Resources/Textures/Mobs/Effects/stunned.rsi/meta.json b/Resources/Textures/Mobs/Effects/stunned.rsi/meta.json
new file mode 100644
index 0000000000..ea721b943f
--- /dev/null
+++ b/Resources/Textures/Mobs/Effects/stunned.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by Princess Cheeseballs, https://github.com/Princess-Cheeseballs",
+    "states": [
+        {
+            "name": "stunned",
+            "directions": 1,
+            "delays": [
+                [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Effects/stunned.rsi/stunned.png b/Resources/Textures/Mobs/Effects/stunned.rsi/stunned.png
new file mode 100644
index 0000000000..7ad891b4f6
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/stunned.rsi/stunned.png differ
diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/belt_displacement.png b/Resources/Textures/Mobs/Pets/corgi.rsi/belt_displacement.png
deleted file mode 100644
index 6e3cb09bcf..0000000000
Binary files a/Resources/Textures/Mobs/Pets/corgi.rsi/belt_displacement.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json b/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
index 9182c1d991..08a4c74f60 100644
--- a/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
@@ -1,160 +1,157 @@
 {
-  "version": 1,
-  "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.  belt_displacement by Sparlight.",
-  "states": [
-    {
-      "name": "corgi",
-      "directions": 4
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "corgi_rest",
-      "directions": 4
-    },
-    {
-      "name": "corgi_dead"
-    },
-    {
-      "name": "ian",
-      "directions": 4
-    },
-    {
-      "name": "ian_dead"
-    },
-    {
-      "name": "corgi_deadcollar"
-    },
-    {
-      "name": "corgi_deadtag"
-    },
-    {
-      "name": "ian_shaved",
-      "directions": 4
-    },
-    {
-      "name": "ian_shaved_dead"
-    },
-    {
-      "name": "corgicollar",
-      "directions": 4
-    },
-    {
-      "name": "corgitag",
-      "directions": 4
-    },
-    {
-      "name": "lisa",
-      "directions": 4
-    },
-    {
-      "name": "lisa_dead"
-    },
-    {
-      "name": "lisa_shaved",
-      "directions": 4
-    },
-    {
-      "name": "lisa_shaved_dead"
-    },
-    {
-      "name": "narsian",
-      "directions": 4
-    },
-    {
-      "name": "narsian_dead",
-      "directions": 1
-    },
-    {
-      "name": "old_ian",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "old_ian_dead"
-    },
-    {
-      "name": "old_ian_shaved",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "old_ian_shaved_dead"
-    },
-    {
-      "name": "puppy",
-      "directions": 4
-    },
-    {
-      "name": "puppy_dead"
-    },
-    {
-      "name": "puppy_deadcollar"
-    },
-    {
-      "name": "puppy_deadtag"
-    },
-    {
-      "name": "puppy_shaved",
-      "directions": 4
-    },
-    {
-      "name": "puppy_shaved_dead"
-    },
-    {
-      "name": "puppycollar",
-      "directions": 4
-    },
-    {
-      "name": "puppytag",
-      "directions": 4
-    },
-    {
-      "name": "real_mouse",
-      "directions": 4
-    },
-    {
-      "name": "real_mouse_dead"
-    },
-    {
-      "name": "belt_displacement"
-    }
-  ]
+    "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"
+        },
+        {
+            "name": "ian",
+            "directions": 4
+        },
+        {
+            "name": "ian_dead"
+        },
+        {
+            "name": "corgi_deadcollar"
+        },
+        {
+            "name": "corgi_deadtag"
+        },
+        {
+            "name": "ian_shaved",
+            "directions": 4
+        },
+        {
+            "name": "ian_shaved_dead"
+        },
+        {
+            "name": "corgicollar",
+            "directions": 4
+        },
+        {
+            "name": "corgitag",
+            "directions": 4
+        },
+        {
+            "name": "lisa",
+            "directions": 4
+        },
+        {
+            "name": "lisa_dead"
+        },
+        {
+            "name": "lisa_shaved",
+            "directions": 4
+        },
+        {
+            "name": "lisa_shaved_dead"
+        },
+        {
+            "name": "narsian",
+            "directions": 4
+        },
+        {
+            "name": "narsian_dead",
+            "directions": 1
+        },
+        {
+            "name": "old_ian",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "old_ian_dead"
+        },
+        {
+            "name": "old_ian_shaved",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "old_ian_shaved_dead"
+        },
+        {
+            "name": "puppy",
+            "directions": 4
+        },
+        {
+            "name": "puppy_dead"
+        },
+        {
+            "name": "puppy_deadcollar"
+        },
+        {
+            "name": "puppy_deadtag"
+        },
+        {
+            "name": "puppy_shaved",
+            "directions": 4
+        },
+        {
+            "name": "puppy_shaved_dead"
+        },
+        {
+            "name": "puppycollar",
+            "directions": 4
+        },
+        {
+            "name": "puppytag",
+            "directions": 4
+        },
+        {
+            "name": "real_mouse",
+            "directions": 4
+        },
+        {
+            "name": "real_mouse_dead"
+        }
+    ]
 }
diff --git a/Resources/Textures/Mobs/Pets/displacements.rsi/corgi_belt_displacement.png b/Resources/Textures/Mobs/Pets/displacements.rsi/corgi_belt_displacement.png
new file mode 100644
index 0000000000..e5a397c236
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/displacements.rsi/corgi_belt_displacement.png differ
diff --git a/Resources/Textures/Mobs/Pets/displacements.rsi/corgi_head_displacement.png b/Resources/Textures/Mobs/Pets/displacements.rsi/corgi_head_displacement.png
new file mode 100644
index 0000000000..6d2d4c3030
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/displacements.rsi/corgi_head_displacement.png differ
diff --git a/Resources/Textures/Mobs/Pets/displacements.rsi/lisa_head_displacement.png b/Resources/Textures/Mobs/Pets/displacements.rsi/lisa_head_displacement.png
new file mode 100644
index 0000000000..968c68414e
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/displacements.rsi/lisa_head_displacement.png differ
diff --git a/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_eyes_displacement.png b/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_eyes_displacement.png
new file mode 100644
index 0000000000..93e43d5194
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_eyes_displacement.png differ
diff --git a/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_head_displacement.png b/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_head_displacement.png
new file mode 100644
index 0000000000..771f343f04
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_head_displacement.png differ
diff --git a/Resources/Textures/Mobs/Pets/displacements.rsi/meta.json b/Resources/Textures/Mobs/Pets/displacements.rsi/meta.json
new file mode 100644
index 0000000000..0b4ddb7a92
--- /dev/null
+++ b/Resources/Textures/Mobs/Pets/displacements.rsi/meta.json
@@ -0,0 +1,34 @@
+{
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Displacement maps by Velken, corgi_belt_displacement by Sparlight",
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "load": {
+        "srgb": false
+    },
+    "states": [
+        {
+            "name": "mcgriff_eyes_displacement",
+            "directions": 4
+        },
+        {
+            "name": "mcgriff_head_displacement",
+            "directions": 4
+        },
+        {
+            "name": "corgi_belt_displacement",
+            "directions": 4
+        },
+        {
+            "name": "corgi_head_displacement",
+            "directions": 4
+        },
+        {
+            "name": "lisa_head_displacement",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Silicon/station_ai.rsi/base.png b/Resources/Textures/Mobs/Silicon/station_ai.rsi/base.png
index a9db83691c..f962464039 100644
Binary files a/Resources/Textures/Mobs/Silicon/station_ai.rsi/base.png and b/Resources/Textures/Mobs/Silicon/station_ai.rsi/base.png differ
diff --git a/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json b/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json
index bdce787a48..867aeb41e8 100644
--- a/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json
+++ b/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/e2923df112df8aa025846d0764697bad6506586a/icons/mob/AI.dmi - modified by chromiumboy.",
+    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/e2923df112df8aa025846d0764697bad6506586a/icons/mob/AI.dmi - modified by chromiumboy, base modified by monotheonist.",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png
index 3910fb39a6..01259ea03d 100644
Binary files a/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png and b/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..d5adc6d762
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..9d1cc8a7d6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..16bf2bcd0f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..68538310bc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..f7f8d2d39f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..3b65c3ed77
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..dbce673fd5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..7342070518
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..b735287a2a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..1b387d5ac3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..001a801d6c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..54f662b064
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..2da1e578c4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..4532858488
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..979bbf08cc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..d226ded556
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right.png differ
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 f60e29d82f..52cb1050a0 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon_blue"
@@ -42,6 +42,38 @@
         },
         {
             "name": "fill-6"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..8a5e842eda
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..af2da8354c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..48af47360e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..b58d2cfb36
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..e37dd673c5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..71e4bdaf53
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..88fd5618c3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..743a93bf1e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json
index 960293f615..df07a51fcd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (Github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..d340491de3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..ba8c8fbc03
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..b0020cc3d7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left.png
new file mode 100644
index 0000000000..98fe987443
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..b89d65f8f2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..2b437b14ac
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..9df8de24dc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right.png
new file mode 100644
index 0000000000..19b919e34e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-left.png
new file mode 100644
index 0000000000..a51ae97131
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-right.png
new file mode 100644
index 0000000000..efbffb69c6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/meta.json
index 9e1d9a9075..30b3bf2a33 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..0010e197f2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..ec574e53b3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json
index e00674b301..94e9eb6ce1 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "drawn by givazaa",
+    "copyright": "drawn by givazaa, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..119a8f7d2b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..bf8d6438f0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/meta.json
index 9e1d9a9075..009176d023 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (Github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..66efbe97e1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..612222a36c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..a4cf0262b7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..9ebf7d4752
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..b68edb9380
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..de29daf81b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..c6d68f63d9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..08f49bec69
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/meta.json
index 960293f615..df07a51fcd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (Github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..6d3b968beb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..3a7e751075
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..7beda89048
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..62fb7cdc68
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..22eff7e402
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..b0f11f1af1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..b671320b52
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..359a48f529
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..6b7c6a3da5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..1b407be265
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..3ab3631870
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..d045f4f0e7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..65ddfbc981
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..bb4733c7a2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..20caef3032
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..80938404de
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..39198a73cc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..591c709b9a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..9dc112eb67
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..cf1096a1f2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..4fa6e2865e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..a2451e16d2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..2eca06d4f6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..8eb0c20905
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..a13202b5d3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..a1dddcb94b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..b9ac2b6520
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..570467eb19
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..0dd980a922
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..751ebf5d3c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..0db4d2d19a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..c4f1689a53
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/meta.json
index 6542150423..ba81b5b27c 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (Github)",
     "states": [
         {
             "name": "icon"
@@ -33,6 +33,38 @@
         },
         {
             "name": "fill-6"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-left.png
new file mode 100644
index 0000000000..13c94563bf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-right.png
new file mode 100644
index 0000000000..01c9102950
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json
index 9e1d9a9075..009176d023 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (Github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-left.png
new file mode 100644
index 0000000000..43e01b3e20
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-right.png
new file mode 100644
index 0000000000..67d745ffc0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/meta.json
index 9e1d9a9075..30b3bf2a33 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..4565a7752a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..41325e50ea
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..454e3ab2a4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left.png
new file mode 100644
index 0000000000..166532f8dc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..a4f87ad9c7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..a2b417f33a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..b283819d3c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right.png
new file mode 100644
index 0000000000..a82d43f7e9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json
index 960293f615..df07a51fcd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (Github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..311ddd4623
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..d9b930ed7e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..1dc501183f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left.png
new file mode 100644
index 0000000000..8d04eec7ef
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..3be2b0e899
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..49076b5575
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..70fc4e4470
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right.png
new file mode 100644
index 0000000000..642f55425a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json
index db0ac608ed..e91afea62f 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json
@@ -1 +1,46 @@
-{"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"}]}
\ No newline at end of file
+{
+    "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, inhands by TiniestShark (github)",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..b07e28d83c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..5923f3c50b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..41b5cc1114
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..4ac4286c10
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..c8a9d8d8c8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..c8674e5a48
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..693c9ebadc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..d953ec3ea2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..544d2cba51
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..cd772b1eec
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/meta.json
index 9e1d9a9075..30b3bf2a33 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..c0fe79484c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..49119e5062
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..c8b4499d38
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..c746d8b8df
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..97ee9a42d9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..4880ea306f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..4b4fc4e156
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..ae8839ebcd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png
index 53b96d67d5..0e943e4a95 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png
index 57273615e3..d8feb0b718 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..556d05732c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..13185481d1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json
index 6009794429..a56728bea4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, recolored by PursuitinAshes (Github)",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, recolored by PursuitinAshes (Github), inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..6d3b968beb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..3a7e751075
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..fdb53126e6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..280a655f4d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..22eff7e402
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..b0f11f1af1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..b671320b52
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..689017b3c3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json
index 1190465440..cd7a1c9027 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "modified from space-up_bottle.rsi and inspired by sodawater.rsi by Prole0 (GitHub)",
+    "copyright": "modified from space-up_bottle.rsi and inspired by sodawater.rsi by Prole0 (GitHub), inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..6d3b968beb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..3a7e751075
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..7beda89048
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..3db9a0ad5f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..22eff7e402
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..b0f11f1af1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..b671320b52
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..f9eab876ee
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..6d3b968beb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..3a7e751075
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..7beda89048
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..20909cf84f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..22eff7e402
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..b0f11f1af1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..b671320b52
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..dcf45ca0e7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..8a621112a0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..d616002a2e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..0decf903e2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..75c584bd40
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..464ad3d2db
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..cd072f633b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..5c62139438
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..b4f0b8a8b3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..6d3b968beb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..3a7e751075
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..7beda89048
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..efc8153c22
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..22eff7e402
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..b0f11f1af1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..b671320b52
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..8cf79b3ec9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json
index 7ef37142c7..334f81ac7a 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "modified from space-up_bottle.rsi and inspired by tonic.rsi by Prole0 (GitHub)",
+    "copyright": "modified from space-up_bottle.rsi and inspired by tonic.rsi by Prole0 (GitHub), inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..7e6e085352
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..97697d35af
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..39bdcdfcef
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..608531cdf9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..6501196aa3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..d2f1580d39
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..33f6bd5f27
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..b047e2e9d6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..12db433acf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..314f03cb92
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..9f5836fe51
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..c4ad1c2f17
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..95e370f259
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..53a26bb314
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..6e72c95475
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..d07fc07cb5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-2.png
index 154c205bf1..b8361f4ba0 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-2.png and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..154c205bf1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-1.png
index 1530ff913f..a33a30d34f 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-1.png and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-2.png
index 66a831d2cc..f2df5c7da8 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-2.png and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..66a831d2cc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json
index e09aa519fc..0f46f67641 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json
@@ -1,61 +1,67 @@
 {
-  "version": 1,
-  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon, icon_empty, & icon_open modified from waterbottle.rsi by Prole0 (GitHub)",
-  "license": "CC-BY-SA-3.0",
-  "size":
-  {
-    "x": 32,
-    "y": 32
-  },
-  "states":
-  [
-    {
-      "name": "icon"
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon_open"
-    },
-    {
-      "name": "icon_empty"
-    },
-    {
-      "name": "fill-1"
-    },
-    {
-      "name": "fill-2"
-    },
-    {
-      "name": "fill-3"
-    },
-    {
-      "name": "fill-4"
-    },
-    {
-      "name": "fill-5"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-	{
-      "name": "inhand-left-fill-1",
-      "directions": 4
-    },
-	{
-      "name": "inhand-left-fill-2",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-	{
-      "name": "inhand-right-fill-1",
-      "directions": 4
-    },
-	{
-      "name": "inhand-right-fill-2",
-      "directions": 4
-    }
-  ]
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon, icon_empty, & icon_open modified from waterbottle.rsi by Prole0 (GitHub)",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..3310861154
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..7386b6d5ef
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..2604e46518
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..7ac7b2ab67
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..c1c61b23a8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..882c4b9eed
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..b7a8874beb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..d9a2349f97
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..739fe12581
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..aed75df962
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/meta.json
index 9e1d9a9075..30b3bf2a33 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "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
new file mode 100644
index 0000000000..c267627a21
Binary files /dev/null and b/Resources/Textures/Objects/Fun/pai.rsi/golden-icon-pai-off.png differ
diff --git a/Resources/Textures/Objects/Fun/pai.rsi/golden-pai-base.png b/Resources/Textures/Objects/Fun/pai.rsi/golden-pai-base.png
new file mode 100644
index 0000000000..aab9aa3657
Binary files /dev/null and b/Resources/Textures/Objects/Fun/pai.rsi/golden-pai-base.png differ
diff --git a/Resources/Textures/Objects/Fun/pai.rsi/meta.json b/Resources/Textures/Objects/Fun/pai.rsi/meta.json
index f819450aa8..e01d1f92ab 100644
--- a/Resources/Textures/Objects/Fun/pai.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/pai.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9ddb8cf084e292571d4e9c79745db25befbd82fe. pai-searching-overlay heavily modified. Syndicate variants by fedKotikeD, and potato by Doru991",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9ddb8cf084e292571d4e9c79745db25befbd82fe. pai-searching-overlay heavily modified. Syndicate variants by fedKotikeD, and potato by Doru991. Golden pai variant is made from ScrapPAIGold by AsnDen",
   "size": {
     "x": 32,
     "y": 32
@@ -72,6 +72,12 @@
     },
     {
       "name": "potato-searching-overlay"
+    },
+    {
+      "name": "golden-icon-pai-off"
+    },
+    {
+      "name": "golden-pai-base"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
index 9fbad41e48..d49eb61b76 100644
--- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base. Bananium, cardboard, corgihide, cloth, cotton, pyrotton, bones and durathread inhands by mubururu_ (github).",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base. Bananium, cardboard, corgihide, cloth, cotton, pyrotton, bones and durathread inhands by mubururu_ (github). Bananium peel's on-head sprite by FlipBrooke, based on the bananaium peel sprite.",
   "size": {
     "x": 32,
     "y": 32
@@ -193,6 +193,14 @@
     {
       "name": "peel"
     },
+    {
+        "name": "peel-equipped-HELMET",
+        "directions": 4
+    },
+    {
+        "name": "peel-equipped-HELMET-hamster",
+        "directions": 4
+    },
     {
       "name": "phoron_gem_spent"
     },
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET-hamster.png b/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..e607cf252f
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET.png b/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET.png
new file mode 100644
index 0000000000..b15646a01f
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Misc/moproach_shoes.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/inhand-left.png
new file mode 100644
index 0000000000..0f1c799ca5
Binary files /dev/null and b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/moproach_shoes.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/inhand-right.png
new file mode 100644
index 0000000000..af7ee7d3f2
Binary files /dev/null and b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/moproach_shoes.rsi/meta.json b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/meta.json
new file mode 100644
index 0000000000..ab04fbd91d
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by Velken. Inhand versions modified from mop sprites from Easypoll. Mopshoes based from Galoshes from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "mopshoes"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Misc/moproach_shoes.rsi/mopshoes.png b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/mopshoes.png
new file mode 100644
index 0000000000..6f4b0215dc
Binary files /dev/null and b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/mopshoes.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png
new file mode 100644
index 0000000000..2f29dff1c7
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png
new file mode 100644
index 0000000000..0d7d9cf676
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png
new file mode 100644
index 0000000000..6e5e4cd27a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json
similarity index 63%
rename from Resources/Textures/Objects/Specific/Chapel/quran.rsi/meta.json
rename to Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json
index 64d37670f1..c0dd9096bc 100644
--- a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, modified by Terraspark4941",
+  "copyright": "Originally drawn by @Trosling (Discord)",
   "size": {
     "x": 32,
     "y": 32
@@ -20,3 +20,4 @@
     }
   ]
 }
+
diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png
new file mode 100644
index 0000000000..a38632e437
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png
new file mode 100644
index 0000000000..35fc35abf1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png
new file mode 100644
index 0000000000..7e0df50bb5
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json
new file mode 100644
index 0000000000..c0dd9096bc
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Originally drawn by @Trosling (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
+
diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png
new file mode 100644
index 0000000000..4e24e24ad2
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png
new file mode 100644
index 0000000000..4be96c2070
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png
new file mode 100644
index 0000000000..bdf1c5e363
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json
new file mode 100644
index 0000000000..c0dd9096bc
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Originally drawn by @Trosling (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
+
diff --git a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/quran.rsi/icon.png
deleted file mode 100644
index 0c710e8850..0000000000
Binary files a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/quran.rsi/inhand-left.png
deleted file mode 100644
index f5c0eca315..0000000000
Binary files a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/quran.rsi/inhand-right.png
deleted file mode 100644
index bc8b034185..0000000000
Binary files a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/icon.png
new file mode 100644
index 0000000000..f44d122751
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-left.png
new file mode 100644
index 0000000000..35fc35abf1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-right.png
new file mode 100644
index 0000000000..60aba34bbb
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/meta.json
new file mode 100644
index 0000000000..c0dd9096bc
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Originally drawn by @Trosling (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
+
diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/icon.png
new file mode 100644
index 0000000000..c04412d52b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-left.png
new file mode 100644
index 0000000000..94fdcc0f20
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-right.png
new file mode 100644
index 0000000000..56c5a517f1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/meta.json
new file mode 100644
index 0000000000..c0dd9096bc
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Originally drawn by @Trosling (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
+
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
index 47289a1341..b2eb3125e9 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-left.png
index e2c84ff57b..f8eb0352e2 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-right.png
index a51d00e482..3a8b36ef1e 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
index 9c4e3cc701..6b87ec6d4e 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-left.png
index de30ed8ecd..08e01eb9c9 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-right.png
index df50dd92e2..b3be81aff2 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET-hamster.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..0f587c924e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET.png
new file mode 100644
index 0000000000..ac69dd5d60
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json
index be72e24bbc..64523fe470 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json
@@ -1,7 +1,8 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub), On-head sprites by FlipBrooke,.",
     "size": {
         "x": 32,
         "y": 32
@@ -42,6 +43,14 @@
         {
             "name": "baked-peel3"
         },
+        {
+            "name": "baked-peel-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "baked-peel-equipped-HELMET-hamster",
+            "directions": 4
+        },
         {
             "name": "baked-peel-inhand-left",
             "directions": 4
@@ -71,6 +80,14 @@
         {
             "name": "stage-6"
         },
+        {
+            "name": "peel-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "peel-equipped-HELMET-hamster",
+            "directions": 4
+        },
         {
             "name": "produce-inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET-hamster.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..e01ef05a5d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET.png
new file mode 100644
index 0000000000..225f0db6da
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-left.png
index 9aa160ec98..147567b052 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-right.png
index 23be44f469..162e668517 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json
index b1afd4b72d..974b3afff0 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-left.png
index fcb9d0de5e..61023cb489 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-right.png
index aebaa93515..0167604000 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json
index b1afd4b72d..974b3afff0 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-left.png
index 26d1be589c..f031830af9 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-right.png
index 1358899281..a4fe914276 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json
index e8994282cd..5822217677 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12#diff-3fdb6bdffec70eb17e6315b5cc5447b4cc73d39f583f077f064ad70f286138fa, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12#diff-3fdb6bdffec70eb17e6315b5cc5447b4cc73d39f583f077f064ad70f286138fa, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-left.png
index 26035cc79b..d052b3cf10 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-right.png
index eedee61f40..a554c30631 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
index d6374a3793..a43d18e6fd 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-left.png
index 333b7a1db6..a501d6acde 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-right.png
index 2ba546c055..5b7091c18b 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json
index f7affdef4c..5bb785b97e 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-left.png
index 5b30fba7d8..c741b9ff64 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-right.png
index 0722440afd..13b5762c20 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
index f7d57e59d0..c5665a460a 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), produce modified from https://github.com/space-wizards/space-station-14/commit/484eb0bba44d3e014873e7d7026a99d7ba56f7b9#diff-5b9a7a38ef618b5f482f5baf4bb8db27dc87f9af7602d67cae9133e624aa3f91 by Chaoticaa (GitHub), Growth, harvest, and dead created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), produce modified from https://github.com/space-wizards/space-station-14/commit/484eb0bba44d3e014873e7d7026a99d7ba56f7b9#diff-5b9a7a38ef618b5f482f5baf4bb8db27dc87f9af7602d67cae9133e624aa3f91 by Chaoticaa (GitHub), Growth, harvest, and dead created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-left.png
index 3af8c810fa..125d8caebe 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-right.png
index c1bb4508ed..88ba50ee1e 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json
index c6b8930b4e..c2bddfac98 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github), produce created by Chaoticaa (GitHub), Growth stages, harvest, and dead modified by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github), produce created by Chaoticaa (GitHub), Growth stages, harvest, and dead modified by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-left.png
index fe84056f95..9e9fc50746 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-right.png
index 588dca2f4f..5b9abe178e 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
index 9c4e3cc701..6b87ec6d4e 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-left.png
index fc13545587..34e30be1bf 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-right.png
index b8e6333def..dda80e802d 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json
index be6a0f367c..e73e83cd39 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands by mubururu_ (github)",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands by mubururu_ (github), inhands modified by Prole0 (GitHub)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-left.png
index fbfb1453cd..c086e3acac 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-right.png
index 6ec6fcc745..eea7e61c34 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json
index 026589b450..b21d2f2bfa 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast, inhands by mubururu_ (github), produce sprite modified by Chaoticaa (GitHub), Growth stages, harvest, and dead sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast, inhands by mubururu_ (github), produce sprite modified by Chaoticaa (GitHub), Growth stages, harvest, and dead sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-left.png
index b969a2e201..f4864f288e 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-right.png
index 2fc31a58a2..d1c40609de 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json
index 4c84d306f8..7c5a58be82 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5e6db8f99b436b643bd3b76fa131ac074dfd856 seed modified by potato1234_x (github) for ss14, inhands by mubururu_ (github), Growth, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5e6db8f99b436b643bd3b76fa131ac074dfd856 seed modified by potato1234_x (github) for ss14, inhands by mubururu_ (github), Growth, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-left.png
index cbb98daec0..b561223098 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-right.png
index dd517d4301..bb80c91a1c 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
index ea94e38df7..67057449a1 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-left.png
index 41fcbe7010..d3c9fc1f57 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-right.png
index 8f5898154b..2b821daa69 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json
index ea94e38df7..67057449a1 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-left.png
index d93bcdcbe3..de8f416ca0 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-right.png
index e8041c2925..c2a66617f5 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json
index c4233795e8..e4e8d4aad6 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-left.png
index 9977b5564e..015a110db7 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-right.png
index 49e5bc92b6..26f0b95401 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..16c89bff2b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..842e1c02e9
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json
index 25ec879674..9bc2def611 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github)",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github). Mimana peel on-head sprite by FlipBrooke, based on the mimana item sprite.",
     "size": {
         "x": 32,
         "y": 32
@@ -10,6 +10,14 @@
         {
             "name": "dead"
         },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-hamster",
+            "directions": 4
+        },
         {
             "name": "harvest"
         },
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/meta.json
index 1ff69a9dbb..477a0e1aac 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation and modified by Swept at https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+  "copyright": "Taken from vgstation and modified by Swept at https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
   "size": {
     "x": 32,
     "y": 32
@@ -36,6 +36,14 @@
     },
     {
       "name": "stage-6"
+    },
+    {
+      "name": "produce-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "produce-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-left.png
new file mode 100644
index 0000000000..d85fc9b6f7
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-right.png
new file mode 100644
index 0000000000..86101df3e7
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json
index 9b816e9c2c..d2f06f1abd 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github), slice modified from https://github.com/space-wizards/space-station-14/pull/3436/files#diff-65d1e265b787136da82b8e8b56ede11fdb879c31f9d14b4236d33a9a89d6a815 by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github), slice modified from https://github.com/space-wizards/space-station-14/pull/3436/files#diff-65d1e265b787136da82b8e8b56ede11fdb879c31f9d14b4236d33a9a89d6a815 by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-left.png
index 73b95de513..b27f456904 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-right.png
index a5674e38fe..9fe779b9f3 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
index 21e0530172..eadabf6bb1 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github), seed modified from https://github.com/space-wizards/space-station-14/pull/23210/files#diff-6b89a02e399bc4dd9c50c16ad274a353a92c8a0f462083fab0c1e5045d957ad2 by Chaoticaa (GitHub), slice modified from https://github.com/space-wizards/space-station-14/pull/3436/files#diff-65d1e265b787136da82b8e8b56ede11fdb879c31f9d14b4236d33a9a89d6a815 by Chaoticaa (GitHub), Growth, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github), seed modified from https://github.com/space-wizards/space-station-14/pull/23210/files#diff-6b89a02e399bc4dd9c50c16ad274a353a92c8a0f462083fab0c1e5045d957ad2 by Chaoticaa (GitHub), slice modified from https://github.com/space-wizards/space-station-14/pull/3436/files#diff-65d1e265b787136da82b8e8b56ede11fdb879c31f9d14b4236d33a9a89d6a815 by Chaoticaa (GitHub), Growth, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-left.png
index eb2433df4f..de343133f0 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-right.png
index 631cb579f8..75ff15179e 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json
index de4ed6fbe0..369affc8fd 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), seed.png modified from https://github.com/space-wizards/space-station-14/pull/23210/files#diff-1ee24e9bb4023f490a3f87c861b65e459bd3fda10e688471cdf72b8a8aab381b by Chaoticaa (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), seed.png modified from https://github.com/space-wizards/space-station-14/pull/23210/files#diff-1ee24e9bb4023f490a3f87c861b65e459bd3fda10e688471cdf72b8a8aab381b by Chaoticaa (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-left.png
index 7ed63766ce..d67415c4bf 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-right.png
index d2b4672d04..12b6e14c8a 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json
index 012feb5906..9129d5c165 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5e6db8f99b436b643bd3b76fa131ac074dfd856, inhands by mubururu_ (github), Growth, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5e6db8f99b436b643bd3b76fa131ac074dfd856, inhands by mubururu_ (github), Growth, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-left.png
index 031838f8b8..5959966d1f 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-right.png
index ec0da4c5ee..455d5e4e52 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/meta.json
index 19bce5327f..56f9d1820d 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github), slice.png modified from https://github.com/space-wizards/space-station-14/pull/31012/commits/f840c12356368798ab2dbe7de8232ed8181d29d6#diff-2ca7537b4a0f25517344be1d3a98d6cc33a3176c0af385bc5882b96d77afc64d by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github), slice.png modified from https://github.com/space-wizards/space-station-14/pull/31012/commits/f840c12356368798ab2dbe7de8232ed8181d29d6#diff-2ca7537b4a0f25517344be1d3a98d6cc33a3176c0af385bc5882b96d77afc64d by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-left.png
index 073fb84097..bfeb6505ae 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-right.png
index 8614972430..d47a011c3d 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
index 3d679a29ad..aeb8752af5 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, dead, harvest, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, dead, harvest, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-left.png
index e00ffb663e..bac5e614c8 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-right.png
index 22b0343762..ae062a722c 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json
index dbbf0cdad9..a4c78d04f8 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-left.png
index 3b2e5fbbac..06f12bd335 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-right.png
index 46eccd1fbf..433be8703f 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
index 7c890d6313..c358b5eb91 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-left.png
index 249620539d..6b3cbc836e 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-right.png
index 9dcc51d373..5b7f50e976 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json
index 5b56a84b55..2e37fa931e 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3, inhands by mubururu_ (github), slice.png modified from https://github.com/space-wizards/space-station-14/pull/14587/files#diff-3d6e5b157c429de7aa62396e8677d0a2fab073a2d6d6e796af4931cb8d979330 by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce sprites Created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3, inhands by mubururu_ (github), slice.png modified from https://github.com/space-wizards/space-station-14/pull/14587/files#diff-3d6e5b157c429de7aa62396e8677d0a2fab073a2d6d6e796af4931cb8d979330 by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce sprites Created by Chaoticaa (GitHub),",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/icon.png b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/icon.png
new file mode 100644
index 0000000000..cd46d03a5c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-left.png
new file mode 100644
index 0000000000..0f0cb615da
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-right.png
new file mode 100644
index 0000000000..5923223a3a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/meta.json
new file mode 100644
index 0000000000..4a9131da5e
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Sprites by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/storage.png b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/storage.png
new file mode 100644
index 0000000000..36997e2cd8
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/storage.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/flame.png
new file mode 100644
index 0000000000..8cbb46a486
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/icon.png
new file mode 100644
index 0000000000..522e824444
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..06ba07691a
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left.png
new file mode 100644
index 0000000000..9ab79bd56c
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..0b00575beb
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right.png
new file mode 100644
index 0000000000..b377a18e30
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/open.png
new file mode 100644
index 0000000000..f880edd1ba
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/top.png
new file mode 100644
index 0000000000..bd2ed7245d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/flame.png
new file mode 100644
index 0000000000..09c049be71
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/icon.png
new file mode 100644
index 0000000000..7e42de6708
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..fa7ec883cc
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left.png
new file mode 100644
index 0000000000..b5d1bf1dca
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..a68c0a2700
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right.png
new file mode 100644
index 0000000000..e0d0523d19
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/open.png
new file mode 100644
index 0000000000..3feed530a0
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/top.png
new file mode 100644
index 0000000000..c85c170e41
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/flame.png
new file mode 100644
index 0000000000..f51100448d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/icon.png
new file mode 100644
index 0000000000..c71349d413
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..9278dc5dff
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left.png
new file mode 100644
index 0000000000..757145f7d3
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..a187ed00a6
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right.png
new file mode 100644
index 0000000000..3b562db5d8
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/open.png
new file mode 100644
index 0000000000..d6c974dc13
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/top.png
new file mode 100644
index 0000000000..d13c017afc
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox-open.png b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox-open.png
new file mode 100644
index 0000000000..2e0163da82
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox-open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox.png b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox.png
new file mode 100644
index 0000000000..c7a5e3adc8
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox1.png b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox1.png
new file mode 100644
index 0000000000..c405eefdc1
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox1.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox2.png b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox2.png
new file mode 100644
index 0000000000..4de5da1a84
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox2.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox3.png b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox3.png
new file mode 100644
index 0000000000..2988c62f20
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox3.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/meta.json
new file mode 100644
index 0000000000..680ad98afd
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 and modified by Swept, modified again my Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "matchbox"
+        },
+        {
+            "name": "matchbox-open"
+        },
+        {
+            "name": "matchbox1"
+        },
+        {
+            "name": "matchbox2"
+        },
+        {
+            "name": "matchbox3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-left.png
new file mode 100644
index 0000000000..b96ee2798b
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-right.png
new file mode 100644
index 0000000000..0b95e021ea
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_burnt.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_burnt.png
new file mode 100644
index 0000000000..6ad8d07b4f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_burnt.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_lit.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_lit.png
new file mode 100644
index 0000000000..fc9082ef63
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_unlit.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_unlit.png
new file mode 100644
index 0000000000..03cf76dc95
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_unlit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/meta.json
new file mode 100644
index 0000000000..21146fe6f7
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/meta.json
@@ -0,0 +1,87 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 and modified by Swept, modified again my Smugman",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "match_burnt"
+    },
+    {
+      "name": "match_lit",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "match_unlit"
+    },
+    {
+      "name": "unlit-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "unlit-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "lit-inhand-left",
+      "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": "lit-inhand-right",
+      "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/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-left.png
new file mode 100644
index 0000000000..c44c1aa92f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-right.png
new file mode 100644
index 0000000000..93f169c701
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/flame.png
new file mode 100644
index 0000000000..a1d8633d37
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/icon.png
new file mode 100644
index 0000000000..b63dbcf1e6
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..933b7799c6
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left.png
new file mode 100644
index 0000000000..2136e54995
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..b83092589f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right.png
new file mode 100644
index 0000000000..2ef4b94da3
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/meta.json
new file mode 100644
index 0000000000..131fb44e54
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Banana sprites Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, modified by smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/open.png
new file mode 100644
index 0000000000..6cdfc629af
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/top.png
new file mode 100644
index 0000000000..c512c689ff
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/flame.png
new file mode 100644
index 0000000000..07ca237d2f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/icon.png
new file mode 100644
index 0000000000..24e9fd559f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..b3ce960417
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left.png
new file mode 100644
index 0000000000..be1974a6ad
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..d1fb5e1cbd
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right.png
new file mode 100644
index 0000000000..6067152323
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/open.png
new file mode 100644
index 0000000000..c4129e2d54
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/top.png
new file mode 100644
index 0000000000..635a525fd0
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-1.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-1.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-1.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-1.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-10.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-10.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-10.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-10.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-11.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-11.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-11.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-11.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-2.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-2.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-2.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-2.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-3.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-3.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-3.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-3.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-4.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-4.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-4.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-4.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-5.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-5.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-5.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-5.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-6.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-6.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-6.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-6.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-7.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-7.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-7.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-7.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-8.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-8.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-8.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-8.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-9.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-9.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-9.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-9.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_top.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_top.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_top.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_top.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/cheap_icon_base.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/cheap_icon_base.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/cheap_icon_base.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/cheap_icon_base.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/cheap_icon_top.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/cheap_icon_top.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/cheap_icon_top.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/cheap_icon_top.png
diff --git a/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/discount_icon_base.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/discount_icon_base.png
new file mode 100644
index 0000000000..43c9a0d692
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/discount_icon_base.png differ
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/icon_map.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/icon_map.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/icon_map.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/icon_map.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/inhand-left-flame.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-left-flame.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/inhand-left-flame.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-left-flame.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/inhand-left.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/inhand-right-flame.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-right-flame.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/inhand-right-flame.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-right-flame.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/inhand-right.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/lighter_flame.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/lighter_flame.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/lighter_flame.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/lighter_flame.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/meta.json
similarity index 97%
rename from Resources/Textures/Objects/Tools/lighters.rsi/meta.json
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/meta.json
index dc7218c024..acda832cd7 100644
--- a/Resources/Textures/Objects/Tools/lighters.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/meta.json
@@ -55,6 +55,9 @@
     {
       "name": "basic_icon_base-11"
     },
+    {
+      "name": "discount_icon_base"
+    },
     {
       "name": "basic_icon_top"
     },
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-left-flame.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-left-flame.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-left-flame.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-left-flame.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-left.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-left.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-right-flame.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-right-flame.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-right-flame.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-right-flame.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-right.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-right.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo_engraved_icon_base.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_engraved_icon_base.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo_engraved_icon_base.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_engraved_icon_base.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo_engraved_open.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_engraved_open.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo_engraved_open.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_engraved_open.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo_icon_base.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_icon_base.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo_icon_base.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_icon_base.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo_open.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_open.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo_open.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_open.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo_top.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_top.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo_top.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_top.png
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/flame.png
new file mode 100644
index 0000000000..672b227a33
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/icon.png
new file mode 100644
index 0000000000..69bc5a430d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..1e7ac493e6
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left.png
new file mode 100644
index 0000000000..fc020ae679
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..764a11d2e7
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right.png
new file mode 100644
index 0000000000..a0fd6c89fa
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/open.png
new file mode 100644
index 0000000000..ba402299de
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/top.png
new file mode 100644
index 0000000000..b077dc0c54
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/flame.png
new file mode 100644
index 0000000000..d5fcd20d70
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/icon.png
new file mode 100644
index 0000000000..fb49555576
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..6e6684d3bb
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left.png
new file mode 100644
index 0000000000..469e7cbbc2
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..98d43ac3ab
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right.png
new file mode 100644
index 0000000000..64d1228a53
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/meta.json
new file mode 100644
index 0000000000..8eae2b3c96
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/meta.json
@@ -0,0 +1,47 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by JustAnOrange",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/open.png
new file mode 100644
index 0000000000..e8fa3c5384
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/top.png
new file mode 100644
index 0000000000..bec9ed6658
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/flame.png
new file mode 100644
index 0000000000..5470befe66
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/icon.png
new file mode 100644
index 0000000000..ada45562e8
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..6133b7ee91
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left.png
new file mode 100644
index 0000000000..eac5453ddc
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..5803b6ac4d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right.png
new file mode 100644
index 0000000000..87f8e02641
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/meta.json
new file mode 100644
index 0000000000..3956e09beb
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by JustAnOrange",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/open.png
new file mode 100644
index 0000000000..2a080a846d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/top.png
new file mode 100644
index 0000000000..0afe86a673
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/flame.png
new file mode 100644
index 0000000000..a1d8633d37
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/icon.png
new file mode 100644
index 0000000000..d2f7da1054
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..babefd898d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left.png
new file mode 100644
index 0000000000..1377b2b5f0
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..b3c4fee202
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right.png
new file mode 100644
index 0000000000..d65d20864c
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/open.png
new file mode 100644
index 0000000000..908575e640
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/top.png
new file mode 100644
index 0000000000..ba0bae895a
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo-inhand-left.png b/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo-inhand-left.png
new file mode 100644
index 0000000000..d81e805bb2
Binary files /dev/null and b/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo-inhand-right.png b/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo-inhand-right.png
new file mode 100644
index 0000000000..b4083c87e1
Binary files /dev/null and b/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo.png b/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo.png
new file mode 100644
index 0000000000..ca64c2a758
Binary files /dev/null and b/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo.png differ
diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
index 8a19107208..14af840638 100644
--- a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
@@ -1,22 +1,33 @@
 {
-   "copyright" : "Taken from https://github.com/tgstation/tgstation at commit a21274e56ae84b2c96e8b6beeca805df3d5402e8, Inhand sprites by onesch",
-   "license" : "CC-BY-SA-3.0",
-   "size" : {
-      "x" : 32,
-      "y" : 32
-   },
-   "states" : [
-      {
-         "name" : "spray_painter"
-      },
-      {
-          "name": "inhand-left",
-          "directions": 4
-      },
-      {
-          "name": "inhand-right",
-          "directions": 4
-      }
-   ],
-   "version" : 1
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at commit a21274e56ae84b2c96e8b6beeca805df3d5402e8, Inhand sprites by onesch, ammo by Paradoxmi (Discord).",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "spray_painter"
+        },
+        {
+            "name": "ammo"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "ammo-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "ammo-inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/inhand-left.png
new file mode 100644
index 0000000000..b11cd62b30
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/inhand-right.png
new file mode 100644
index 0000000000..39f1a90079
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/inhand-right.png differ
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 54fc2938ce..fc09537d25 100644
--- a/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/meta.json
@@ -1,31 +1,39 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/commit/a39e3f3f1f351e3be5ae955c4de3a2e8889e191b",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "holstered"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Assets taken from /tg/station 13 at https://github.com/tgstation/tgstation/commit/a39e3f3f1f351e3be5ae955c4de3a2e8889e191b. inhand-left, inhand-right by K-Dynamic (github).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "notholstered"
-    },
-    {
-      "name": "base",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "icon"
-    }
-  ]
-}
\ No newline at end of file
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "holstered"
+        },
+        {
+            "name": "notholstered"
+        },
+        {
+            "name": "base",
+            "delays": [
+                [
+                0.1,
+                0.1,
+                0.1,
+                0.1
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base1.png
new file mode 100644
index 0000000000..eeab79f154
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-backpack-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-backpack-fill-1.png
new file mode 100644
index 0000000000..416958f47a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-backpack-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-suitstorage-fill-1.png
new file mode 100644
index 0000000000..416958f47a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-suitstorage-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..fd742402be
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..cce29feaca
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
index e4f1ef8dd8..c9436ead7b 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
+    "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244. Reagent fill sprites by RedBookcase on Github.",
     "size": {
         "x": 32,
         "y": 32
@@ -10,6 +10,9 @@
         {
             "name": "base"
         },
+        {
+            "name": "base1"
+        },
         {
             "name": "bolt-open"
         },
@@ -17,25 +20,49 @@
             "name": "inhand-left",
             "directions": 4
         },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
         {
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left-fill-1",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-right-fill-1",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-backpack-fill-1",
+            "directions": 4
+        },
         {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
+        },
+        {
+            "name": "equipped-suitstorage-fill-1",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left-fill-1.png
new file mode 100644
index 0000000000..c2e86175da
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right-fill-1.png
new file mode 100644
index 0000000000..2f37e17487
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/base.png b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/base.png
index da7b4e4941..2b20db4c09 100644
Binary files a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/base.png and b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/lethal.png b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/lethal.png
index f204a4d392..072e494c43 100644
Binary files a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/lethal.png and b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/lethal.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/meta.json
index 7684d02279..561a740d77 100644
--- a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/meta.json
@@ -1,44 +1,44 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/b4363f59f5feacbc48c29aea4eb7794ad358cd92/icons/obj/device.dmi. Modified by chromiumboy.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/b4363f59f5feacbc48c29aea4eb7794ad358cd92/icons/obj/device.dmi. Modified by chromiumboy. Rotated by K-Dynamic (github).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "safe",
-      "delays": [
-        [
-          0.2,
-          2.0
-        ]
-      ]
-    },
-    {
-      "name": "stun",
-      "delays": [
-        [
-          0.2,
-          1.0
-        ]
-      ]
-    },
-    {
-      "name": "lethal",
-      "delays": [
-        [
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "wires"
-    }
-  ]
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "safe",
+            "delays": [
+                [
+                    0.2,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "stun",
+            "delays": [
+                [
+                    0.2,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "lethal",
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "wires"
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/safe.png b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/safe.png
index f47615f626..567d0ed132 100644
Binary files a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/safe.png and b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/safe.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/stun.png b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/stun.png
index 1ca04be32f..24ee9a7ec4 100644
Binary files a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/stun.png and b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/stun.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/wires.png b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/wires.png
index 27644f00bd..fde4f7a3de 100644
Binary files a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/wires.png and b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/wires.png differ
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 59251752c3..3c070e8d0f 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -436,7 +436,7 @@ lanternextrabright: LanternFlash
 
 # 2023-08-04
 BoxMagazineLightRifleHighVelocity: BoxMagazineLightRifle
-BoxMagazineMagnumSubMachineGunHighVelocity: BoxMagazineMagnumSubMachineGun
+BoxMagazineMagnumSubMachineGunHighVelocity: null
 BoxMagazinePistolCaselessRifleHighVelocity: BoxMagazinePistolCaselessRifle
 BoxMagazinePistolHighCapacityHighVelocity: BoxMagazinePistolHighCapacity
 BoxMagazinePistolHighVelocity: BoxMagazinePistol
@@ -458,9 +458,9 @@ MagazineBoxMagnumHighVelocity: MagazineBoxMagnum
 MagazineBoxPistolHighVelocity: MagazineBoxPistol
 MagazineBoxRifleHighVelocity: MagazineBoxRifle
 MagazineCaselessRifleHighVelocity: MagazineCaselessRifle
-MagazineCaselessRifleShortHighVelocity: MagazineCaselessRifleShort
+MagazineCaselessRifleShortHighVelocity: null
 MagazineLightRifleHighVelocity: MagazineLightRifle
-MagazineMagnumSubMachineGunHighVelocity: MagazineMagnumSubMachineGun
+MagazineMagnumSubMachineGunHighVelocity: null
 MagazinePistolCaselessRifleHighVelocity: MagazinePistolCaselessRifle
 MagazinePistolHighCapacityHighVelocity: MagazinePistolHighCapacity
 MagazinePistolHighVelocity: MagazinePistol
@@ -704,11 +704,11 @@ MagazinePistolRubber: MagazinePistol
 MagazinePistolSubMachineGunRubber: MagazinePistolSubMachineGun
 MagazinePistolCaselessRifleRubber: MagazinePistolCaselessRifle
 MagazineMagnumRubber: MagazineMagnum
-MagazineMagnumSubMachineGunRubber: MagazineMagnumSubMachineGun
+MagazineMagnumSubMachineGunRubber: null
 MagazineLightRifleRubber: MagazineLightRifle
 MagazineRifleRubber: MagazineRifle
 MagazineCaselessRifleRubber: MagazineCaselessRifle
-MagazineCaselessRifleShortRubber: MagazineCaselessRifleShort
+MagazineCaselessRifleShortRubber: null
 SpeedLoaderPistolRubber: SpeedLoaderPistol
 SpeedLoaderMagnumRubber: SpeedLoaderMagnum
 MagazineBoxPistolRubber: MagazineBoxPistol
@@ -724,7 +724,7 @@ BoxMagazinePistolSubMachineGunRubber: BoxMagazinePistolSubMachineGun
 BoxMagazineLightRifleRubber: BoxMagazineLightRifle
 BoxMagazineRifleRubber: BoxMagazineRifle
 BoxMagazineCaselessRifleRubber: BoxMagazinePistolCaselessRifle
-BoxMagazineMagnumSubMachineGunRubber: BoxMagazineMagnumSubMachineGun
+BoxMagazineMagnumSubMachineGunRubber: null
 WeaponPistolMk58Nonlethal: WeaponPistolMk58
 WeaponPistolN1984Nonlethal: WeaponPistolN1984
 WeaponSubMachineGunDrozdRubber: WeaponSubMachineGunDrozd
@@ -1056,6 +1056,22 @@ SpawnHonkBot: SpawnMobHonkBot
 CrateFoodPizzaLarge: CrateFoodPizza
 CrateFoodSoftdrinksLarge: CrateFoodSoftdrinks
 
+# 2025-06-06
+MagazineLightRifleMaxim: null
+MagazineLightRiflePkBox: null
+MagazineCaselessRifle10x24: null
+BaseMagazineCaselessRifleShort: null
+MagazineCaselessRifleShort: null
+MagazineCaselessRifleShortPractice: null
+BaseMagazineMagnumSubMachineGun: null
+MagazineMagnumSubMachineGunEmpty: null
+MagazineMagnumSubMachineGun: null
+MagazineMagnumSubMachineGunPractice: null
+MagazineMagnumSubMachineGunUranium: null
+MagazineMagnumSubMachineGunPiercing: null
+BoxMagazineMagnumSubMachineGun: null
+BoxMagazineMagnumSubMachineGunPractice: null
+
 # 2025-06-09
 BarSignAlignTile: BarSign
 BarSignComboCafeAlignTile: BarSignComboCafe