diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ea103a45a39..17c2924813f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,7 +7,34 @@
 ## По какой причине
 <!-- В чём причина добавления этих изменений? Ссылки на Дискуссии, а так-же Баг-Репорты указывать здесь. Пожалуйста опишите как это изменит игровой баланс. -->
 
+<<<<<<< HEAD
 ## Медиа(Видео/Скриншоты)
+=======
+## Technical details
+<!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. -->
+
+## Media
+<!--
+PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes.
+Small fixes/refactors are exempt.
+Any media may be used in SS14 progress reports, with clear credit given.
+
+If you're unsure whether your PR will require media, ask a maintainer.
+-->
+
+## Requirements
+<!--
+Due to influx of PR's we require to ensure that PR's are following the correct guidelines.
+
+Please take a moment to read these if its your first time.
+
+Check the boxes below to confirm that you have in fact seen these (put an X in the brackets, like [X]):
+-->
+- [ ] I have read and I am following the [Pull Request Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). I understand that not doing so may get my pr closed at maintainer’s discretion
+- [ ] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase
+
+## Breaking changes
+>>>>>>> refs/remotes/wizards/master
 <!--
 Если ваш PR содержит внутриигровые изменения вы обязаны предоставить скриншоты/видео изменений.
 -->
@@ -22,6 +49,26 @@
 <!--
 Если нужно чтобы игроки узнали об изменениях сделаных в данном PR укажите их используя шаблон вне коментария. Кратко и информативно.
 
+:cl: VigersRay
+- add: Добавлено веселье.
+- remove: Удалено веселье.
+- tweak: Изменено веселье.
+- fix: Исправлено веселье.
+<!-- Пожалуйста прочитайте эту статью перед тем как выложить PR, чтобы избежать лишних правок в процессе осмотра: https://docs.spacestation14.io/en/getting-started/pr-guideline -->
+<!-- Текст в стрелочках является комментариями - они не будут видны в вашем PR. -->
+## Кратное описание
+<!-- Что вы предлагаете изменить с помощью своего PR? -->
+## По какой причине
+<!-- В чём причина добавления этих изменений? Ссылки на Дискуссии, а так-же Баг-Репорты указывать здесь. Пожалуйста опишите как это изменит игровой баланс. -->
+## Медиа(Видео/Скриншоты)
+Если ваш PR содержит внутриигровые изменения вы обязаны предоставить скриншоты/видео изменений.
+
+## Проверки
+
+- [ ] Я не требую помощи для завершения PR
+- [ ] Перед выкладыванием/запросом о рассмотрении PR, Я проверил работоспособность изменений.
+- [ ] Я добавил скриншоты/видео изменений, или данный PR не меняет внутриигровые механики
+Если нужно чтобы игроки узнали об изменениях сделаных в данном PR укажите их используя шаблон вне коментария. Кратко и информативно.
 :cl: VigersRay
 - add: Добавлено веселье.
 - remove: Удалено веселье.
diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs
index 6a2f67dc2c5..8f7b8e0788b 100644
--- a/Content.Client/Actions/ActionsSystem.cs
+++ b/Content.Client/Actions/ActionsSystem.cs
@@ -294,7 +294,7 @@ public void LoadActionAssignments(string path, bool userData)
                     continue;
 
                 var action = _serialization.Read<BaseActionComponent>(actionNode, notNullableOverride: true);
-                var actionId = Spawn(null);
+                var actionId = Spawn();
                 AddComp(actionId, action);
                 AddActionDirect(user, actionId);
 
diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs
index c21ba2e32ca..27b2a5dedb0 100644
--- a/Content.Client/Administration/AdminNameOverlay.cs
+++ b/Content.Client/Administration/AdminNameOverlay.cs
@@ -44,7 +44,7 @@ protected override void Draw(in OverlayDrawArgs args)
                 }
 
                 // if not on the same map, continue
-                if (_entityManager.GetComponent<TransformComponent>(entity.Value).MapID != _eyeManager.CurrentMap)
+                if (_entityManager.GetComponent<TransformComponent>(entity.Value).MapID != args.MapId)
                 {
                     continue;
                 }
diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
index 64d954331c0..6ca0ace59e1 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
@@ -97,13 +97,18 @@ public BwoinkControl()
                 if (a.IsPinned != b.IsPinned)
                     return a.IsPinned ? -1 : 1;
 
-                // First, sort by unread. Any chat with unread messages appears first. We just sort based on unread
-                // status, not number of unread messages, so that more recent unread messages take priority.
+                // First, sort by unread. Any chat with unread messages appears first.
                 var aUnread = ach.Unread > 0;
                 var bUnread = bch.Unread > 0;
                 if (aUnread != bUnread)
                     return aUnread ? -1 : 1;
 
+                // Sort by recent messages during the current round.
+                var aRecent = a.ActiveThisRound && ach.LastMessage != DateTime.MinValue;
+                var bRecent = b.ActiveThisRound && bch.LastMessage != DateTime.MinValue;
+                if (aRecent != bRecent)
+                    return aRecent ? -1 : 1;
+
                 // Next, sort by connection status. Any disconnected players are grouped towards the end.
                 if (a.Connected != b.Connected)
                     return a.Connected ? -1 : 1;
diff --git a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
index f1cb27a62a4..1bc1c0dba9a 100644
--- a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.FixedPoint;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
@@ -9,11 +10,15 @@ namespace Content.Client.Chemistry.UI
     [UsedImplicitly]
     public sealed class TransferAmountBoundUserInterface : BoundUserInterface
     {
+        private IEntityManager _entManager;
+        private EntityUid _owner;
         [ViewVariables]
         private TransferAmountWindow? _window;
 
         public TransferAmountBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
+          _owner = owner;
+          _entManager = IoCManager.Resolve<IEntityManager>();
         }
 
         protected override void Open()
@@ -21,6 +26,9 @@ protected override void Open()
             base.Open();
             _window = this.CreateWindow<TransferAmountWindow>();
 
+            if (_entManager.TryGetComponent<SolutionTransferComponent>(_owner, out var comp))
+                _window.SetBounds(comp.MinimumTransferAmount.Int(), comp.MaximumTransferAmount.Int());
+
             _window.ApplyButton.OnPressed += _ =>
             {
                 if (int.TryParse(_window.AmountLineEdit.Text, out var i))
diff --git a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
index 3d787c69c10..c73d86b10f1 100644
--- a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
+++ b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
@@ -6,6 +6,10 @@
         <BoxContainer Orientation="Horizontal">
             <LineEdit Name="AmountLineEdit" Access="Public" HorizontalExpand="True" PlaceHolder="{Loc 'ui-transfer-amount-line-edit-placeholder'}"/>
         </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+          <Label Name="MinimumAmount" Access="Public" HorizontalExpand="True" />
+          <Label Name="MaximumAmount" Access="Public" />
+        </BoxContainer>
         <Button Name="ApplyButton" Access="Public" Text="{Loc 'ui-transfer-amount-apply'}"/>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
index 767e5cc8230..6bae0444415 100644
--- a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
@@ -8,9 +8,29 @@ namespace Content.Client.Chemistry.UI
     [GenerateTypedNameReferences]
     public sealed partial class TransferAmountWindow : DefaultWindow
     {
+        private int _max = Int32.MaxValue;
+        private int _min = 1;
+
         public TransferAmountWindow()
         {
             RobustXamlLoader.Load(this);
+            AmountLineEdit.OnTextChanged += OnValueChanged;
+        }
+
+        public void SetBounds(int min, int max)
+        {
+          _min = min;
+          _max = max;
+          MinimumAmount.Text = Loc.GetString("comp-solution-transfer-set-amount-min", ("amount", _min));
+          MaximumAmount.Text = Loc.GetString("comp-solution-transfer-set-amount-max", ("amount", _max));
+        }
+
+        private void OnValueChanged(LineEdit.LineEditEventArgs args)
+        {
+            if (!int.TryParse(AmountLineEdit.Text, out var amount)  || amount > _max || amount < _min)
+                ApplyButton.Disabled = true;
+            else 
+                ApplyButton.Disabled = false; 
         }
     }
 }
diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
index 17b88fb5a8f..010bfb31845 100644
--- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
+++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
@@ -2,6 +2,8 @@
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Clothing;
+using Content.Shared.Clothing.Components;
 using Content.Shared.Hands;
 using Content.Shared.Item;
 using Content.Shared.Rounding;
@@ -20,6 +22,7 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<SolutionContainerVisualsComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<SolutionContainerVisualsComponent, GetInhandVisualsEvent>(OnGetHeldVisuals);
+        SubscribeLocalEvent<SolutionContainerVisualsComponent, GetEquipmentVisualsEvent>(OnGetClothingVisuals);
     }
 
     private void OnMapInit(EntityUid uid, SolutionContainerVisualsComponent component, MapInitEvent args)
@@ -174,4 +177,41 @@ private void OnGetHeldVisuals(EntityUid uid, SolutionContainerVisualsComponent c
             args.Layers.Add((key, layer));
         }
     }
+
+    private void OnGetClothingVisuals(Entity<SolutionContainerVisualsComponent> ent, ref GetEquipmentVisualsEvent args)
+    {
+        if (ent.Comp.EquippedFillBaseName == null)
+            return;
+
+        if (!TryComp<AppearanceComponent>(ent, out var appearance))
+            return;
+
+        if (!TryComp<ClothingComponent>(ent, out var clothing))
+            return;
+
+        if (!AppearanceSystem.TryGetData<float>(ent, SolutionContainerVisuals.FillFraction, out var fraction, appearance))
+            return;
+
+        var closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, ent.Comp.EquippedMaxFillLevels + 1);
+
+        if (closestFillSprite > 0)
+        {
+            var layer = new PrototypeLayerData();
+
+            var equippedPrefix = clothing.EquippedPrefix == null ? $"equipped-{args.Slot}" : $" {clothing.EquippedPrefix}-equipped-{args.Slot}";
+            var key = equippedPrefix + ent.Comp.EquippedFillBaseName + closestFillSprite;
+
+            // Make sure the sprite state is valid so we don't show a big red error message
+            // This saves us from having to make fill level sprites for every possible slot the item could be in (including pockets).
+            if (!TryComp<SpriteComponent>(ent, out var sprite) || sprite.BaseRSI == null || !sprite.BaseRSI.TryGetState(key, out _))
+                return;
+
+            layer.State = key;
+
+            if (ent.Comp.ChangeColor && AppearanceSystem.TryGetData<Color>(ent, SolutionContainerVisuals.Color, out var color, appearance))
+                layer.Color = color;
+
+            args.Layers.Add((key, layer));
+        }
+    }
 }
diff --git a/Content.Client/Commands/ActionsCommands.cs b/Content.Client/Commands/ActionsCommands.cs
index 3d8e906e09e..593b8e82569 100644
--- a/Content.Client/Commands/ActionsCommands.cs
+++ b/Content.Client/Commands/ActionsCommands.cs
@@ -1,3 +1,4 @@
+using Content.Client.Actions;
 using Content.Client.Actions;
 using Content.Client.Mapping;
 using Content.Shared.Administration;
@@ -61,27 +62,3 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
         }
     }
 }
-
-[AnyCommand]
-public sealed class LoadMappingActionsCommand : LocalizedCommands
-{
-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
-
-    public const string CommandName = "loadmapacts";
-
-    public override string Command => CommandName;
-
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
-
-    public override void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        try
-        {
-            _entitySystemManager.GetEntitySystem<MappingSystem>().LoadMappingActions();
-        }
-        catch
-        {
-            shell.WriteError(LocalizationManager.GetString($"cmd-{Command}-error"));
-        }
-    }
-}
diff --git a/Content.Client/Commands/HideMechanismsCommand.cs b/Content.Client/Commands/HideMechanismsCommand.cs
index 5f9afc78b98..97d792628a6 100644
--- a/Content.Client/Commands/HideMechanismsCommand.cs
+++ b/Content.Client/Commands/HideMechanismsCommand.cs
@@ -30,7 +30,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             sprite.ContainerOccluded = false;
 
             var tempParent = uid;
-            while (containerSys.TryGetContainingContainer(tempParent, out var container))
+            while (containerSys.TryGetContainingContainer((tempParent, null, null), out var container))
             {
                 if (!container.ShowContents)
                 {
diff --git a/Content.Client/Commands/MappingClientSideSetupCommand.cs b/Content.Client/Commands/MappingClientSideSetupCommand.cs
index 39268c62847..eb2d13c9540 100644
--- a/Content.Client/Commands/MappingClientSideSetupCommand.cs
+++ b/Content.Client/Commands/MappingClientSideSetupCommand.cs
@@ -1,6 +1,8 @@
+using Content.Client.Mapping;
 using Content.Client.Markers;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
+using Robust.Client.State;
 using Robust.Shared.Console;
 
 namespace Content.Client.Commands;
@@ -10,6 +12,7 @@ internal sealed class MappingClientSideSetupCommand : LocalizedCommands
 {
     [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
     [Dependency] private readonly ILightManager _lightManager = default!;
+    [Dependency] private readonly IStateManager _stateManager = default!;
 
     public override string Command => "mappingclientsidesetup";
 
@@ -21,8 +24,8 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             _entitySystemManager.GetEntitySystem<MarkerSystem>().MarkersVisible = true;
             _lightManager.Enabled = false;
-            shell.ExecuteCommand(ShowSubFloorForever.CommandName);
-            shell.ExecuteCommand(LoadMappingActionsCommand.CommandName);
+            shell.ExecuteCommand("showsubfloorforever");
+            _stateManager.RequestStateChange<MappingState>();
         }
     }
 }
diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
index 63868e7a93e..56604ba526d 100644
--- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
@@ -130,7 +130,7 @@ public void UpdateCountdown()
 
             EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-recall-shuttle");
             var infoText = Loc.GetString($"comms-console-menu-time-remaining",
-            ("time", diff.TotalSeconds.ToString(CultureInfo.CurrentCulture)));
+                ("time", diff.ToString(@"hh\:mm\:ss", CultureInfo.CurrentCulture)));
             CountdownLabel.SetMessage(infoText);
         }
     }
diff --git a/Content.Client/ContextMenu/UI/ContextMenuUIController.cs b/Content.Client/ContextMenu/UI/ContextMenuUIController.cs
index 5b156644a73..2d94034bb9c 100644
--- a/Content.Client/ContextMenu/UI/ContextMenuUIController.cs
+++ b/Content.Client/ContextMenu/UI/ContextMenuUIController.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using Content.Client.CombatMode;
 using Content.Client.Gameplay;
+using Content.Client.Mapping;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
 using Timer = Robust.Shared.Timing.Timer;
@@ -16,7 +17,7 @@ namespace Content.Client.ContextMenu.UI
     /// <remarks>
     ///     This largely involves setting up timers to open and close sub-menus when hovering over other menu elements.
     /// </remarks>
-    public sealed class ContextMenuUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>, IOnSystemChanged<CombatModeSystem>
+    public sealed class ContextMenuUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>, IOnSystemChanged<CombatModeSystem>, IOnStateEntered<MappingState>, IOnStateExited<MappingState>
     {
         public static readonly TimeSpan HoverDelay = TimeSpan.FromSeconds(0.2);
 
@@ -42,18 +43,51 @@ public sealed class ContextMenuUIController : UIController, IOnStateEntered<Game
         public Action<ContextMenuElement>? OnSubMenuOpened;
         public Action<ContextMenuElement, GUIBoundKeyEventArgs>? OnContextKeyEvent;
 
+        private bool _setup;
+
         public void OnStateEntered(GameplayState state)
         {
+            Setup();
+        }
+
+        public void OnStateExited(GameplayState state)
+        {
+            Shutdown();
+        }
+
+        public void OnStateEntered(MappingState state)
+        {
+            Setup();
+        }
+
+        public void OnStateExited(MappingState state)
+        {
+            Shutdown();
+        }
+
+        public void Setup()
+        {
+            if (_setup)
+                return;
+
+            _setup = true;
+
             RootMenu = new(this, null);
             RootMenu.OnPopupHide += Close;
             Menus.Push(RootMenu);
         }
 
-        public void OnStateExited(GameplayState state)
+        public void Shutdown()
         {
+            if (!_setup)
+                return;
+
+            _setup = false;
+
             Close();
             RootMenu.OnPopupHide -= Close;
             RootMenu.Dispose();
+            RootMenu = default!;
         }
 
         /// <summary>
diff --git a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs
index 845bd7c03d2..07b6f57bdb9 100644
--- a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs
+++ b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs
@@ -4,6 +4,7 @@
 using Robust.Client.Input;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Decals.Overlays;
 
@@ -16,7 +17,7 @@ public sealed class DecalPlacementOverlay : Overlay
     private readonly SharedTransformSystem _transform;
     private readonly SpriteSystem _sprite;
 
-    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+    public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities;
 
     public DecalPlacementOverlay(DecalPlacementSystem placement, SharedTransformSystem transform, SpriteSystem sprite)
     {
@@ -24,6 +25,7 @@ public DecalPlacementOverlay(DecalPlacementSystem placement, SharedTransformSyst
         _placement = placement;
         _transform = transform;
         _sprite = sprite;
+        ZIndex = 1000;
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -55,7 +57,7 @@ protected override void Draw(in OverlayDrawArgs args)
 
         if (snap)
         {
-            localPos = (Vector2) localPos.Floored() + grid.TileSizeHalfVector;
+            localPos = localPos.Floored() + grid.TileSizeHalfVector;
         }
 
         // Nothing uses snap cardinals so probably don't need preview?
diff --git a/Content.Client/Drowsiness/DrowsinessOverlay.cs b/Content.Client/Drowsiness/DrowsinessOverlay.cs
new file mode 100644
index 00000000000..a316f31ae64
--- /dev/null
+++ b/Content.Client/Drowsiness/DrowsinessOverlay.cs
@@ -0,0 +1,80 @@
+using Content.Shared.Drowsiness;
+using Content.Shared.StatusEffect;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Drowsiness;
+
+public sealed class DrowsinessOverlay : Overlay
+{
+    [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!;
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+    public override bool RequestScreenTexture => true;
+    private readonly ShaderInstance _drowsinessShader;
+
+    public float CurrentPower = 0.0f;
+
+    private const float PowerDivisor = 250.0f;
+    private const float Intensity = 0.2f; // for adjusting the visual scale
+    private float _visualScale = 0; // between 0 and 1
+
+    public DrowsinessOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        _drowsinessShader = _prototypeManager.Index<ShaderPrototype>("Drowsiness").InstanceUnique();
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        var playerEntity = _playerManager.LocalEntity;
+
+        if (playerEntity == null)
+            return;
+
+        if (!_entityManager.HasComponent<DrowsinessComponent>(playerEntity)
+            || !_entityManager.TryGetComponent<StatusEffectsComponent>(playerEntity, out var status))
+            return;
+
+        var statusSys = _sysMan.GetEntitySystem<StatusEffectsSystem>();
+        if (!statusSys.TryGetTime(playerEntity.Value, SharedDrowsinessSystem.DrowsinessKey, out var time, status))
+            return;
+
+        var curTime = _timing.CurTime;
+        var timeLeft = (float)(time.Value.Item2 - curTime).TotalSeconds;
+
+        CurrentPower += 8f * (0.5f * timeLeft - CurrentPower) * args.DeltaSeconds / (timeLeft + 1);
+    }
+
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
+            return false;
+
+        if (args.Viewport.Eye != eyeComp.Eye)
+            return false;
+
+        _visualScale = Math.Clamp(CurrentPower / PowerDivisor, 0.0f, 1.0f);
+        return _visualScale > 0;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (ScreenTexture == null)
+            return;
+
+        var handle = args.WorldHandle;
+        _drowsinessShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+        _drowsinessShader.SetParameter("Strength", _visualScale * Intensity);
+        handle.UseShader(_drowsinessShader);
+        handle.DrawRect(args.WorldBounds, Color.White);
+        handle.UseShader(null);
+    }
+}
diff --git a/Content.Client/Drowsiness/DrowsinessSystem.cs b/Content.Client/Drowsiness/DrowsinessSystem.cs
new file mode 100644
index 00000000000..bc8862b19d2
--- /dev/null
+++ b/Content.Client/Drowsiness/DrowsinessSystem.cs
@@ -0,0 +1,53 @@
+using Content.Shared.Drowsiness;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Player;
+
+namespace Content.Client.Drowsiness;
+
+public sealed class DrowsinessSystem : SharedDrowsinessSystem
+{
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IOverlayManager _overlayMan = default!;
+
+    private DrowsinessOverlay _overlay = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DrowsinessComponent, ComponentInit>(OnDrowsinessInit);
+        SubscribeLocalEvent<DrowsinessComponent, ComponentShutdown>(OnDrowsinessShutdown);
+
+        SubscribeLocalEvent<DrowsinessComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<DrowsinessComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+
+        _overlay = new();
+    }
+
+    private void OnPlayerAttached(EntityUid uid, DrowsinessComponent component, LocalPlayerAttachedEvent args)
+    {
+        _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnPlayerDetached(EntityUid uid, DrowsinessComponent component, LocalPlayerDetachedEvent args)
+    {
+        _overlay.CurrentPower = 0;
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnDrowsinessInit(EntityUid uid, DrowsinessComponent component, ComponentInit args)
+    {
+        if (_player.LocalEntity == uid)
+            _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnDrowsinessShutdown(EntityUid uid, DrowsinessComponent component, ComponentShutdown args)
+    {
+        if (_player.LocalEntity == uid)
+        {
+            _overlay.CurrentPower = 0;
+            _overlayMan.RemoveOverlay(_overlay);
+        }
+    }
+}
diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs
index 8cf7447a5d8..653f63e0f90 100644
--- a/Content.Client/Explosion/ExplosionOverlay.cs
+++ b/Content.Client/Explosion/ExplosionOverlay.cs
@@ -16,15 +16,17 @@ public sealed class ExplosionOverlay : Overlay
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly IEntityManager _entMan = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
+    private SharedAppearanceSystem _appearance;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
 
     private ShaderInstance _shader;
 
-    public ExplosionOverlay()
+    public ExplosionOverlay(SharedAppearanceSystem appearanceSystem)
     {
         IoCManager.InjectDependencies(this);
         _shader = _proto.Index<ShaderPrototype>("unshaded").Instance();
+        _appearance = appearanceSystem;
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -33,15 +35,14 @@ protected override void Draw(in OverlayDrawArgs args)
         drawHandle.UseShader(_shader);
 
         var xforms = _entMan.GetEntityQuery<TransformComponent>();
-        var query = _entMan
-            .EntityQuery<ExplosionVisualsComponent, ExplosionVisualsTexturesComponent, AppearanceComponent>(true);
+        var query = _entMan.EntityQueryEnumerator<ExplosionVisualsComponent, ExplosionVisualsTexturesComponent>();
 
-        foreach (var (visuals, textures, appearance) in query)
+        while (query.MoveNext(out var uid, out var visuals, out var textures))
         {
             if (visuals.Epicenter.MapId != args.MapId)
                 continue;
 
-            if (!appearance.TryGetData(ExplosionAppearanceData.Progress, out int index))
+            if (!_appearance.TryGetData(uid, ExplosionAppearanceData.Progress, out int index))
                 continue;
 
             index = Math.Min(index, visuals.Intensity.Count - 1);
diff --git a/Content.Client/Explosion/ExplosionOverlaySystem.cs b/Content.Client/Explosion/ExplosionOverlaySystem.cs
index fe552af0e79..7e43bbdc38c 100644
--- a/Content.Client/Explosion/ExplosionOverlaySystem.cs
+++ b/Content.Client/Explosion/ExplosionOverlaySystem.cs
@@ -20,6 +20,7 @@ public sealed class ExplosionOverlaySystem : EntitySystem
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
     [Dependency] private readonly SharedPointLightSystem _lights = default!;
     [Dependency] private readonly IMapManager _mapMan = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
     public override void Initialize()
     {
@@ -28,7 +29,7 @@ public override void Initialize()
         SubscribeLocalEvent<ExplosionVisualsComponent, ComponentInit>(OnExplosionInit);
         SubscribeLocalEvent<ExplosionVisualsComponent, ComponentRemove>(OnCompRemove);
         SubscribeLocalEvent<ExplosionVisualsComponent, ComponentHandleState>(OnExplosionHandleState);
-        _overlayMan.AddOverlay(new ExplosionOverlay());
+        _overlayMan.AddOverlay(new ExplosionOverlay(_appearance));
     }
 
     private void OnExplosionHandleState(EntityUid uid, ExplosionVisualsComponent component, ref ComponentHandleState args)
diff --git a/Content.Client/Explosion/ExplosionSystem.cs b/Content.Client/Explosion/ExplosionSystem.cs
new file mode 100644
index 00000000000..a2ed2d50e0d
--- /dev/null
+++ b/Content.Client/Explosion/ExplosionSystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Explosion.EntitySystems;
+
+namespace Content.Client.Explosion.EntitySystems;
+
+public sealed class ExplosionSystem : SharedExplosionSystem
+{
+
+}
diff --git a/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs b/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs
index 33944973b51..52ea835f4a8 100644
--- a/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs
+++ b/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs
@@ -22,7 +22,7 @@ protected override void Open()
         _ghostRoleRadioMenu.SendGhostRoleRadioMessageAction += SendGhostRoleRadioMessage;
     }
 
-    public void SendGhostRoleRadioMessage(ProtoId<GhostRolePrototype> protoId)
+    private void SendGhostRoleRadioMessage(ProtoId<GhostRolePrototype> protoId)
     {
         SendMessage(new GhostRoleRadioMessage(protoId));
     }
diff --git a/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs b/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs
index b05ac3fbddd..3897b1b949c 100644
--- a/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs
+++ b/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs
@@ -1,7 +1,6 @@
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Ghost.Roles;
 using Content.Shared.Ghost.Roles.Components;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -33,7 +32,7 @@ public void SetEntity(EntityUid uid)
 
     private void RefreshUI()
     {
-        // The main control that will contain all of the clickable options
+        // The main control that will contain all the clickable options
         var main = FindControl<RadialContainer>("Main");
 
         // The purpose of this radial UI is for ghost role radios that allow you to select
@@ -70,7 +69,7 @@ private void RefreshUI()
             if (_prototypeManager.TryIndex(ghostRoleProto.IconPrototype, out var iconProto))
                 entProtoView.SetPrototype(iconProto);
             else
-                entProtoView.SetPrototype(comp.Prototype);
+                entProtoView.SetPrototype(ghostRoleProto.EntityPrototype);
 
             button.AddChild(entProtoView);
             main.AddChild(button);
diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
index fc863648d79..9b14e01fb57 100644
--- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
+++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
@@ -206,7 +206,7 @@ private bool PlayCheck()
 
             var container = _entManager.System<SharedContainerSystem>();
             // If we're a handheld instrument, we might be in a container. Get it just in case.
-            container.TryGetContainingContainer(Entity, out var conMan);
+            container.TryGetContainingContainer((Entity, null, null), out var conMan);
 
             // If the instrument is handheld and we're not holding it, we return.
             if (instrument.Handheld && (conMan == null || conMan.Owner != localEntity))
diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs
index 2d0ae620b84..914efd22280 100644
--- a/Content.Client/IoC/ClientContentIoC.cs
+++ b/Content.Client/IoC/ClientContentIoC.cs
@@ -5,23 +5,23 @@
 using Content.Client.Clickable;
 using Content.Client.DebugMon;
 using Content.Client.Eui;
+using Content.Client.Fullscreen;
 using Content.Client.GhostKick;
+using Content.Client.Guidebook;
 using Content.Client.Launcher;
+using Content.Client.Mapping;
 using Content.Client.Parallax.Managers;
 using Content.Client.Players.PlayTimeTracking;
+using Content.Client.Replay;
 using Content.Client.Screenshot;
-using Content.Client.Fullscreen;
 using Content.Client.Stylesheets;
 using Content.Client.Viewport;
 using Content.Client.Voting;
 using Content.Shared.Administration.Logs;
-using Content.Client.Guidebook;
 using Content.Client.Lobby;
-using Content.Client.Replay;
 using Content.Shared.Administration.Managers;
 using Content.Shared.Players.PlayTimeTracking;
 
-
 namespace Content.Client.IoC
 {
     internal static class ClientContentIoC
@@ -50,6 +50,7 @@ public static void Register()
             collection.Register<DocumentParsingManager>();
             collection.Register<ContentReplayPlaybackManager, ContentReplayPlaybackManager>();
             collection.Register<ISharedPlaytimeManager, JobRequirementsManager>();
+            collection.Register<MappingManager>();
             collection.Register<DebugMonitorManager>();
 
             // Sunrise
diff --git a/Content.Client/Items/Systems/ItemSystem.cs b/Content.Client/Items/Systems/ItemSystem.cs
index 5e60d06d0ce..2b5a41c6ce7 100644
--- a/Content.Client/Items/Systems/ItemSystem.cs
+++ b/Content.Client/Items/Systems/ItemSystem.cs
@@ -43,7 +43,7 @@ private void OnEquipped(EntityUid uid, SpriteComponent component, GotEquippedEve
     public override void VisualsChanged(EntityUid uid)
     {
         // if the item is in a container, it might be equipped to hands or inventory slots --> update visuals.
-        if (Container.TryGetContainingContainer(uid, out var container))
+        if (Container.TryGetContainingContainer((uid, null, null), out var container))
             RaiseLocalEvent(container.Owner, new VisualsChangedEvent(GetNetEntity(uid), container.ID));
     }
 
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index c662338c968..ac0a7a4aa99 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -2,9 +2,11 @@
 using System.Numerics;
 using Content.Client.CrewManifest;
 using Content.Client.GameTicking.Managers;
+using Content.Client.Lobby;
 using Content.Client.UserInterface.Controls;
 using Content.Client.Players.PlayTimeTracking;
 using Content.Shared.CCVar;
+using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Content.Shared.StatusIcon;
 using Robust.Client.Console;
@@ -26,6 +28,7 @@ public sealed class LateJoinGui : DefaultWindow
         [Dependency] private readonly IConfigurationManager _configManager = default!;
         [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
         [Dependency] private readonly JobRequirementsManager _jobRequirements = default!;
+        [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
 
         public event Action<(NetEntity, string)> SelectedId;
 
@@ -254,7 +257,7 @@ private void RebuildUI()
 
                         jobButton.OnPressed += _ => SelectedId.Invoke((id, jobButton.JobId));
 
-                        if (!_jobRequirements.IsAllowed(prototype, out var reason))
+                        if (!_jobRequirements.IsAllowed(prototype, (HumanoidCharacterProfile?)_preferencesManager.Preferences?.SelectedCharacter, out var reason))
                         {
                             jobButton.Disabled = true;
 
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml b/Content.Client/Lathe/UI/LatheMenu.xaml
index e3247fe7037..5b21f0bae66 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml
@@ -100,11 +100,9 @@
                             Margin="5 0 0 0"
                             Text="{Loc 'lathe-menu-fabricating-message'}">
                         </Label>
-                        <EntityPrototypeView
-                            Name="FabricatingEntityProto"
-                            HorizontalAlignment="Left"
-                            Margin="100 0 0 0"
-                             />
+                        <BoxContainer Name="FabricatingDisplayContainer"
+                                      HorizontalAlignment="Left"
+                                      Margin="100 0 0 0"/>
                         <Label
                             Name="NameLabel"
                             RectClipContent="True"
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
index 6f530b76c75..630ef41e9fb 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
@@ -1,18 +1,15 @@
-using System.Buffers;
 using System.Linq;
 using System.Text;
 using Content.Client.Materials;
 using Content.Shared.Lathe;
 using Content.Shared.Lathe.Prototypes;
-using Content.Shared.Materials;
 using Content.Shared.Research.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Client.ResourceManagement;
-using Robust.Client.Graphics;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Lathe.UI;
@@ -92,7 +89,7 @@ public void PopulateRecipes()
 
             if (SearchBar.Text.Trim().Length != 0)
             {
-                if (proto.Name.ToLowerInvariant().Contains(SearchBar.Text.Trim().ToLowerInvariant()))
+                if (_lathe.GetRecipeName(recipe).ToLowerInvariant().Contains(SearchBar.Text.Trim().ToLowerInvariant()))
                     recipesToShow.Add(proto);
             }
             else
@@ -104,19 +101,15 @@ public void PopulateRecipes()
         if (!int.TryParse(AmountLineEdit.Text, out var quantity) || quantity <= 0)
             quantity = 1;
 
-        var sortedRecipesToShow = recipesToShow.OrderBy(p => p.Name);
+        var sortedRecipesToShow = recipesToShow.OrderBy(_lathe.GetRecipeName);
         RecipeList.Children.Clear();
         _entityManager.TryGetComponent(Entity, out LatheComponent? lathe);
 
         foreach (var prototype in sortedRecipesToShow)
         {
-            EntityPrototype? recipeProto = null;
-            if (_prototypeManager.TryIndex(prototype.Result, out EntityPrototype? entityProto))
-                recipeProto = entityProto;
-
             var canProduce = _lathe.CanProduce(Entity, prototype, quantity, component: lathe);
 
-            var control = new RecipeControl(prototype, () => GenerateTooltipText(prototype), canProduce, recipeProto);
+            var control = new RecipeControl(_lathe, prototype, () => GenerateTooltipText(prototype), canProduce, GetRecipeDisplayControl(prototype));
             control.OnButtonPressed += s =>
             {
                 if (!int.TryParse(AmountLineEdit.Text, out var amount) || amount <= 0)
@@ -132,9 +125,9 @@ private string GenerateTooltipText(LatheRecipePrototype prototype)
         StringBuilder sb = new();
         var multiplier = _entityManager.GetComponent<LatheComponent>(Entity).MaterialUseMultiplier;
 
-        foreach (var (id, amount) in prototype.RequiredMaterials)
+        foreach (var (id, amount) in prototype.Materials)
         {
-            if (!_prototypeManager.TryIndex<MaterialPrototype>(id, out var proto))
+            if (!_prototypeManager.TryIndex(id, out var proto))
                 continue;
 
             var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, multiplier);
@@ -163,8 +156,9 @@ private string GenerateTooltipText(LatheRecipePrototype prototype)
             sb.AppendLine(tooltipText);
         }
 
-        if (!string.IsNullOrWhiteSpace(prototype.Description))
-            sb.AppendLine(Loc.GetString("lathe-menu-description-display", ("description", prototype.Description)));
+        var desc = _lathe.GetRecipeDescription(prototype);
+        if (!string.IsNullOrWhiteSpace(desc))
+            sb.AppendLine(Loc.GetString("lathe-menu-description-display", ("description", desc)));
 
         // Remove last newline
         if (sb.Length > 0)
@@ -222,13 +216,10 @@ public void PopulateQueueList(List<LatheRecipePrototype> queue)
             var queuedRecipeBox = new BoxContainer();
             queuedRecipeBox.Orientation = BoxContainer.LayoutOrientation.Horizontal;
 
-            var queuedRecipeProto = new EntityPrototypeView();
-            queuedRecipeBox.AddChild(queuedRecipeProto);
-            if (_prototypeManager.TryIndex(recipe.Result, out EntityPrototype? entityProto) && entityProto != null)
-                queuedRecipeProto.SetPrototype(entityProto);
+            queuedRecipeBox.AddChild(GetRecipeDisplayControl(recipe));
 
             var queuedRecipeLabel = new Label();
-            queuedRecipeLabel.Text = $"{idx}. {recipe.Name}";
+            queuedRecipeLabel.Text = $"{idx}. {_lathe.GetRecipeName(recipe)}";
             queuedRecipeBox.AddChild(queuedRecipeLabel);
             QueueList.AddChild(queuedRecipeBox);
             idx++;
@@ -241,10 +232,29 @@ public void SetQueueInfo(LatheRecipePrototype? recipe)
         if (recipe == null)
             return;
 
-        if (_prototypeManager.TryIndex(recipe.Result, out EntityPrototype? entityProto) && entityProto != null)
-            FabricatingEntityProto.SetPrototype(entityProto);
+        FabricatingDisplayContainer.Children.Clear();
+        FabricatingDisplayContainer.AddChild(GetRecipeDisplayControl(recipe));
+
+        NameLabel.Text = _lathe.GetRecipeName(recipe);
+    }
+
+    public Control GetRecipeDisplayControl(LatheRecipePrototype recipe)
+    {
+        if (recipe.Icon != null)
+        {
+            var textRect = new TextureRect();
+            textRect.Texture = _spriteSystem.Frame0(recipe.Icon);
+            return textRect;
+        }
+
+        if (recipe.Result is { } result)
+        {
+            var entProtoView = new EntityPrototypeView();
+            entProtoView.SetPrototype(result);
+            return entProtoView;
+        }
 
-        NameLabel.Text = $"{recipe.Name}";
+        return new Control();
     }
 
     private void OnItemSelected(OptionButton.ItemSelectedEventArgs obj)
diff --git a/Content.Client/Lathe/UI/RecipeControl.xaml b/Content.Client/Lathe/UI/RecipeControl.xaml
index 19e20c7c06d..1105ab478ff 100644
--- a/Content.Client/Lathe/UI/RecipeControl.xaml
+++ b/Content.Client/Lathe/UI/RecipeControl.xaml
@@ -5,8 +5,8 @@
         Margin="0"
         StyleClasses="ButtonSquare">
         <BoxContainer Orientation="Horizontal">
-            <EntityPrototypeView
-                Name="RecipePrototype"
+            <BoxContainer
+                Name="RecipeDisplayContainer"
                 Margin="0 0 4 0"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
diff --git a/Content.Client/Lathe/UI/RecipeControl.xaml.cs b/Content.Client/Lathe/UI/RecipeControl.xaml.cs
index db428d3cf0e..4f438c8a8e5 100644
--- a/Content.Client/Lathe/UI/RecipeControl.xaml.cs
+++ b/Content.Client/Lathe/UI/RecipeControl.xaml.cs
@@ -1,10 +1,7 @@
 using Content.Shared.Research.Prototypes;
 using Robust.Client.AutoGenerated;
-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.Lathe.UI;
 
@@ -14,13 +11,12 @@ public sealed partial class RecipeControl : Control
     public Action<string>? OnButtonPressed;
     public Func<string> TooltipTextSupplier;
 
-    public RecipeControl(LatheRecipePrototype recipe, Func<string> tooltipTextSupplier, bool canProduce, EntityPrototype? entityPrototype = null)
+    public RecipeControl(LatheSystem latheSystem, LatheRecipePrototype recipe, Func<string> tooltipTextSupplier, bool canProduce, Control displayControl)
     {
         RobustXamlLoader.Load(this);
 
-        RecipeName.Text = recipe.Name;
-        if (entityPrototype != null)
-            RecipePrototype.SetPrototype(entityPrototype);
+        RecipeName.Text = latheSystem.GetRecipeName(recipe);
+        RecipeDisplayContainer.AddChild(displayControl);
         Button.Disabled = !canProduce;
         TooltipTextSupplier = tooltipTextSupplier;
         Button.TooltipSupplier = SupplyTooltip;
diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs
index 0a62ff23619..91cbacd2a23 100644
--- a/Content.Client/Lobby/LobbyUIController.cs
+++ b/Content.Client/Lobby/LobbyUIController.cs
@@ -44,6 +44,7 @@ public sealed partial class LobbyUIController : UIController, IOnStateEntered<Lo
     [UISystemDependency] private readonly ClientInventorySystem _inventory = default!;
     [UISystemDependency] private readonly StationSpawningSystem _spawn = default!;
     [UISystemDependency] private readonly GuidebookSystem _guide = default!;
+    [UISystemDependency] private readonly LoadoutSystem _loadouts = default!;
 
     private CharacterSetupGui? _characterSetup;
     private HumanoidProfileEditor? _profileEditor;
@@ -365,26 +366,29 @@ public void GiveDummyLoadout(EntityUid uid, RoleLoadout? roleLoadout, bool outer
         if (roleLoadout == null)
             return;
 
+        // Sunrtise-Start
         var undervearSlots = new List<string> { "bra", "pants", "socks" };
+        // Sunrtise-End
 
         foreach (var group in roleLoadout.SelectedLoadouts.Values)
         {
             foreach (var loadout in group)
             {
-                var wear = true;
+                var wear = true; // Sunrtise-Edit
                 if (!_prototypeManager.TryIndex(loadout.Prototype, out var loadoutProto))
                     continue;
 
-                var startingGear = _prototypeManager.Index(loadoutProto.Equipment);
+                // Sunrtise-Start
 
-                foreach (var keyValuePair in startingGear.Equipment)
+                foreach (var keyValuePair in loadoutProto.Equipment)
                 {
                     if (!undervearSlots.Contains(keyValuePair.Key) && !outerwear)
                         wear = false;
                 }
 
                 if (wear)
-                    _spawn.EquipStartingGear(uid, startingGear);
+                    _spawn.EquipStartingGear(uid, loadoutProto);
+                // Sunrtise-End
             }
         }
     }
@@ -407,36 +411,51 @@ public void GiveDummyJobClothes(EntityUid dummy, HumanoidCharacterProfile profil
                     if (!_prototypeManager.TryIndex(loadout.Prototype, out var loadoutProto))
                         continue;
 
-                    // TODO: Need some way to apply starting gear to an entity coz holy fucking shit dude.
-                    var loadoutGear = _prototypeManager.Index(loadoutProto.Equipment);
-
+                    // TODO: Need some way to apply starting gear to an entity and replace existing stuff coz holy fucking shit dude.
                     foreach (var slot in slots)
                     {
-                        var itemType = loadoutGear.GetGear(slot.Name);
-
-                        if (_inventory.TryUnequip(dummy, slot.Name, out var unequippedItem, silent: true, force: true, reparent: false))
+                        // Try startinggear first
+                        if (_prototypeManager.TryIndex(loadoutProto.StartingGear, out var loadoutGear))
                         {
-                            EntityManager.DeleteEntity(unequippedItem.Value);
+                            var itemType = ((IEquipmentLoadout) loadoutGear).GetGear(slot.Name);
+
+                            if (_inventory.TryUnequip(dummy, slot.Name, out var unequippedItem, silent: true, force: true, reparent: false))
+                            {
+                                EntityManager.DeleteEntity(unequippedItem.Value);
+                            }
+
+                            if (itemType != string.Empty)
+                            {
+                                var item = EntityManager.SpawnEntity(itemType, MapCoordinates.Nullspace);
+                                _inventory.TryEquip(dummy, item, slot.Name, true, true);
+                            }
                         }
-
-                        if (itemType != string.Empty)
+                        else
                         {
-                            var item = EntityManager.SpawnEntity(itemType, MapCoordinates.Nullspace);
-                            _inventory.TryEquip(dummy, item, slot.Name, true, true);
+                            var itemType = ((IEquipmentLoadout) loadoutProto).GetGear(slot.Name);
+
+                            if (_inventory.TryUnequip(dummy, slot.Name, out var unequippedItem, silent: true, force: true, reparent: false))
+                            {
+                                EntityManager.DeleteEntity(unequippedItem.Value);
+                            }
+
+                            if (itemType != string.Empty)
+                            {
+                                var item = EntityManager.SpawnEntity(itemType, MapCoordinates.Nullspace);
+                                _inventory.TryEquip(dummy, item, slot.Name, true, true);
+                            }
                         }
                     }
                 }
             }
         }
 
-        if (job.StartingGear == null)
+        if (!_prototypeManager.TryIndex(job.StartingGear, out var gear))
             return;
 
-        var gear = _prototypeManager.Index<StartingGearPrototype>(job.StartingGear);
-
         foreach (var slot in slots)
         {
-            var itemType = gear.GetGear(slot.Name);
+            var itemType = ((IEquipmentLoadout) gear).GetGear(slot.Name);
 
             if (_inventory.TryUnequip(dummy, slot.Name, out var unequippedItem, silent: true, force: true, reparent: false))
             {
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 320fef8f934..b3733ee440f 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -678,7 +678,7 @@ public void RefreshAntags()
 
                 // Sunrise-Sponsors-Start
                 var requirements = _entManager.System<SharedRoleSystem>().GetAntagRequirement(antag);
-                if (!_requirements.CheckRoleTime(requirements, out var reason) &&
+                if (!_requirements.CheckRoleRequirements(requirements, (HumanoidCharacterProfile?)_preferencesManager.Preferences?.SelectedCharacter, out var reason) &&
                     _sponsorsMgr != null && !_sponsorsMgr.GetClientPrototypes().Contains(antag.ID))
                 {
                     selector.LockRequirements(reason);
@@ -939,7 +939,7 @@ public void RefreshJobs()
                     icon.Texture = jobIcon.Icon.Frame0();
                     selector.Setup(items, job.LocalizedName, 200, job.LocalizedDescription, icon, job.Guides);
 
-                    if (!_requirements.IsAllowed(job, out var reason))
+                    if (!_requirements.IsAllowed(job, (HumanoidCharacterProfile?)_preferencesManager.Preferences?.SelectedCharacter, out var reason))
                     {
                         selector.LockRequirements(reason);
                     }
diff --git a/Content.Client/Mapping/MappingActionsButton.xaml b/Content.Client/Mapping/MappingActionsButton.xaml
new file mode 100644
index 00000000000..099719a70e1
--- /dev/null
+++ b/Content.Client/Mapping/MappingActionsButton.xaml
@@ -0,0 +1,8 @@
+<mapping:MappingActionsButton
+    xmlns="https://spacestation14.io"
+    xmlns:mapping="clr-namespace:Content.Client.Mapping"
+    StyleClasses="ButtonSquare" ToggleMode="True" SetSize="32 32" Margin="0 0 5 0"
+    TooltipDelay="0">
+    <TextureRect Name="Texture" Access="Public" Stretch="Scale" SetSize="16 16"
+                 HorizontalAlignment="Center" VerticalAlignment="Center" />
+</mapping:MappingActionsButton>
diff --git a/Content.Client/Mapping/MappingActionsButton.xaml.cs b/Content.Client/Mapping/MappingActionsButton.xaml.cs
new file mode 100644
index 00000000000..1a2f2c069f6
--- /dev/null
+++ b/Content.Client/Mapping/MappingActionsButton.xaml.cs
@@ -0,0 +1,15 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Mapping;
+
+[GenerateTypedNameReferences]
+public sealed partial class MappingActionsButton : Button
+{
+    public MappingActionsButton()
+    {
+        RobustXamlLoader.Load(this);
+    }
+}
+
diff --git a/Content.Client/Mapping/MappingDoNotMeasure.xaml b/Content.Client/Mapping/MappingDoNotMeasure.xaml
new file mode 100644
index 00000000000..08909636ee5
--- /dev/null
+++ b/Content.Client/Mapping/MappingDoNotMeasure.xaml
@@ -0,0 +1,4 @@
+<mapping:MappingDoNotMeasure
+    xmlns="https://spacestation14.io"
+    xmlns:mapping="clr-namespace:Content.Client.Mapping">
+</mapping:MappingDoNotMeasure>
diff --git a/Content.Client/Mapping/MappingDoNotMeasure.xaml.cs b/Content.Client/Mapping/MappingDoNotMeasure.xaml.cs
new file mode 100644
index 00000000000..c4cb560234c
--- /dev/null
+++ b/Content.Client/Mapping/MappingDoNotMeasure.xaml.cs
@@ -0,0 +1,21 @@
+using System.Numerics;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Mapping;
+
+[GenerateTypedNameReferences]
+public sealed partial class MappingDoNotMeasure : Control
+{
+    public MappingDoNotMeasure()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    protected override Vector2 MeasureOverride(Vector2 availableSize)
+    {
+        return Vector2.Zero;
+    }
+}
+
diff --git a/Content.Client/Mapping/MappingManager.cs b/Content.Client/Mapping/MappingManager.cs
new file mode 100644
index 00000000000..1aac02be714
--- /dev/null
+++ b/Content.Client/Mapping/MappingManager.cs
@@ -0,0 +1,69 @@
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Content.Shared.Mapping;
+using Robust.Client.UserInterface;
+using Robust.Shared.Network;
+
+namespace Content.Client.Mapping;
+
+public sealed class MappingManager : IPostInjectInit
+{
+    [Dependency] private readonly IFileDialogManager _file = default!;
+    [Dependency] private readonly IClientNetManager _net = default!;
+
+    private Stream? _saveStream;
+    private MappingMapDataMessage? _mapData;
+
+    public void PostInject()
+    {
+        _net.RegisterNetMessage<MappingSaveMapMessage>();
+        _net.RegisterNetMessage<MappingSaveMapErrorMessage>(OnSaveError);
+        _net.RegisterNetMessage<MappingMapDataMessage>(OnMapData);
+    }
+
+    private void OnSaveError(MappingSaveMapErrorMessage message)
+    {
+        _saveStream?.DisposeAsync();
+        _saveStream = null;
+    }
+
+    private async void OnMapData(MappingMapDataMessage message)
+    {
+        if (_saveStream == null)
+        {
+            _mapData = message;
+            return;
+        }
+
+        await _saveStream.WriteAsync(Encoding.ASCII.GetBytes(message.Yml));
+        await _saveStream.DisposeAsync();
+
+        _saveStream = null;
+        _mapData = null;
+    }
+
+    public async Task SaveMap()
+    {
+        if (_saveStream != null)
+            await _saveStream.DisposeAsync();
+
+        var request = new MappingSaveMapMessage();
+        _net.ClientSendMessage(request);
+
+        var path = await _file.SaveFile();
+        if (path is not { fileStream: var stream })
+            return;
+
+        if (_mapData != null)
+        {
+            await stream.WriteAsync(Encoding.ASCII.GetBytes(_mapData.Yml));
+            _mapData = null;
+            await stream.FlushAsync();
+            await stream.DisposeAsync();
+            return;
+        }
+
+        _saveStream = stream;
+    }
+}
diff --git a/Content.Client/Mapping/MappingOverlay.cs b/Content.Client/Mapping/MappingOverlay.cs
new file mode 100644
index 00000000000..ef9f3e795e6
--- /dev/null
+++ b/Content.Client/Mapping/MappingOverlay.cs
@@ -0,0 +1,84 @@
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.Player;
+using Robust.Client.UserInterface;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using static Content.Client.Mapping.MappingState;
+
+namespace Content.Client.Mapping;
+
+public sealed class MappingOverlay : Overlay
+{
+    [Dependency] private readonly IEntityManager _entities = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
+
+    // 1 off in case something else uses these colors since we use them to compare
+    private static readonly Color PickColor = new(1, 255, 0);
+    private static readonly Color DeleteColor = new(255, 1, 0);
+
+    private readonly Dictionary<EntityUid, Color> _oldColors = new();
+
+    private readonly MappingState _state;
+    private readonly ShaderInstance _shader;
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+
+    public MappingOverlay(MappingState state)
+    {
+        IoCManager.InjectDependencies(this);
+
+        _state = state;
+        _shader = _prototypes.Index<ShaderPrototype>("unshaded").Instance();
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        foreach (var (id, color) in _oldColors)
+        {
+            if (!_entities.TryGetComponent(id, out SpriteComponent? sprite))
+                continue;
+
+            if (sprite.Color == DeleteColor || sprite.Color == PickColor)
+                sprite.Color = color;
+        }
+
+        _oldColors.Clear();
+
+        if (_player.LocalEntity == null)
+            return;
+
+        var handle = args.WorldHandle;
+        handle.UseShader(_shader);
+
+        switch (_state.State)
+        {
+            case CursorState.Pick:
+            {
+                if (_state.GetHoveredEntity() is { } entity &&
+                    _entities.TryGetComponent(entity, out SpriteComponent? sprite))
+                {
+                    _oldColors[entity] = sprite.Color;
+                    sprite.Color = PickColor;
+                }
+
+                break;
+            }
+            case CursorState.Delete:
+            {
+                if (_state.GetHoveredEntity() is { } entity &&
+                    _entities.TryGetComponent(entity, out SpriteComponent? sprite))
+                {
+                    _oldColors[entity] = sprite.Color;
+                    sprite.Color = DeleteColor;
+                }
+
+                break;
+            }
+        }
+
+        handle.UseShader(null);
+    }
+}
diff --git a/Content.Client/Mapping/MappingPrototype.cs b/Content.Client/Mapping/MappingPrototype.cs
new file mode 100644
index 00000000000..eff2dfab151
--- /dev/null
+++ b/Content.Client/Mapping/MappingPrototype.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Decals;
+using Content.Shared.Maps;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Mapping;
+
+/// <summary>
+///     Used to represent a button's data in the mapping editor.
+/// </summary>
+public sealed class MappingPrototype
+{
+    /// <summary>
+    ///     The prototype instance, if any.
+    ///     Can be one of <see cref="EntityPrototype"/>, <see cref="ContentTileDefinition"/> or <see cref="DecalPrototype"/>
+    ///     If null, this is a top-level button (such as Entities, Tiles or Decals)
+    /// </summary>
+    public readonly IPrototype? Prototype;
+
+    /// <summary>
+    ///     The text to display on the UI for this button.
+    /// </summary>
+    public readonly string Name;
+
+    /// <summary>
+    ///     Which other prototypes (buttons) this one is nested inside of.
+    /// </summary>
+    public List<MappingPrototype>? Parents;
+
+    /// <summary>
+    ///     Which other prototypes (buttons) are nested inside this one.
+    /// </summary>
+    public List<MappingPrototype>? Children;
+
+    public MappingPrototype(IPrototype? prototype, string name)
+    {
+        Prototype = prototype;
+        Name = name;
+    }
+}
diff --git a/Content.Client/Mapping/MappingPrototypeList.xaml b/Content.Client/Mapping/MappingPrototypeList.xaml
new file mode 100644
index 00000000000..de311240df1
--- /dev/null
+++ b/Content.Client/Mapping/MappingPrototypeList.xaml
@@ -0,0 +1,21 @@
+<mapping:MappingPrototypeList
+    xmlns="https://spacestation14.io"
+    xmlns:mapping="clr-namespace:Content.Client.Mapping">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
+            <Button Name="CollapseAllButton" Access="Public" Text="-" SetSize="48 48"
+                    StyleClasses="ButtonSquare" ToolTip="Collapse All" TooltipDelay="0" />
+            <LineEdit Name="SearchBar" SetHeight="48" HorizontalExpand="True" Access="Public" />
+            <Button Name="ClearSearchButton" Access="Public" Text="X" SetSize="48 48"
+                    StyleClasses="ButtonSquare" />
+        </BoxContainer>
+        <ScrollContainer Name="ScrollContainer" Access="Public" VerticalExpand="True"
+                         ReserveScrollbarSpace="True">
+            <BoxContainer Name="PrototypeList" Access="Public" Orientation="Vertical" />
+            <PrototypeListContainer Name="SearchList" Access="Public" Visible="False" />
+        </ScrollContainer>
+        <mapping:MappingDoNotMeasure Visible="False">
+            <mapping:MappingSpawnButton Name="MeasureButton" Access="Public" />
+        </mapping:MappingDoNotMeasure>
+    </BoxContainer>
+</mapping:MappingPrototypeList>
diff --git a/Content.Client/Mapping/MappingPrototypeList.xaml.cs b/Content.Client/Mapping/MappingPrototypeList.xaml.cs
new file mode 100644
index 00000000000..8b59e6eb6f1
--- /dev/null
+++ b/Content.Client/Mapping/MappingPrototypeList.xaml.cs
@@ -0,0 +1,170 @@
+using System.Numerics;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using static Robust.Client.UserInterface.Controls.BaseButton;
+
+namespace Content.Client.Mapping;
+
+[GenerateTypedNameReferences]
+public sealed partial class MappingPrototypeList : Control
+{
+    private (int start, int end) _lastIndices;
+    private readonly List<MappingPrototype> _prototypes = new();
+    private readonly List<Texture> _insertTextures = new();
+    private readonly List<MappingPrototype> _search = new();
+
+    public MappingSpawnButton? Selected;
+    public Action<IPrototype, List<Texture>>? GetPrototypeData;
+    public event Action<MappingSpawnButton, IPrototype?>? SelectionChanged;
+    public event Action<MappingSpawnButton, ButtonToggledEventArgs>? CollapseToggled;
+
+    public MappingPrototypeList()
+    {
+        RobustXamlLoader.Load(this);
+
+        MeasureButton.Measure(Vector2Helpers.Infinity);
+
+        ScrollContainer.OnScrolled += UpdateSearch;
+        OnResized += UpdateSearch;
+    }
+
+    public void UpdateVisible(List<MappingPrototype> prototypes)
+    {
+        _prototypes.Clear();
+
+        PrototypeList.DisposeAllChildren();
+
+        _prototypes.AddRange(prototypes);
+
+        Selected = null;
+        ScrollContainer.SetScrollValue(new Vector2(0, 0));
+
+        foreach (var prototype in _prototypes)
+        {
+            Insert(PrototypeList, prototype, true);
+        }
+    }
+
+    public MappingSpawnButton Insert(Container list, MappingPrototype mapping, bool includeChildren)
+    {
+        var prototype = mapping.Prototype;
+
+        _insertTextures.Clear();
+
+        if (prototype != null)
+            GetPrototypeData?.Invoke(prototype, _insertTextures);
+
+        var button = new MappingSpawnButton { Prototype = mapping };
+        button.Label.Text = mapping.Name;
+
+        if (_insertTextures.Count > 0)
+        {
+            button.Texture.Textures.AddRange(_insertTextures);
+            button.Texture.InvalidateMeasure();
+        }
+        else
+        {
+            button.Texture.Visible = false;
+        }
+
+        if (prototype != null && button.Prototype == Selected?.Prototype)
+        {
+            Selected = button;
+            button.Button.Pressed = true;
+        }
+
+        list.AddChild(button);
+
+        button.Button.OnToggled += _ => SelectionChanged?.Invoke(button, prototype);
+
+        if (includeChildren && mapping.Children?.Count > 0)
+        {
+            button.CollapseButton.Visible = true;
+            button.CollapseButton.OnToggled += args => CollapseToggled?.Invoke(button, args);
+        }
+        else
+        {
+            button.CollapseButtonWrapper.Visible = false;
+            button.CollapseButton.Visible = false;
+        }
+
+        return button;
+    }
+
+    public void Search(List<MappingPrototype> prototypes)
+    {
+        _search.Clear();
+        SearchList.DisposeAllChildren();
+        _lastIndices = (0, -1);
+
+        _search.AddRange(prototypes);
+        SearchList.TotalItemCount = _search.Count;
+        ScrollContainer.SetScrollValue(new Vector2(0, 0));
+
+        UpdateSearch();
+    }
+
+    /// <summary>
+    ///     Constructs a virtual list where not all buttons exist at one time, since there may be thousands of them.
+    /// </summary>
+    private void UpdateSearch()
+    {
+        if (!SearchList.Visible)
+            return;
+
+        var height = MeasureButton.DesiredSize.Y + PrototypeListContainer.Separation;
+        var offset = Math.Max(-SearchList.Position.Y, 0);
+        var startIndex = (int) Math.Floor(offset / height);
+        SearchList.ItemOffset = startIndex;
+
+        var (prevStart, prevEnd) = _lastIndices;
+        var endIndex = startIndex - 1;
+        var spaceUsed = -height;
+
+        // calculate how far down we are scrolled
+        while (spaceUsed < SearchList.Parent!.Height)
+        {
+            spaceUsed += height;
+            endIndex += 1;
+        }
+
+        endIndex = Math.Min(endIndex, _search.Count - 1);
+
+        // nothing changed in terms of which buttons are visible now and before
+        if (endIndex == prevEnd && startIndex == prevStart)
+            return;
+
+        _lastIndices = (startIndex, endIndex);
+
+        // remove previously seen but now unseen buttons from the top
+        for (var i = prevStart; i < startIndex && i <= prevEnd; i++)
+        {
+            var control = SearchList.GetChild(0);
+            SearchList.RemoveChild(control);
+        }
+
+        // remove previously seen but now unseen buttons from the bottom
+        for (var i = prevEnd; i > endIndex && i >= prevStart; i--)
+        {
+            var control = SearchList.GetChild(SearchList.ChildCount - 1);
+            SearchList.RemoveChild(control);
+        }
+
+        // insert buttons that can now be seen, from the start
+        for (var i = Math.Min(prevStart - 1, endIndex); i >= startIndex; i--)
+        {
+            Insert(SearchList, _search[i], false).SetPositionInParent(0);
+        }
+
+        // insert buttons that can now be seen, from the end
+        for (var i = Math.Max(prevEnd + 1, startIndex); i <= endIndex; i++)
+        {
+            Insert(SearchList, _search[i], false);
+        }
+    }
+}
diff --git a/Content.Client/Mapping/MappingScreen.xaml b/Content.Client/Mapping/MappingScreen.xaml
new file mode 100644
index 00000000000..b6413608478
--- /dev/null
+++ b/Content.Client/Mapping/MappingScreen.xaml
@@ -0,0 +1,85 @@
+<mapping:MappingScreen
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Chat.Widgets"
+    xmlns:hotbar="clr-namespace:Content.Client.UserInterface.Systems.Hotbar.Widgets"
+    xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    xmlns:mapping="clr-namespace:Content.Client.Mapping"
+    VerticalExpand="False"
+    VerticalAlignment="Bottom"
+    HorizontalAlignment="Center">
+    <controls:RecordedSplitContainer Name="ScreenContainer" HorizontalExpand="True"
+                                     VerticalExpand="True" SplitWidth="0"
+                                     StretchDirection="TopLeft">
+        <BoxContainer Orientation="Vertical" VerticalExpand="True" Name="SpawnContainer" MinWidth="200" SetWidth="600">
+            <mapping:MappingPrototypeList Name="Prototypes" Access="Public" VerticalExpand="True" />
+            <BoxContainer Name="DecalContainer" Access="Public" Orientation="Horizontal"
+                          Visible="False">
+                <BoxContainer Orientation="Vertical" HorizontalExpand="True">
+                    <ColorSelectorSliders Name="DecalColorPicker" IsAlphaVisible="True" />
+                    <Button Name="DecalPickerOpen" Text="{Loc decal-placer-window-palette}"
+                            StyleClasses="ButtonSquare" />
+                </BoxContainer>
+                <BoxContainer Orientation="Vertical" HorizontalExpand="True">
+                    <CheckBox Name="DecalEnableAuto" Margin="0 0 0 10"
+                              Text="{Loc decal-placer-window-enable-auto}" />
+                    <CheckBox Name="DecalEnableSnap"
+                              Text="{Loc decal-placer-window-enable-snap}" />
+                    <CheckBox Name="DecalEnableCleanable"
+                              Text="{Loc decal-placer-window-enable-cleanable}" />
+                    <BoxContainer Name="DecalSpinBoxContainer" Orientation="Horizontal">
+                        <Label Text="{Loc decal-placer-window-rotation}" Margin="0 0 0 1" />
+                    </BoxContainer>
+                    <BoxContainer Orientation="Horizontal">
+                        <Label Text="{Loc decal-placer-window-zindex}" Margin="0 0 0 1" />
+                        <SpinBox Name="DecalZIndexSpinBox" HorizontalExpand="True" />
+                    </BoxContainer>
+                </BoxContainer>
+            </BoxContainer>
+            <BoxContainer Name="EntityContainer" Access="Public" Orientation="Horizontal"
+                          Visible="False">
+                <Button Name="EntityReplaceButton" Access="Public" ToggleMode="True"
+                        SetHeight="48"
+                        StyleClasses="ButtonSquare" Text="{Loc 'mapping-replace'}" HorizontalExpand="True" />
+                <OptionButton Name="EntityPlacementMode" Access="Public"
+                              SetHeight="48"
+                              StyleClasses="ButtonSquare" TooltipDelay="0"
+                              ToolTip="{Loc entity-spawn-window-override-menu-tooltip}"
+                              HorizontalExpand="True" />
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal">
+                <Button Name="EraseEntityButton" Access="Public" HorizontalExpand="True"
+                        SetHeight="48"
+                        ToggleMode="True" Text="{Loc 'mapping-erase-entity'}" StyleClasses="ButtonSquare" />
+                <Button Name="EraseDecalButton" Access="Public" HorizontalExpand="True"
+                        SetHeight="48"
+                        ToggleMode="True" Text="{Loc 'mapping-erase-decal'}" StyleClasses="ButtonSquare" />
+            </BoxContainer>
+            <widgets:ChatBox Visible="False" />
+        </BoxContainer>
+        <LayoutContainer Name="ViewportContainer" HorizontalExpand="True" VerticalExpand="True">
+            <controls:MainViewport Name="MainViewport"/>
+            <hotbar:HotbarGui Name="Hotbar" />
+            <PanelContainer Name="Actions" VerticalExpand="True" HorizontalExpand="True"
+                            MaxHeight="48">
+                <PanelContainer.PanelOverride>
+                    <graphics:StyleBoxFlat BackgroundColor="#222222AA" />
+                </PanelContainer.PanelOverride>
+                <BoxContainer Orientation="Horizontal" Margin="15 10">
+                    <mapping:MappingActionsButton
+                        Name="Add" Access="Public" Disabled="True" ToolTip="" Visible="False" />
+                    <mapping:MappingActionsButton Name="Fill" Access="Public"
+                                                  ToolTip="" Visible="False" />
+                    <mapping:MappingActionsButton Name="Grab" Access="Public"
+                                                  ToolTip="" Visible="False" />
+                    <mapping:MappingActionsButton Name="Move" Access="Public"
+                                                  ToolTip="" Visible="False" />
+                    <mapping:MappingActionsButton Name="Pick" Access="Public"
+                                                  ToolTip="Pick (Hold 5)" />
+                    <mapping:MappingActionsButton Name="Delete" Access="Public"
+                                                  ToolTip="Delete (Hold 6)" />
+                </BoxContainer>
+            </PanelContainer>
+        </LayoutContainer>
+    </controls:RecordedSplitContainer>
+</mapping:MappingScreen>
diff --git a/Content.Client/Mapping/MappingScreen.xaml.cs b/Content.Client/Mapping/MappingScreen.xaml.cs
new file mode 100644
index 00000000000..b2ad2fd83fb
--- /dev/null
+++ b/Content.Client/Mapping/MappingScreen.xaml.cs
@@ -0,0 +1,197 @@
+using System.Linq;
+using System.Numerics;
+using Content.Client.Decals;
+using Content.Client.Decals.UI;
+using Content.Client.UserInterface.Screens;
+using Content.Client.UserInterface.Systems.Chat.Widgets;
+using Content.Shared.Decals;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using static Robust.Client.UserInterface.Controls.BaseButton;
+
+namespace Content.Client.Mapping;
+
+[GenerateTypedNameReferences]
+public sealed partial class MappingScreen : InGameScreen
+{
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    public DecalPlacementSystem DecalSystem = default!;
+
+    private PaletteColorPicker? _picker;
+
+    private ProtoId<DecalPrototype>? _id;
+    private Color _decalColor = Color.White;
+    private float _decalRotation;
+    private bool _decalSnap;
+    private int _decalZIndex;
+    private bool _decalCleanable;
+
+    private bool _decalAuto;
+
+    public override ChatBox ChatBox => GetWidget<ChatBox>()!;
+
+    public event Func<MappingSpawnButton, bool>? IsDecalVisible;
+
+    public MappingScreen()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        AutoscaleMaxResolution = new Vector2i(1080, 770);
+
+        SetAnchorPreset(ScreenContainer, LayoutPreset.Wide);
+        SetAnchorPreset(ViewportContainer, LayoutPreset.Wide);
+        SetAnchorPreset(SpawnContainer, LayoutPreset.Wide);
+        SetAnchorPreset(MainViewport, LayoutPreset.Wide);
+        SetAnchorAndMarginPreset(Hotbar, LayoutPreset.BottomWide, margin: 5);
+        SetAnchorAndMarginPreset(Actions, LayoutPreset.TopWide, margin: 5);
+
+        ScreenContainer.OnSplitResizeFinished += () =>
+            OnChatResized?.Invoke(new Vector2(ScreenContainer.SplitFraction, 0));
+
+        var rotationSpinBox = new FloatSpinBox(90.0f, 0)
+        {
+            HorizontalExpand = true
+        };
+        DecalSpinBoxContainer.AddChild(rotationSpinBox);
+
+        DecalColorPicker.OnColorChanged += OnDecalColorPicked;
+        DecalPickerOpen.OnPressed += OnDecalPickerOpenPressed;
+        rotationSpinBox.OnValueChanged += args =>
+        {
+            _decalRotation = args.Value;
+            UpdateDecal();
+        };
+        DecalEnableAuto.OnToggled += args =>
+        {
+            _decalAuto = args.Pressed;
+            if (_id is { } id)
+                SelectDecal(id);
+        };
+        DecalEnableSnap.OnToggled += args =>
+        {
+            _decalSnap = args.Pressed;
+            UpdateDecal();
+        };
+        DecalEnableCleanable.OnToggled += args =>
+        {
+            _decalCleanable = args.Pressed;
+            UpdateDecal();
+        };
+        DecalZIndexSpinBox.ValueChanged += args =>
+        {
+            _decalZIndex = args.Value;
+            UpdateDecal();
+        };
+
+        for (var i = 0; i < EntitySpawnWindow.InitOpts.Length; i++)
+        {
+            EntityPlacementMode.AddItem(EntitySpawnWindow.InitOpts[i], i);
+        }
+
+        Pick.Texture.TexturePath = "/Textures/Interface/eyedropper.svg.png";
+        Delete.Texture.TexturePath = "/Textures/Interface/eraser.svg.png";
+    }
+
+    private void OnDecalColorPicked(Color color)
+    {
+        _decalColor = color;
+        DecalColorPicker.Color = color;
+        UpdateDecal();
+    }
+
+    private void OnDecalPickerOpenPressed(ButtonEventArgs obj)
+    {
+        if (_picker == null)
+        {
+            _picker = new PaletteColorPicker();
+            _picker.OpenToLeft();
+            _picker.PaletteList.OnItemSelected += args =>
+            {
+                var color = ((Color?) args.ItemList.GetSelected().First().Metadata)!.Value;
+                OnDecalColorPicked(color);
+            };
+
+            return;
+        }
+
+        if (_picker.IsOpen)
+            _picker.Close();
+        else
+            _picker.Open();
+    }
+
+    private void UpdateDecal()
+    {
+        if (_id is not { } id)
+            return;
+
+        DecalSystem.UpdateDecalInfo(id, _decalColor, _decalRotation, _decalSnap, _decalZIndex, _decalCleanable);
+    }
+
+    public void SelectDecal(string decalId)
+    {
+        if (!_prototype.TryIndex<DecalPrototype>(decalId, out var decal))
+            return;
+
+        _id = decalId;
+
+        if (_decalAuto)
+        {
+            _decalColor = Color.White;
+            _decalCleanable = decal.DefaultCleanable;
+            _decalSnap = decal.DefaultSnap;
+
+            DecalColorPicker.Color = _decalColor;
+            DecalEnableCleanable.Pressed = _decalCleanable;
+            DecalEnableSnap.Pressed = _decalSnap;
+        }
+
+        UpdateDecal();
+        RefreshList();
+    }
+
+    private void RefreshList()
+    {
+        foreach (var control in Prototypes.Children)
+        {
+            if (control is not MappingSpawnButton button ||
+                button.Prototype?.Prototype is not DecalPrototype)
+            {
+                continue;
+            }
+
+            foreach (var child in button.Children)
+            {
+                if (child is not MappingSpawnButton { Prototype.Prototype: DecalPrototype } childButton)
+                {
+                    continue;
+                }
+
+                childButton.Texture.Modulate = _decalColor;
+                childButton.Visible = IsDecalVisible?.Invoke(childButton) ?? true;
+            }
+        }
+    }
+
+    public override void SetChatSize(Vector2 size)
+    {
+        ScreenContainer.DesiredSplitCenter = size.X;
+        ScreenContainer.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize;
+    }
+
+    public void UnPressActionsExcept(Control except)
+    {
+        Add.Pressed = Add == except;
+        Fill.Pressed = Fill == except;
+        Grab.Pressed = Grab == except;
+        Move.Pressed = Move == except;
+        Pick.Pressed = Pick == except;
+        Delete.Pressed = Delete == except;
+    }
+}
diff --git a/Content.Client/Mapping/MappingSpawnButton.xaml b/Content.Client/Mapping/MappingSpawnButton.xaml
new file mode 100644
index 00000000000..a944d5ec2fd
--- /dev/null
+++ b/Content.Client/Mapping/MappingSpawnButton.xaml
@@ -0,0 +1,26 @@
+<mapping:MappingSpawnButton
+    xmlns="https://spacestation14.io"
+    xmlns:mapping="clr-namespace:Content.Client.Mapping">
+    <BoxContainer Orientation="Vertical">
+        <Control>
+            <Button Name="Button" Access="Public" ToggleMode="True" StyleClasses="ButtonSquare" />
+            <BoxContainer Orientation="Horizontal">
+                <LayeredTextureRect Name="Texture" Access="Public" MinSize="48 48"
+                                    HorizontalAlignment="Center" VerticalAlignment="Center"
+                                    Stretch="KeepAspectCentered" CanShrink="True" />
+                <Control SetSize="48 48" Access="Public" Name="CollapseButtonWrapper">
+                    <Button Name="CollapseButton" Access="Public" Text="▶"
+                            ToggleMode="True" StyleClasses="ButtonSquare" SetSize="48 48" />
+                </Control>
+                <Label Name="Label" Access="Public"
+                       VAlign="Center"
+                       VerticalExpand="True"
+                       MinHeight="48"
+                       Margin="5 0"
+                       HorizontalExpand="True" ClipText="True" />
+            </BoxContainer>
+        </Control>
+        <BoxContainer Name="ChildrenPrototypes" Access="Public" Orientation="Vertical"
+                      Margin="24 0 0 0" />
+    </BoxContainer>
+</mapping:MappingSpawnButton>
diff --git a/Content.Client/Mapping/MappingSpawnButton.xaml.cs b/Content.Client/Mapping/MappingSpawnButton.xaml.cs
new file mode 100644
index 00000000000..29fb884ed65
--- /dev/null
+++ b/Content.Client/Mapping/MappingSpawnButton.xaml.cs
@@ -0,0 +1,16 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Mapping;
+
+[GenerateTypedNameReferences]
+public sealed partial class MappingSpawnButton : Control
+{
+    public MappingPrototype? Prototype;
+
+    public MappingSpawnButton()
+    {
+        RobustXamlLoader.Load(this);
+    }
+}
diff --git a/Content.Client/Mapping/MappingState.cs b/Content.Client/Mapping/MappingState.cs
new file mode 100644
index 00000000000..bcc739fe4fc
--- /dev/null
+++ b/Content.Client/Mapping/MappingState.cs
@@ -0,0 +1,936 @@
+using System.Linq;
+using System.Numerics;
+using Content.Client.Administration.Managers;
+using Content.Client.ContextMenu.UI;
+using Content.Client.Decals;
+using Content.Client.Gameplay;
+using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.Systems.Gameplay;
+using Content.Client.Verbs;
+using Content.Shared.Administration;
+using Content.Shared.Decals;
+using Content.Shared.Input;
+using Content.Shared.Maps;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.Placement;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Enums;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Map;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.Markdown.Sequence;
+using Robust.Shared.Serialization.Markdown.Value;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+using static System.StringComparison;
+using static Robust.Client.UserInterface.Controls.BaseButton;
+using static Robust.Client.UserInterface.Controls.LineEdit;
+using static Robust.Client.UserInterface.Controls.OptionButton;
+using static Robust.Shared.Input.Binding.PointerInputCmdHandler;
+
+namespace Content.Client.Mapping;
+
+public sealed class MappingState : GameplayStateBase
+{
+    [Dependency] private readonly IClientAdminManager _admin = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IEntityNetworkManager _entityNetwork = default!;
+    [Dependency] private readonly IInputManager _input = default!;
+    [Dependency] private readonly ILogManager _log = default!;
+    [Dependency] private readonly IMapManager _mapMan = default!;
+    [Dependency] private readonly MappingManager _mapping = default!;
+    [Dependency] private readonly IOverlayManager _overlays = default!;
+    [Dependency] private readonly IPlacementManager _placement = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IResourceCache _resources = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    private EntityMenuUIController _entityMenuController = default!;
+
+    private DecalPlacementSystem _decal = default!;
+    private SpriteSystem _sprite = default!;
+    private TransformSystem _transform = default!;
+    private VerbSystem _verbs = default!;
+
+    private readonly ISawmill _sawmill;
+    private readonly GameplayStateLoadController _loadController;
+    private bool _setup;
+    private readonly List<MappingPrototype> _allPrototypes = new();
+    private readonly Dictionary<IPrototype, MappingPrototype> _allPrototypesDict = new();
+    private readonly Dictionary<Type, Dictionary<string, MappingPrototype>> _idDict = new();
+    private readonly List<MappingPrototype> _prototypes = new();
+    private (TimeSpan At, MappingSpawnButton Button)? _lastClicked;
+    private Control? _scrollTo;
+    private bool _updatePlacement;
+    private bool _updateEraseDecal;
+
+    private MappingScreen Screen => (MappingScreen) UserInterfaceManager.ActiveScreen!;
+    private MainViewport Viewport => UserInterfaceManager.ActiveScreen!.GetWidget<MainViewport>()!;
+
+    public CursorState State { get; set; }
+
+    public MappingState()
+    {
+        IoCManager.InjectDependencies(this);
+
+        _sawmill = _log.GetSawmill("mapping");
+        _loadController = UserInterfaceManager.GetUIController<GameplayStateLoadController>();
+    }
+
+    protected override void Startup()
+    {
+        EnsureSetup();
+        base.Startup();
+
+        UserInterfaceManager.LoadScreen<MappingScreen>();
+        _loadController.LoadScreen();
+
+        var context = _input.Contexts.GetContext("common");
+        context.AddFunction(ContentKeyFunctions.MappingUnselect);
+        context.AddFunction(ContentKeyFunctions.SaveMap);
+        context.AddFunction(ContentKeyFunctions.MappingEnablePick);
+        context.AddFunction(ContentKeyFunctions.MappingEnableDelete);
+        context.AddFunction(ContentKeyFunctions.MappingPick);
+        context.AddFunction(ContentKeyFunctions.MappingRemoveDecal);
+        context.AddFunction(ContentKeyFunctions.MappingCancelEraseDecal);
+        context.AddFunction(ContentKeyFunctions.MappingOpenContextMenu);
+
+        Screen.DecalSystem = _decal;
+        Screen.Prototypes.SearchBar.OnTextChanged += OnSearch;
+        Screen.Prototypes.CollapseAllButton.OnPressed += OnCollapseAll;
+        Screen.Prototypes.ClearSearchButton.OnPressed += OnClearSearch;
+        Screen.Prototypes.GetPrototypeData += OnGetData;
+        Screen.Prototypes.SelectionChanged += OnSelected;
+        Screen.Prototypes.CollapseToggled += OnCollapseToggled;
+        Screen.Pick.OnPressed += OnPickPressed;
+        Screen.Delete.OnPressed += OnDeletePressed;
+        Screen.EntityReplaceButton.OnToggled += OnEntityReplacePressed;
+        Screen.EntityPlacementMode.OnItemSelected += OnEntityPlacementSelected;
+        Screen.EraseEntityButton.OnToggled += OnEraseEntityPressed;
+        Screen.EraseDecalButton.OnToggled += OnEraseDecalPressed;
+        _placement.PlacementChanged += OnPlacementChanged;
+
+        CommandBinds.Builder
+            .Bind(ContentKeyFunctions.MappingUnselect, new PointerInputCmdHandler(HandleMappingUnselect, outsidePrediction: true))
+            .Bind(ContentKeyFunctions.SaveMap, new PointerInputCmdHandler(HandleSaveMap, outsidePrediction: true))
+            .Bind(ContentKeyFunctions.MappingEnablePick, new PointerStateInputCmdHandler(HandleEnablePick, HandleDisablePick, outsidePrediction: true))
+            .Bind(ContentKeyFunctions.MappingEnableDelete, new PointerStateInputCmdHandler(HandleEnableDelete, HandleDisableDelete, outsidePrediction: true))
+            .Bind(ContentKeyFunctions.MappingPick, new PointerInputCmdHandler(HandlePick, outsidePrediction: true))
+            .Bind(ContentKeyFunctions.MappingRemoveDecal, new PointerInputCmdHandler(HandleEditorCancelPlace, outsidePrediction: true))
+            .Bind(ContentKeyFunctions.MappingCancelEraseDecal, new PointerInputCmdHandler(HandleCancelEraseDecal, outsidePrediction: true))
+            .Bind(ContentKeyFunctions.MappingOpenContextMenu, new PointerInputCmdHandler(HandleOpenContextMenu, outsidePrediction: true))
+            .Register<MappingState>();
+
+        _overlays.AddOverlay(new MappingOverlay(this));
+
+        _prototypeManager.PrototypesReloaded += OnPrototypesReloaded;
+
+        Screen.Prototypes.UpdateVisible(_prototypes);
+    }
+
+    private void OnPrototypesReloaded(PrototypesReloadedEventArgs obj)
+    {
+        if (!obj.WasModified<EntityPrototype>() &&
+            !obj.WasModified<ContentTileDefinition>() &&
+            !obj.WasModified<DecalPrototype>())
+        {
+            return;
+        }
+
+        ReloadPrototypes();
+    }
+
+    private bool HandleOpenContextMenu(in PointerInputCmdArgs args)
+    {
+        Deselect();
+
+        var coords = args.Coordinates.ToMap(_entityManager, _transform);
+        if (_verbs.TryGetEntityMenuEntities(coords, out var entities))
+            _entityMenuController.OpenRootMenu(entities);
+
+        return true;
+    }
+
+    protected override void Shutdown()
+    {
+        CommandBinds.Unregister<MappingState>();
+
+        Screen.Prototypes.SearchBar.OnTextChanged -= OnSearch;
+        Screen.Prototypes.CollapseAllButton.OnPressed -= OnCollapseAll;
+        Screen.Prototypes.ClearSearchButton.OnPressed -= OnClearSearch;
+        Screen.Prototypes.GetPrototypeData -= OnGetData;
+        Screen.Prototypes.SelectionChanged -= OnSelected;
+        Screen.Prototypes.CollapseToggled -= OnCollapseToggled;
+        Screen.Pick.OnPressed -= OnPickPressed;
+        Screen.Delete.OnPressed -= OnDeletePressed;
+        Screen.EntityReplaceButton.OnToggled -= OnEntityReplacePressed;
+        Screen.EntityPlacementMode.OnItemSelected -= OnEntityPlacementSelected;
+        Screen.EraseEntityButton.OnToggled -= OnEraseEntityPressed;
+        Screen.EraseDecalButton.OnToggled -= OnEraseDecalPressed;
+        _placement.PlacementChanged -= OnPlacementChanged;
+        _prototypeManager.PrototypesReloaded -= OnPrototypesReloaded;
+
+        UserInterfaceManager.ClearWindows();
+        _loadController.UnloadScreen();
+        UserInterfaceManager.UnloadScreen();
+
+        var context = _input.Contexts.GetContext("common");
+        context.RemoveFunction(ContentKeyFunctions.MappingUnselect);
+        context.RemoveFunction(ContentKeyFunctions.SaveMap);
+        context.RemoveFunction(ContentKeyFunctions.MappingEnablePick);
+        context.RemoveFunction(ContentKeyFunctions.MappingEnableDelete);
+        context.RemoveFunction(ContentKeyFunctions.MappingPick);
+        context.RemoveFunction(ContentKeyFunctions.MappingRemoveDecal);
+        context.RemoveFunction(ContentKeyFunctions.MappingCancelEraseDecal);
+        context.RemoveFunction(ContentKeyFunctions.MappingOpenContextMenu);
+
+        _overlays.RemoveOverlay<MappingOverlay>();
+
+        base.Shutdown();
+    }
+
+    private void EnsureSetup()
+    {
+        if (_setup)
+            return;
+
+        _setup = true;
+
+        _entityMenuController = UserInterfaceManager.GetUIController<EntityMenuUIController>();
+
+        _decal = _entityManager.System<DecalPlacementSystem>();
+        _sprite = _entityManager.System<SpriteSystem>();
+        _transform = _entityManager.System<TransformSystem>();
+        _verbs = _entityManager.System<VerbSystem>();
+        ReloadPrototypes();
+    }
+
+    private void ReloadPrototypes()
+    {
+        var entities = new MappingPrototype(null, Loc.GetString("mapping-entities")) { Children = new List<MappingPrototype>() };
+        _prototypes.Add(entities);
+
+        var mappings = new Dictionary<string, MappingPrototype>();
+        foreach (var entity in _prototypeManager.EnumeratePrototypes<EntityPrototype>())
+        {
+            Register(entity, entity.ID, entities);
+        }
+
+        Sort(mappings, entities);
+        mappings.Clear();
+
+        var tiles = new MappingPrototype(null, Loc.GetString("mapping-tiles")) { Children = new List<MappingPrototype>() };
+        _prototypes.Add(tiles);
+
+        foreach (var tile in _prototypeManager.EnumeratePrototypes<ContentTileDefinition>())
+        {
+            Register(tile, tile.ID, tiles);
+        }
+
+        Sort(mappings, tiles);
+        mappings.Clear();
+
+        var decals = new MappingPrototype(null, Loc.GetString("mapping-decals")) { Children = new List<MappingPrototype>() };
+        _prototypes.Add(decals);
+
+        foreach (var decal in _prototypeManager.EnumeratePrototypes<DecalPrototype>())
+        {
+            Register(decal, decal.ID, decals);
+        }
+
+        Sort(mappings, decals);
+        mappings.Clear();
+    }
+
+    private void Sort(Dictionary<string, MappingPrototype> prototypes, MappingPrototype topLevel)
+    {
+        static int Compare(MappingPrototype a, MappingPrototype b)
+        {
+            return string.Compare(a.Name, b.Name, OrdinalIgnoreCase);
+        }
+
+        topLevel.Children ??= new List<MappingPrototype>();
+
+        foreach (var prototype in prototypes.Values)
+        {
+            if (prototype.Parents == null && prototype != topLevel)
+            {
+                prototype.Parents = new List<MappingPrototype> { topLevel };
+                topLevel.Children.Add(prototype);
+            }
+
+            prototype.Parents?.Sort(Compare);
+            prototype.Children?.Sort(Compare);
+        }
+
+        topLevel.Children.Sort(Compare);
+    }
+
+    private MappingPrototype? Register<T>(T? prototype, string id, MappingPrototype topLevel) where T : class, IPrototype, IInheritingPrototype
+    {
+        {
+            if (prototype == null &&
+                _prototypeManager.TryIndex(id, out prototype) &&
+                prototype is EntityPrototype entity)
+            {
+                if (entity.HideSpawnMenu || entity.Abstract)
+                    prototype = null;
+            }
+        }
+
+        if (prototype == null)
+        {
+            if (!_prototypeManager.TryGetMapping(typeof(T), id, out var node))
+            {
+                _sawmill.Error($"No {nameof(T)} found with id {id}");
+                return null;
+            }
+
+            var ids = _idDict.GetOrNew(typeof(T));
+            if (ids.TryGetValue(id, out var mapping))
+            {
+                return mapping;
+            }
+            else
+            {
+                var name = node.TryGet("name", out ValueDataNode? nameNode)
+                    ? nameNode.Value
+                    : id;
+
+                if (node.TryGet("suffix", out ValueDataNode? suffix))
+                    name = $"{name} [{suffix.Value}]";
+
+                mapping = new MappingPrototype(prototype, name);
+                _allPrototypes.Add(mapping);
+                ids.Add(id, mapping);
+
+                if (node.TryGet("parent", out ValueDataNode? parentValue))
+                {
+                    var parent = Register<T>(null, parentValue.Value, topLevel);
+
+                    if (parent != null)
+                    {
+                        mapping.Parents ??= new List<MappingPrototype>();
+                        mapping.Parents.Add(parent);
+                        parent.Children ??= new List<MappingPrototype>();
+                        parent.Children.Add(mapping);
+                    }
+                }
+                else if (node.TryGet("parent", out SequenceDataNode? parentSequence))
+                {
+                    foreach (var parentNode in parentSequence.Cast<ValueDataNode>())
+                    {
+                        var parent = Register<T>(null, parentNode.Value, topLevel);
+
+                        if (parent != null)
+                        {
+                            mapping.Parents ??= new List<MappingPrototype>();
+                            mapping.Parents.Add(parent);
+                            parent.Children ??= new List<MappingPrototype>();
+                            parent.Children.Add(mapping);
+                        }
+                    }
+                }
+                else
+                {
+                    topLevel.Children ??= new List<MappingPrototype>();
+                    topLevel.Children.Add(mapping);
+                    mapping.Parents ??= new List<MappingPrototype>();
+                    mapping.Parents.Add(topLevel);
+                }
+
+                return mapping;
+            }
+        }
+        else
+        {
+            var ids = _idDict.GetOrNew(typeof(T));
+            if (ids.TryGetValue(id, out var mapping))
+            {
+                return mapping;
+            }
+            else
+            {
+                var entity = prototype as EntityPrototype;
+                var name = entity?.Name ?? prototype.ID;
+
+                if (!string.IsNullOrWhiteSpace(entity?.EditorSuffix))
+                    name = $"{name} [{entity.EditorSuffix}]";
+
+                mapping = new MappingPrototype(prototype, name);
+                _allPrototypes.Add(mapping);
+                _allPrototypesDict.Add(prototype, mapping);
+                ids.Add(prototype.ID, mapping);
+            }
+
+            if (prototype.Parents == null)
+            {
+                topLevel.Children ??= new List<MappingPrototype>();
+                topLevel.Children.Add(mapping);
+                mapping.Parents ??= new List<MappingPrototype>();
+                mapping.Parents.Add(topLevel);
+                return mapping;
+            }
+
+            foreach (var parentId in prototype.Parents)
+            {
+                var parent = Register<T>(null, parentId, topLevel);
+
+                if (parent != null)
+                {
+                    mapping.Parents ??= new List<MappingPrototype>();
+                    mapping.Parents.Add(parent);
+                    parent.Children ??= new List<MappingPrototype>();
+                    parent.Children.Add(mapping);
+                }
+            }
+
+            return mapping;
+        }
+    }
+
+    private void OnPlacementChanged(object? sender, EventArgs e)
+    {
+        _updatePlacement = true;
+    }
+
+    protected override void OnKeyBindStateChanged(ViewportBoundKeyEventArgs args)
+    {
+        if (args.Viewport == null)
+            base.OnKeyBindStateChanged(new ViewportBoundKeyEventArgs(args.KeyEventArgs, Viewport.Viewport));
+        else
+            base.OnKeyBindStateChanged(args);
+    }
+
+    private void OnSearch(LineEditEventArgs args)
+    {
+        if (string.IsNullOrEmpty(args.Text))
+        {
+            Screen.Prototypes.PrototypeList.Visible = true;
+            Screen.Prototypes.SearchList.Visible = false;
+            return;
+        }
+
+        var matches = new List<MappingPrototype>();
+        foreach (var prototype in _allPrototypes)
+        {
+            if (prototype.Name.Contains(args.Text, OrdinalIgnoreCase))
+                matches.Add(prototype);
+        }
+
+        matches.Sort(static (a, b) => string.Compare(a.Name, b.Name, OrdinalIgnoreCase));
+
+        Screen.Prototypes.PrototypeList.Visible = false;
+        Screen.Prototypes.SearchList.Visible = true;
+        Screen.Prototypes.Search(matches);
+    }
+
+    private void OnCollapseAll(ButtonEventArgs args)
+    {
+        foreach (var child in Screen.Prototypes.PrototypeList.Children)
+        {
+            if (child is not MappingSpawnButton button)
+                continue;
+
+            Collapse(button);
+        }
+
+        Screen.Prototypes.ScrollContainer.SetScrollValue(new Vector2(0, 0));
+    }
+
+    private void OnClearSearch(ButtonEventArgs obj)
+    {
+        Screen.Prototypes.SearchBar.Text = string.Empty;
+        OnSearch(new LineEditEventArgs(Screen.Prototypes.SearchBar, string.Empty));
+    }
+
+    private void OnGetData(IPrototype prototype, List<Texture> textures)
+    {
+        switch (prototype)
+        {
+            case EntityPrototype entity:
+                textures.AddRange(SpriteComponent.GetPrototypeTextures(entity, _resources).Select(t => t.Default));
+                break;
+            case DecalPrototype decal:
+                textures.Add(_sprite.Frame0(decal.Sprite));
+                break;
+            case ContentTileDefinition tile:
+                if (tile.Sprite?.ToString() is { } sprite)
+                    textures.Add(_resources.GetResource<TextureResource>(sprite).Texture);
+                break;
+        }
+    }
+
+    private void OnSelected(MappingPrototype mapping)
+    {
+        if (mapping.Prototype == null)
+            return;
+
+        var chain = new Stack<MappingPrototype>();
+        chain.Push(mapping);
+
+        var parent = mapping.Parents?.FirstOrDefault();
+        while (parent != null)
+        {
+            chain.Push(parent);
+            parent = parent.Parents?.FirstOrDefault();
+        }
+
+        _lastClicked = null;
+
+        Control? last = null;
+        var children = Screen.Prototypes.PrototypeList.Children;
+        foreach (var prototype in chain)
+        {
+            foreach (var child in children)
+            {
+                if (child is MappingSpawnButton button &&
+                    button.Prototype == prototype)
+                {
+                    UnCollapse(button);
+                    OnSelected(button, prototype.Prototype);
+                    children = button.ChildrenPrototypes.Children;
+                    last = child;
+                    break;
+                }
+            }
+        }
+
+        if (last != null && Screen.Prototypes.PrototypeList.Visible)
+            _scrollTo = last;
+    }
+
+    private void OnSelected(MappingSpawnButton button, IPrototype? prototype)
+    {
+        var time = _timing.CurTime;
+        if (prototype is DecalPrototype)
+            Screen.SelectDecal(prototype.ID);
+
+        // Double-click functionality if it's collapsible.
+        if (_lastClicked is { } lastClicked &&
+            lastClicked.Button == button &&
+            lastClicked.At > time - TimeSpan.FromSeconds(0.333) &&
+            string.IsNullOrEmpty(Screen.Prototypes.SearchBar.Text) &&
+            button.CollapseButton.Visible)
+        {
+            button.CollapseButton.Pressed = !button.CollapseButton.Pressed;
+            ToggleCollapse(button);
+            button.Button.Pressed = true;
+            Screen.Prototypes.Selected = button;
+            _lastClicked = null;
+            return;
+        }
+
+        // Toggle if it's the same button (at least if we just unclicked it).
+        if (!button.Button.Pressed && button.Prototype?.Prototype != null && _lastClicked?.Button == button)
+        {
+            _lastClicked = null;
+            Deselect();
+            return;
+        }
+
+        _lastClicked = (time, button);
+
+        if (button.Prototype == null)
+            return;
+
+        if (Screen.Prototypes.Selected is { } oldButton &&
+            oldButton != button)
+        {
+            Deselect();
+        }
+
+        Screen.EntityContainer.Visible = false;
+        Screen.DecalContainer.Visible = false;
+
+        switch (prototype)
+        {
+            case EntityPrototype entity:
+            {
+                var placementId = Screen.EntityPlacementMode.SelectedId;
+
+                var placement = new PlacementInformation
+                {
+                    PlacementOption = placementId > 0 ? EntitySpawnWindow.InitOpts[placementId] : entity.PlacementMode,
+                    EntityType = entity.ID,
+                    IsTile = false
+                };
+
+                Screen.EntityContainer.Visible = true;
+                _decal.SetActive(false);
+                _placement.BeginPlacing(placement);
+                break;
+            }
+            case DecalPrototype decal:
+                _placement.Clear();
+
+                _decal.SetActive(true);
+                _decal.UpdateDecalInfo(decal.ID, Color.White, 0, true, 0, false);
+                Screen.DecalContainer.Visible = true;
+                break;
+            case ContentTileDefinition tile:
+            {
+                var placement = new PlacementInformation
+                {
+                    PlacementOption = "AlignTileAny",
+                    TileType = tile.TileId,
+                    IsTile = true
+                };
+
+                _decal.SetActive(false);
+                _placement.BeginPlacing(placement);
+                break;
+            }
+            default:
+                _placement.Clear();
+                break;
+        }
+
+        Screen.Prototypes.Selected = button;
+
+        button.Button.Pressed = true;
+    }
+
+    private void Deselect()
+    {
+        if (Screen.Prototypes.Selected is { } selected)
+        {
+            selected.Button.Pressed = false;
+            Screen.Prototypes.Selected = null;
+
+            if (selected.Prototype?.Prototype is DecalPrototype)
+            {
+                _decal.SetActive(false);
+                Screen.DecalContainer.Visible = false;
+            }
+
+            if (selected.Prototype?.Prototype is EntityPrototype)
+            {
+                _placement.Clear();
+            }
+
+            if (selected.Prototype?.Prototype is ContentTileDefinition)
+            {
+                _placement.Clear();
+            }
+        }
+    }
+
+    private void OnCollapseToggled(MappingSpawnButton button, ButtonToggledEventArgs args)
+    {
+        ToggleCollapse(button);
+    }
+
+    private void OnPickPressed(ButtonEventArgs args)
+    {
+        if (args.Button.Pressed)
+            EnablePick();
+        else
+            DisablePick();
+    }
+
+    private void OnDeletePressed(ButtonEventArgs obj)
+    {
+        if (obj.Button.Pressed)
+            EnableDelete();
+        else
+            DisableDelete();
+    }
+
+    private void OnEntityReplacePressed(ButtonToggledEventArgs args)
+    {
+        _placement.Replacement = args.Pressed;
+    }
+
+    private void OnEntityPlacementSelected(ItemSelectedEventArgs args)
+    {
+        Screen.EntityPlacementMode.SelectId(args.Id);
+
+        if (_placement.CurrentMode != null)
+        {
+            var placement = new PlacementInformation
+            {
+                PlacementOption = EntitySpawnWindow.InitOpts[args.Id],
+                EntityType = _placement.CurrentPermission!.EntityType,
+                TileType = _placement.CurrentPermission.TileType,
+                Range = 2,
+                IsTile = _placement.CurrentPermission.IsTile,
+            };
+
+            _placement.BeginPlacing(placement);
+        }
+    }
+
+    private void OnEraseEntityPressed(ButtonEventArgs args)
+    {
+        if (args.Button.Pressed == _placement.Eraser)
+            return;
+
+        if (args.Button.Pressed)
+            EnableEraser();
+        else
+            DisableEraser();
+    }
+
+    private void OnEraseDecalPressed(ButtonToggledEventArgs args)
+    {
+        _placement.Clear();
+        Deselect();
+        Screen.EraseEntityButton.Pressed = false;
+        _updatePlacement = true;
+        _updateEraseDecal = args.Pressed;
+    }
+
+    private void EnableEraser()
+    {
+        if (_placement.Eraser)
+            return;
+
+        _placement.Clear();
+        _placement.ToggleEraser();
+        Screen.EntityPlacementMode.Disabled = true;
+        Screen.EraseDecalButton.Pressed = false;
+        Deselect();
+    }
+
+    private void DisableEraser()
+    {
+        if (!_placement.Eraser)
+            return;
+
+        _placement.ToggleEraser();
+        Screen.EntityPlacementMode.Disabled = false;
+    }
+
+    private void EnablePick()
+    {
+        Screen.UnPressActionsExcept(Screen.Pick);
+        State = CursorState.Pick;
+    }
+
+    private void DisablePick()
+    {
+        Screen.Pick.Pressed = false;
+        State = CursorState.None;
+    }
+
+    private void EnableDelete()
+    {
+        Screen.UnPressActionsExcept(Screen.Delete);
+        State = CursorState.Delete;
+        EnableEraser();
+    }
+
+    private void DisableDelete()
+    {
+        Screen.Delete.Pressed = false;
+        State = CursorState.None;
+        DisableEraser();
+    }
+
+    private bool HandleMappingUnselect(in PointerInputCmdArgs args)
+    {
+        if (Screen.Prototypes.Selected is not { Prototype.Prototype: DecalPrototype })
+            return false;
+
+        Deselect();
+        return true;
+    }
+
+    private bool HandleSaveMap(in PointerInputCmdArgs args)
+    {
+#if FULL_RELEASE
+        return false;
+#endif
+        if (!_admin.IsAdmin(true) || !_admin.HasFlag(AdminFlags.Host))
+            return false;
+
+        SaveMap();
+        return true;
+    }
+
+    private bool HandleEnablePick(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
+    {
+        EnablePick();
+        return true;
+    }
+
+    private bool HandleDisablePick(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
+    {
+        DisablePick();
+        return true;
+    }
+
+    private bool HandleEnableDelete(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
+    {
+        EnableDelete();
+        return true;
+    }
+
+    private bool HandleDisableDelete(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
+    {
+        DisableDelete();
+        return true;
+    }
+
+    private bool HandlePick(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
+    {
+        if (State != CursorState.Pick)
+            return false;
+
+        MappingPrototype? button = null;
+
+        // Try and get tile under it
+        // TODO: Separate mode for decals.
+        if (!uid.IsValid())
+        {
+            var mapPos = _transform.ToMapCoordinates(coords);
+
+            if (_mapMan.TryFindGridAt(mapPos, out var gridUid, out var grid) &&
+                _entityManager.System<SharedMapSystem>().TryGetTileRef(gridUid, grid, coords, out var tileRef) &&
+                _allPrototypesDict.TryGetValue(tileRef.GetContentTileDefinition(), out button))
+            {
+                OnSelected(button);
+                return true;
+            }
+        }
+
+        if (button == null)
+        {
+            if (uid == EntityUid.Invalid ||
+                _entityManager.GetComponentOrNull<MetaDataComponent>(uid) is not { EntityPrototype: { } prototype } ||
+                !_allPrototypesDict.TryGetValue(prototype, out button))
+            {
+                // we always block other input handlers if pick mode is enabled
+                // this makes you not accidentally place something in space because you
+                // miss-clicked while holding down the pick hotkey
+                return true;
+            }
+
+            // Selected an entity
+            OnSelected(button);
+
+            // Match rotation
+            _placement.Direction = _entityManager.GetComponent<TransformComponent>(uid).LocalRotation.GetDir();
+        }
+
+        return true;
+    }
+
+    private bool HandleEditorCancelPlace(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
+    {
+        if (!Screen.EraseDecalButton.Pressed)
+            return false;
+
+        _entityNetwork.SendSystemNetworkMessage(new RequestDecalRemovalEvent(_entityManager.GetNetCoordinates(coords)));
+        return true;
+    }
+
+    private bool HandleCancelEraseDecal(in PointerInputCmdArgs args)
+    {
+        if (!Screen.EraseDecalButton.Pressed)
+            return false;
+
+        Screen.EraseDecalButton.Pressed = false;
+        return true;
+    }
+
+    private async void SaveMap()
+    {
+        await _mapping.SaveMap();
+    }
+
+    private void ToggleCollapse(MappingSpawnButton button)
+    {
+        if (button.CollapseButton.Pressed)
+        {
+            if (button.Prototype?.Children != null)
+            {
+                foreach (var child in button.Prototype.Children)
+                {
+                    Screen.Prototypes.Insert(button.ChildrenPrototypes, child, true);
+                }
+            }
+
+            button.CollapseButton.Label.Text = "▼";
+        }
+        else
+        {
+            button.ChildrenPrototypes.DisposeAllChildren();
+            button.CollapseButton.Label.Text = "▶";
+        }
+    }
+
+    private void Collapse(MappingSpawnButton button)
+    {
+        if (!button.CollapseButton.Pressed)
+            return;
+
+        button.CollapseButton.Pressed = false;
+        ToggleCollapse(button);
+    }
+
+
+    private void UnCollapse(MappingSpawnButton button)
+    {
+        if (button.CollapseButton.Pressed)
+            return;
+
+        button.CollapseButton.Pressed = true;
+        ToggleCollapse(button);
+    }
+
+    public EntityUid? GetHoveredEntity()
+    {
+        if (UserInterfaceManager.CurrentlyHovered is not IViewportControl viewport ||
+            _input.MouseScreenPosition is not { IsValid: true } position)
+        {
+            return null;
+        }
+
+        var mapPos = viewport.PixelToMap(position.Position);
+        return GetClickedEntity(mapPos);
+    }
+
+    public override void FrameUpdate(FrameEventArgs e)
+    {
+        if (_updatePlacement)
+        {
+            _updatePlacement = false;
+
+            if (!_placement.IsActive && _decal.GetActiveDecal().Decal == null)
+                Deselect();
+
+            Screen.EraseEntityButton.Pressed = _placement.Eraser;
+            Screen.EraseDecalButton.Pressed = _updateEraseDecal;
+            Screen.EntityPlacementMode.Disabled = _placement.Eraser;
+        }
+
+        if (_scrollTo is not { } scrollTo)
+            return;
+
+        // this is not ideal but we wait until the control's height is computed to use
+        // its position to scroll to
+        if (scrollTo.Height > 0 && Screen.Prototypes.PrototypeList.Visible)
+        {
+            var y = scrollTo.GlobalPosition.Y - Screen.Prototypes.ScrollContainer.Height / 2 + scrollTo.Height;
+            var scroll = Screen.Prototypes.ScrollContainer;
+            scroll.SetScrollValue(scroll.GetScrollValue() + new Vector2(0, y));
+            _scrollTo = null;
+        }
+    }
+
+
+    // TODO this doesn't handle pressing down multiple state hotkeys at the moment
+    public enum CursorState
+    {
+        None,
+        Pick,
+        Delete
+    }
+}
diff --git a/Content.Client/Mapping/MappingSystem.cs b/Content.Client/Mapping/MappingSystem.cs
index 8daf193dfeb..80189fbdfc1 100644
--- a/Content.Client/Mapping/MappingSystem.cs
+++ b/Content.Client/Mapping/MappingSystem.cs
@@ -13,7 +13,6 @@ public sealed partial class MappingSystem : EntitySystem
 {
     [Dependency] private readonly IPlacementManager _placementMan = default!;
     [Dependency] private readonly ITileDefinitionManager _tileMan = default!;
-    [Dependency] private readonly ActionsSystem _actionsSystem = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
 
     /// <summary>
@@ -26,8 +25,6 @@ public sealed partial class MappingSystem : EntitySystem
     /// </summary>
     private readonly SpriteSpecifier _deleteIcon = new Texture(new ("Interface/VerbIcons/delete.svg.192dpi.png"));
 
-    public string DefaultMappingActions = "/mapping_actions.yml";
-
     public override void Initialize()
     {
         base.Initialize();
@@ -36,11 +33,6 @@ public override void Initialize()
         SubscribeLocalEvent<StartPlacementActionEvent>(OnStartPlacementAction);
     }
 
-    public void LoadMappingActions()
-    {
-        _actionsSystem.LoadActionAssignments(DefaultMappingActions, false);
-    }
-
     /// <summary>
     ///     This checks if the placement manager is currently active, and attempts to copy the placement information for
     ///     some entity or tile into an action. This is somewhat janky, but it seem to work well enough. Though I'd
diff --git a/Content.Client/Movement/Systems/JetpackSystem.cs b/Content.Client/Movement/Systems/JetpackSystem.cs
index e25300d44c5..2954140d792 100644
--- a/Content.Client/Movement/Systems/JetpackSystem.cs
+++ b/Content.Client/Movement/Systems/JetpackSystem.cs
@@ -64,15 +64,15 @@ public override void Update(float frameTime)
 
     private void CreateParticles(EntityUid uid)
     {
+        var uidXform = Transform(uid);
         // Don't show particles unless the user is moving.
-        if (Container.TryGetContainingContainer(uid, out var container) &&
+        if (Container.TryGetContainingContainer((uid, uidXform, null), out var container) &&
             TryComp<PhysicsComponent>(container.Owner, out var body) &&
             body.LinearVelocity.LengthSquared() < 1f)
         {
             return;
         }
 
-        var uidXform = Transform(uid);
         var coordinates = uidXform.Coordinates;
         var gridUid = _transform.GetGrid(coordinates);
 
diff --git a/Content.Client/Movement/Systems/SpriteMovementSystem.cs b/Content.Client/Movement/Systems/SpriteMovementSystem.cs
index 313683855d0..b6203536896 100644
--- a/Content.Client/Movement/Systems/SpriteMovementSystem.cs
+++ b/Content.Client/Movement/Systems/SpriteMovementSystem.cs
@@ -28,7 +28,7 @@ private void OnSpriteMoveInput(EntityUid uid, SpriteMovementComponent component,
             return;
 
         var oldMoving = (SharedMoverController.GetNormalizedMovement(args.OldMovement) & MoveButtons.AnyDirection) != MoveButtons.None;
-        var moving = (SharedMoverController.GetNormalizedMovement(args.Component.HeldMoveButtons) & MoveButtons.AnyDirection) != MoveButtons.None;
+        var moving = (SharedMoverController.GetNormalizedMovement(args.Entity.Comp.HeldMoveButtons) & MoveButtons.AnyDirection) != MoveButtons.None;
 
         if (oldMoving == moving || !_spriteQuery.TryGetComponent(uid, out var sprite))
             return;
diff --git a/Content.Client/Paper/PaperComponent.cs b/Content.Client/Paper/PaperComponent.cs
deleted file mode 100644
index 1dc827bf7e6..00000000000
--- a/Content.Client/Paper/PaperComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Content.Shared.Paper;
-
-namespace Content.Client.Paper;
-
-[RegisterComponent]
-public sealed partial class PaperComponent : SharedPaperComponent;
diff --git a/Content.Client/Paper/UI/PaperBoundUserInterface.cs b/Content.Client/Paper/UI/PaperBoundUserInterface.cs
index f3ad1e347e7..63645bc01e9 100644
--- a/Content.Client/Paper/UI/PaperBoundUserInterface.cs
+++ b/Content.Client/Paper/UI/PaperBoundUserInterface.cs
@@ -2,7 +2,7 @@
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Utility;
-using static Content.Shared.Paper.SharedPaperComponent;
+using static Content.Shared.Paper.PaperComponent;
 
 namespace Content.Client.Paper.UI;
 
diff --git a/Content.Client/Paper/UI/PaperSystem.cs b/Content.Client/Paper/UI/PaperVisualizerSystem.cs
similarity index 82%
rename from Content.Client/Paper/UI/PaperSystem.cs
rename to Content.Client/Paper/UI/PaperVisualizerSystem.cs
index f75d04a26bd..a0d05736adb 100644
--- a/Content.Client/Paper/UI/PaperSystem.cs
+++ b/Content.Client/Paper/UI/PaperVisualizerSystem.cs
@@ -1,10 +1,10 @@
 using Robust.Client.GameObjects;
 
-using static Content.Shared.Paper.SharedPaperComponent;
+using static Content.Shared.Paper.PaperComponent;
 
-namespace Content.Client.Paper;
+namespace Content.Client.Paper.UI;
 
-public sealed class PaperSystem : VisualizerSystem<PaperVisualsComponent>
+public sealed class PaperVisualizerSystem : VisualizerSystem<PaperVisualsComponent>
 {
     protected override void OnAppearanceChange(EntityUid uid, PaperVisualsComponent component, ref AppearanceChangeEvent args)
     {
diff --git a/Content.Client/Paper/UI/PaperVisualsComponent.cs b/Content.Client/Paper/UI/PaperVisualsComponent.cs
index 95040e77e65..f0dee3cf907 100644
--- a/Content.Client/Paper/UI/PaperVisualsComponent.cs
+++ b/Content.Client/Paper/UI/PaperVisualsComponent.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace Content.Client.Paper;
+namespace Content.Client.Paper.UI;
 
 [RegisterComponent]
 public sealed partial class PaperVisualsComponent : Component
diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs
index f7cace642ce..81b831068c3 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml.cs
+++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs
@@ -215,9 +215,9 @@ protected override void Draw(DrawingHandleScreen handle)
         ///     Initialize the paper contents, i.e. the text typed by the
         ///     user and any stamps that have peen put on the page.
         /// </summary>
-        public void Populate(SharedPaperComponent.PaperBoundUserInterfaceState state)
+        public void Populate(PaperComponent.PaperBoundUserInterfaceState state)
         {
-            bool isEditing = state.Mode == SharedPaperComponent.PaperAction.Write;
+            bool isEditing = state.Mode == PaperComponent.PaperAction.Write;
             bool wasEditing = InputContainer.Visible;
             InputContainer.Visible = isEditing;
             EditButtons.Visible = isEditing;
diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs
index 31042854d4a..74a5e7afdcd 100644
--- a/Content.Client/Physics/Controllers/MoverController.cs
+++ b/Content.Client/Physics/Controllers/MoverController.cs
@@ -28,57 +28,57 @@ public override void Initialize()
             SubscribeLocalEvent<PullableComponent, UpdateIsPredictedEvent>(OnUpdatePullablePredicted);
         }
 
-        private void OnUpdatePredicted(EntityUid uid, InputMoverComponent component, ref UpdateIsPredictedEvent args)
+        private void OnUpdatePredicted(Entity<InputMoverComponent> entity, ref UpdateIsPredictedEvent args)
         {
             // Enable prediction if an entity is controlled by the player
-            if (uid == _playerManager.LocalEntity)
+            if (entity.Owner == _playerManager.LocalEntity)
                 args.IsPredicted = true;
         }
 
-        private void OnUpdateRelayTargetPredicted(EntityUid uid, MovementRelayTargetComponent component, ref UpdateIsPredictedEvent args)
+        private void OnUpdateRelayTargetPredicted(Entity<MovementRelayTargetComponent> entity, ref UpdateIsPredictedEvent args)
         {
-            if (component.Source == _playerManager.LocalEntity)
+            if (entity.Comp.Source == _playerManager.LocalEntity)
                 args.IsPredicted = true;
         }
 
-        private void OnUpdatePullablePredicted(EntityUid uid, PullableComponent component, ref UpdateIsPredictedEvent args)
+        private void OnUpdatePullablePredicted(Entity<PullableComponent> entity, ref UpdateIsPredictedEvent args)
         {
             // Enable prediction if an entity is being pulled by the player.
             // Disable prediction if an entity is being pulled by some non-player entity.
 
-            if (component.Puller == _playerManager.LocalEntity)
+            if (entity.Comp.Puller == _playerManager.LocalEntity)
                 args.IsPredicted = true;
-            else if (component.Puller != null)
+            else if (entity.Comp.Puller != null)
                 args.BlockPrediction = true;
 
             // TODO recursive pulling checks?
             // What if the entity is being pulled by a vehicle controlled by the player?
         }
 
-        private void OnRelayPlayerAttached(EntityUid uid, RelayInputMoverComponent component, LocalPlayerAttachedEvent args)
+        private void OnRelayPlayerAttached(Entity<RelayInputMoverComponent> entity, ref LocalPlayerAttachedEvent args)
         {
-            Physics.UpdateIsPredicted(uid);
-            Physics.UpdateIsPredicted(component.RelayEntity);
-            if (MoverQuery.TryGetComponent(component.RelayEntity, out var inputMover))
-                SetMoveInput(inputMover, MoveButtons.None);
+            Physics.UpdateIsPredicted(entity.Owner);
+            Physics.UpdateIsPredicted(entity.Comp.RelayEntity);
+            if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
+                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
         }
 
-        private void OnRelayPlayerDetached(EntityUid uid, RelayInputMoverComponent component, LocalPlayerDetachedEvent args)
+        private void OnRelayPlayerDetached(Entity<RelayInputMoverComponent> entity, ref LocalPlayerDetachedEvent args)
         {
-            Physics.UpdateIsPredicted(uid);
-            Physics.UpdateIsPredicted(component.RelayEntity);
-            if (MoverQuery.TryGetComponent(component.RelayEntity, out var inputMover))
-                SetMoveInput(inputMover, MoveButtons.None);
+            Physics.UpdateIsPredicted(entity.Owner);
+            Physics.UpdateIsPredicted(entity.Comp.RelayEntity);
+            if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
+                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
         }
 
-        private void OnPlayerAttached(EntityUid uid, InputMoverComponent component, LocalPlayerAttachedEvent args)
+        private void OnPlayerAttached(Entity<InputMoverComponent> entity, ref LocalPlayerAttachedEvent args)
         {
-            SetMoveInput(component, MoveButtons.None);
+            SetMoveInput(entity, MoveButtons.None);
         }
 
-        private void OnPlayerDetached(EntityUid uid, InputMoverComponent component, LocalPlayerDetachedEvent args)
+        private void OnPlayerDetached(Entity<InputMoverComponent> entity, ref LocalPlayerDetachedEvent args)
         {
-            SetMoveInput(component, MoveButtons.None);
+            SetMoveInput(entity, MoveButtons.None);
         }
 
         public override void UpdateBeforeSolve(bool prediction, float frameTime)
diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
index 53570c6f81b..8c760c2e20a 100644
--- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
+++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Players;
 using Content.Shared.Players.JobWhitelist;
 using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Client;
 using Robust.Client.Player;
@@ -97,7 +98,7 @@ private void RxJobWhitelist(MsgJobWhitelist message)
         Updated?.Invoke();
     }
 
-    public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
+    public bool IsAllowed(JobPrototype job, HumanoidCharacterProfile? profile, [NotNullWhen(false)] out FormattedMessage? reason)
     {
         reason = null;
 
@@ -120,10 +121,8 @@ public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessag
         // Sunrise-Sponsors-End
 
         // Sunrise-Start
-        if (_clientPreferences.Preferences != null)
+        if (profile != null)
         {
-            var profile = (HumanoidCharacterProfile) _clientPreferences.Preferences.SelectedCharacter;
-
             if (job.SpeciesBlacklist.Contains(profile.Species))
             {
                 reason = FormattedMessage.FromUnformatted($"Расса {Loc.GetString($"species-name-{profile.Species.Id.ToLower()}")} не может занимать эту должность. Для спонсоров ограничений нет");
@@ -132,16 +131,16 @@ public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessag
         }
         // Sunrise-End
 
-        return CheckRoleTime(job, out reason);
+        return CheckRoleRequirements(job, profile, out reason);
     }
 
-    public bool CheckRoleTime(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
+    public bool CheckRoleRequirements(JobPrototype job, HumanoidCharacterProfile? profile, [NotNullWhen(false)] out FormattedMessage? reason)
     {
         var reqs = _entManager.System<SharedRoleSystem>().GetJobRequirement(job);
-        return CheckRoleTime(reqs, out reason);
+        return CheckRoleRequirements(reqs, profile, out reason);
     }
 
-    public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(false)] out FormattedMessage? reason)
+    public bool CheckRoleRequirements(HashSet<JobRequirement>? requirements, HumanoidCharacterProfile? profile, [NotNullWhen(false)] out FormattedMessage? reason)
     {
         reason = null;
 
@@ -151,7 +150,7 @@ public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(fa
         var reasons = new List<string>();
         foreach (var requirement in requirements)
         {
-            if (JobRequirements.TryRequirementMet(requirement, _roles, out var jobReason, _entManager, _prototypes))
+            if (requirement.Check(_entManager, _prototypes, profile, _roles, out var jobReason))
                 continue;
 
             reasons.Add(jobReason.ToMarkup());
diff --git a/Content.Client/Tips/TippyUI.xaml.cs b/Content.Client/Tips/TippyUI.xaml.cs
index de3eaf4f51b..4a2c4bfe2f2 100644
--- a/Content.Client/Tips/TippyUI.xaml.cs
+++ b/Content.Client/Tips/TippyUI.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.Paper;
+using Content.Client.Paper.UI;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
diff --git a/Content.Client/Tips/TippyUIController.cs b/Content.Client/Tips/TippyUIController.cs
index 2cc694d97d4..7737a3d6982 100644
--- a/Content.Client/Tips/TippyUIController.cs
+++ b/Content.Client/Tips/TippyUIController.cs
@@ -1,21 +1,17 @@
-using Content.Client.Gameplay;
 using System.Numerics;
 using Content.Client.Message;
-using Content.Client.Paper;
+using Content.Client.Paper.UI;
 using Content.Shared.CCVar;
 using Content.Shared.Movement.Components;
 using Content.Shared.Tips;
 using Robust.Client.GameObjects;
 using Robust.Client.ResourceManagement;
-using Robust.Client.State;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.Audio;
 using Robust.Shared.Configuration;
-using Robust.Shared.Console;
 using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using static Content.Client.Tips.TippyUI;
 
diff --git a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
index 69ac3ab0230..4d2ac20d120 100644
--- a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
+++ b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
@@ -736,7 +736,7 @@ private void UnloadGui()
 
     private void LoadGui()
     {
-        DebugTools.Assert(_window == null);
+        UnloadGui();
         _window = UIManager.CreateWindow<ActionsWindow>();
         LayoutContainer.SetAnchorPreset(_window, LayoutContainer.LayoutPreset.CenterTop);
 
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
index 43ea8889994..07a0b4f8d09 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
@@ -98,7 +98,7 @@ public override void HandleState(EuiStateBase state)
                 bool hasAccess = true;
                 FormattedMessage? reason;
 
-                if (!requirementsManager.CheckRoleTime(group.Key.Requirements, out reason))
+                if (!requirementsManager.CheckRoleRequirements(group.Key.Requirements, null, out reason))
                 {
                     hasAccess = false;
                 }
diff --git a/Content.Client/Verbs/UI/VerbMenuUIController.cs b/Content.Client/Verbs/UI/VerbMenuUIController.cs
index e9c3f90641f..efacf877ade 100644
--- a/Content.Client/Verbs/UI/VerbMenuUIController.cs
+++ b/Content.Client/Verbs/UI/VerbMenuUIController.cs
@@ -3,6 +3,7 @@
 using Content.Client.CombatMode;
 using Content.Client.ContextMenu.UI;
 using Content.Client.Gameplay;
+using Content.Client.Mapping;
 using Content.Shared.Input;
 using Content.Shared.Verbs;
 using Robust.Client.Player;
@@ -22,7 +23,9 @@ namespace Content.Client.Verbs.UI
     ///     open a verb menu for a given entity, add verbs to it, and add server-verbs when the server response is
     ///     received.
     /// </remarks>
-    public sealed class VerbMenuUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>
+    public sealed class VerbMenuUIController : UIController,
+        IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>,
+        IOnStateEntered<MappingState>, IOnStateExited<MappingState>
     {
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly ContextMenuUIController _context = default!;
@@ -56,6 +59,22 @@ public void OnStateExited(GameplayState state)
             Close();
         }
 
+        public void OnStateEntered(MappingState state)
+        {
+            _context.OnContextKeyEvent += OnKeyBindDown;
+            _context.OnContextClosed += Close;
+            _verbSystem.OnVerbsResponse += HandleVerbsResponse;
+        }
+
+        public void OnStateExited(MappingState state)
+        {
+            _context.OnContextKeyEvent -= OnKeyBindDown;
+            _context.OnContextClosed -= Close;
+            if (_verbSystem != null)
+                _verbSystem.OnVerbsResponse -= HandleVerbsResponse;
+            Close();
+        }
+
         /// <summary>
         ///     Open a verb menu and fill it with verbs applicable to the given target entity.
         /// </summary>
diff --git a/Content.Client/_Sunrise/Latejoin/SRLateJoinGui.xaml.cs b/Content.Client/_Sunrise/Latejoin/SRLateJoinGui.xaml.cs
index c07b4783b29..4e5bbee4863 100644
--- a/Content.Client/_Sunrise/Latejoin/SRLateJoinGui.xaml.cs
+++ b/Content.Client/_Sunrise/Latejoin/SRLateJoinGui.xaml.cs
@@ -1,7 +1,9 @@
 using Content.Client.CrewManifest;
 using Content.Client.GameTicking.Managers;
+using Content.Client.Lobby;
 using Content.Client.Players.PlayTimeTracking;
 using Content.Client.UserInterface.Controls;
+using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -18,6 +20,7 @@ public sealed partial class SRLateJoinGui : FancyWindow
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IConsoleHost _consoleHost = default!;
     [Dependency] private readonly JobRequirementsManager _playManager = default!;
+    [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
 
     private ClientGameTicker _gameTicker;
 
@@ -164,7 +167,7 @@ public void UpdateUi(IReadOnlyDictionary<NetEntity, Dictionary<ProtoId<JobProtot
                     Close();
                 };
 
-                if (!_playManager.IsAllowed(job, out var denyReason))
+                if (!_playManager.IsAllowed(job, (HumanoidCharacterProfile?)_preferencesManager.Preferences?.SelectedCharacter, out var denyReason))
                 {
                     newButton.Disabled = true;
                     newButton.ToolTip = denyReason.ToString();
diff --git a/Content.IntegrationTests/Tests/MappingEditorTest.cs b/Content.IntegrationTests/Tests/MappingEditorTest.cs
new file mode 100644
index 00000000000..bd930aef9ee
--- /dev/null
+++ b/Content.IntegrationTests/Tests/MappingEditorTest.cs
@@ -0,0 +1,41 @@
+using Content.Client.Gameplay;
+using Content.Client.Mapping;
+using Robust.Client.State;
+
+namespace Content.IntegrationTests.Tests;
+
+[TestFixture]
+public sealed class MappingEditorTest
+{
+    [Test]
+    public async Task StopHardCodingWidgetsJesusChristTest()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        {
+            Connected = true
+        });
+        var client = pair.Client;
+        var state = client.ResolveDependency<IStateManager>();
+
+        await client.WaitPost(() =>
+        {
+            Assert.DoesNotThrow(() =>
+            {
+                state.RequestStateChange<MappingState>();
+            });
+        });
+
+        // arbitrary short time
+        await client.WaitRunTicks(30);
+
+        await client.WaitPost(() =>
+        {
+            Assert.DoesNotThrow(() =>
+            {
+                state.RequestStateChange<GameplayState>();
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
index f64b7c79dfe..c48afd819be 100644
--- a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
+++ b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
@@ -193,7 +193,7 @@ public async Task NoMaterialArbitrage()
                 {
                     foreach (var recipe in recipes)
                     {
-                        foreach (var (matId, amount) in recipe.RequiredMaterials)
+                        foreach (var (matId, amount) in recipe.Materials)
                         {
                             var actualAmount = SharedLatheSystem.AdjustMaterial(amount, recipe.ApplyMaterialDiscount, multiplier);
                             if (spawnedMats.TryGetValue(matId, out var numSpawned))
@@ -273,7 +273,7 @@ public async Task NoMaterialArbitrage()
                 {
                     foreach (var recipe in recipes)
                     {
-                        foreach (var (matId, amount) in recipe.RequiredMaterials)
+                        foreach (var (matId, amount) in recipe.Materials)
                         {
                             var actualAmount = SharedLatheSystem.AdjustMaterial(amount, recipe.ApplyMaterialDiscount, multiplier);
                             if (deconstructedMats.TryGetValue(matId, out var numSpawned))
@@ -328,7 +328,7 @@ public async Task NoMaterialArbitrage()
                 {
                     foreach (var recipe in recipes)
                     {
-                        foreach (var (matId, amount) in recipe.RequiredMaterials)
+                        foreach (var (matId, amount) in recipe.Materials)
                         {
                             var actualAmount = SharedLatheSystem.AdjustMaterial(amount, recipe.ApplyMaterialDiscount, multiplier);
                             if (compositionComponent.MaterialComposition.TryGetValue(matId, out var numSpawned))
diff --git a/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs b/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs
index a66cecc90f9..6746d6d5a94 100644
--- a/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs
+++ b/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs
@@ -18,10 +18,6 @@ public sealed class LoadoutTests
   id: PlayTimeLoadoutTester
 
 - type: loadout
-  id: TestJumpsuit
-  equipment: TestJumpsuit
-
-- type: startingGear
   id: TestJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorGrey
diff --git a/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs b/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs
index 0f15a02eaa2..f8060edb2b4 100644
--- a/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs
+++ b/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs
@@ -35,7 +35,7 @@ await server.WaitAssertion(() =>
         {
             foreach (var gearProto in protos)
             {
-                var backpackProto = gearProto.GetGear("back");
+                var backpackProto = ((IEquipmentLoadout) gearProto).GetGear("back");
                 if (backpackProto == string.Empty)
                     continue;
 
diff --git a/Content.Packaging/ServerPackaging.cs b/Content.Packaging/ServerPackaging.cs
index d9ca57c4d11..39d08b6fc8c 100644
--- a/Content.Packaging/ServerPackaging.cs
+++ b/Content.Packaging/ServerPackaging.cs
@@ -33,6 +33,10 @@ public static class ServerPackaging
 
     private static readonly List<string> ServerContentAssemblies = new()
     {
+        // Sunrise-Start
+        "Content.Sunrise.Interfaces.Shared",
+        "Content.Sunrise.Interfaces.Server",
+        // Sunrise-End
         "Content.Server.Database",
         "Content.Server",
         "Content.Shared",
diff --git a/Content.Server/Administration/Commands/SetOutfitCommand.cs b/Content.Server/Administration/Commands/SetOutfitCommand.cs
index 15d8d4afb7b..ff4d34705a6 100644
--- a/Content.Server/Administration/Commands/SetOutfitCommand.cs
+++ b/Content.Server/Administration/Commands/SetOutfitCommand.cs
@@ -97,11 +97,12 @@ public static bool SetOutfit(EntityUid target, string gear, IEntityManager entit
                 foreach (var slot in slots)
                 {
                     invSystem.TryUnequip(target, slot.Name, true, true, false, inventoryComponent);
-                    var gearStr = startingGear.GetGear(slot.Name);
+                    var gearStr = ((IEquipmentLoadout) startingGear).GetGear(slot.Name);
                     if (gearStr == string.Empty)
                     {
                         continue;
                     }
+
                     var equipmentEntity = entityManager.SpawnEntity(gearStr, entityManager.GetComponent<TransformComponent>(target).Coordinates);
                     if (slot.Name == "id" &&
                         entityManager.TryGetComponent(equipmentEntity, out PdaComponent? pdaComponent) &&
diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs
index af950e9fc20..36cea4c156e 100644
--- a/Content.Server/Administration/Managers/AdminManager.cs
+++ b/Content.Server/Administration/Managers/AdminManager.cs
@@ -458,7 +458,7 @@ private async void LoginAdminMaybe(ICommonSession session)
                     Flags = flags
                 };
 
-                if (dbData.Title != null)
+                if (dbData.Title != null  && _cfg.GetCVar(CCVars.AdminUseCustomNamesAdminRank))
                 {
                     data.Title = dbData.Title;
                 }
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index d7888b491c3..3c8f7cd553c 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -180,7 +180,7 @@ private void AddAdminVerbs(GetVerbsEvent<Verb> args)
 
                             if (targetMind != null)
                             {
-                                _mindSystem.TransferTo(targetMind.Value, mobUid);
+                                _mindSystem.TransferTo(targetMind.Value, mobUid, true);
                             }
                         },
                         ConfirmationPopup = true,
diff --git a/Content.Server/Administration/Systems/BwoinkSystem.cs b/Content.Server/Administration/Systems/BwoinkSystem.cs
index cf36ed65584..6c82f3f1305 100644
--- a/Content.Server/Administration/Systems/BwoinkSystem.cs
+++ b/Content.Server/Administration/Systems/BwoinkSystem.cs
@@ -570,16 +570,23 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
 
             // Sunrise-Sponsors-Start
             string bwoinkText;
+            string adminPrefix = "";
+
+            //Getting an administrator position
+            if (_config.GetCVar(CCVars.AhelpAdminPrefix) && senderAdmin is not null && senderAdmin.Title is not null)
+            {
+                adminPrefix = $"[bold]\\[{senderAdmin.Title}\\][/bold] ";
+            }
 
             if (senderAdmin is not null &&
                 senderAdmin.Flags ==
                 AdminFlags.Adminhelp) // Mentor. Not full admin. That's why it's colored differently.
             {
-                bwoinkText = $"[color=purple]\\[{senderAdmin.Title}\\]{senderSession.Name}[/color]";
+                bwoinkText = $"[color=purple]{adminPrefix}{senderSession.Name}[/color]";
             }
             else if (senderAdmin is not null && senderAdmin.HasFlag(AdminFlags.Adminhelp))
             {
-                bwoinkText = $"[color=red]\\[{senderAdmin.Title}\\] {senderSession.Name}[/color]";
+                bwoinkText = $"[color=red]{adminPrefix}{senderSession.Name}[/color]";
             }
             else if (_sponsorsManager != null)
             {
@@ -617,6 +624,13 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
                 RaiseNetworkEvent(msg, channel);
             }
 
+            string adminPrefixWebhook = "";
+
+            if (_config.GetCVar(CCVars.AhelpAdminPrefixWebhook) && senderAdmin is not null && senderAdmin.Title is not null)
+            {
+                adminPrefixWebhook = $"[bold]\\[{senderAdmin.Title}\\][/bold] ";
+            }
+
             // Notify player
             if (_playerManager.TryGetSessionById(message.UserId, out var session))
             {
@@ -631,11 +645,11 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
                             senderAdmin.Flags ==
                             AdminFlags.Adminhelp) // Mentor. Not full admin. That's why it's colored differently.
                         {
-                            overrideMsgText = $"[color=purple]{_overrideClientName}[/color]";
+                            overrideMsgText = $"[color=purple]{adminPrefixWebhook}{_overrideClientName}[/color]";
                         }
                         else if (senderAdmin is not null && senderAdmin.HasFlag(AdminFlags.Adminhelp))
                         {
-                            overrideMsgText = $"[color=red]{_overrideClientName}[/color]";
+                            overrideMsgText = $"[color=red]{adminPrefixWebhook}{_overrideClientName}[/color]";
                         }
                         else
                         {
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index acf52adbdcd..6e336effeec 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -382,16 +382,13 @@ public void MakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? sessi
 
         if (session != null)
         {
-            var curMind = session.GetMind();
-            if (curMind == null)
-            {
-                curMind = _mind.CreateMind(session.UserId, Name(antagEnt.Value));
-                _mind.SetUserId(curMind.Value, session.UserId);
-            }
+            var curMind = _mind.CreateMind(session.UserId, Name(antagEnt.Value));
+            _mind.SetUserId(curMind, session.UserId);
+
+            _mind.TransferTo(curMind, antagEnt, ghostCheckOverride: true);
+            _role.MindAddRoles(curMind, def.MindComponents, null, true);
+            ent.Comp.SelectedMinds.Add((curMind, Name(player)));
 
-            _mind.TransferTo(curMind.Value, antagEnt, ghostCheckOverride: true);
-            _role.MindAddRoles(curMind.Value, def.MindComponents, null, true);
-            ent.Comp.SelectedMinds.Add((curMind.Value, Name(player)));
             SendBriefing(session, def.Briefing);
         }
 
diff --git a/Content.Server/Antag/Components/AntagImmuneComponent.cs b/Content.Server/Antag/Components/AntagImmuneComponent.cs
index 3ae8e049f60..beec7960f0a 100644
--- a/Content.Server/Antag/Components/AntagImmuneComponent.cs
+++ b/Content.Server/Antag/Components/AntagImmuneComponent.cs
@@ -1,7 +1,7 @@
 namespace Content.Server.Antag.Components;
 
 [RegisterComponent]
-public partial class AntagImmuneComponent : Component
+public sealed partial class AntagImmuneComponent : Component
 {
 
 }
diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs
index 5070b3f197f..43dddce4a4e 100644
--- a/Content.Server/Atmos/Rotting/RottingSystem.cs
+++ b/Content.Server/Atmos/Rotting/RottingSystem.cs
@@ -34,7 +34,7 @@ private void OnGibbed(EntityUid uid, RottingComponent component, BeingGibbedEven
         if (!TryComp<PerishableComponent>(uid, out var perishable))
             return;
 
-        var molsToDump = perishable.MolsPerSecondPerUnitMass * physics.FixturesMass * (float) component.TotalRotTime.TotalSeconds;
+        var molsToDump = perishable.MolsPerSecondPerUnitMass * physics.FixturesMass * (float)component.TotalRotTime.TotalSeconds;
         var tileMix = _atmosphere.GetTileMixture(uid, excite: true);
         tileMix?.AdjustMoles(Gas.Ammonia, molsToDump);
     }
@@ -54,7 +54,7 @@ private void OnTempIsRotting(EntityUid uid, TemperatureComponent component, ref
     /// <returns></returns>
     private float GetRotRate(EntityUid uid)
     {
-        if (_container.TryGetContainingContainer(uid, out var container) &&
+        if (_container.TryGetContainingContainer((uid, null, null), out var container) &&
             TryComp<ProRottingContainerComponent>(container.Owner, out var rotContainer))
         {
             return rotContainer.DecayModifier;
@@ -124,7 +124,7 @@ public override void Update(float frameTime)
                 continue;
             // We need a way to get the mass of the mob alone without armor etc in the future
             // or just remove the mass mechanics altogether because they aren't good.
-            var molRate = perishable.MolsPerSecondPerUnitMass * (float) rotting.RotUpdateRate.TotalSeconds;
+            var molRate = perishable.MolsPerSecondPerUnitMass * (float)rotting.RotUpdateRate.TotalSeconds;
             var tileMix = _atmosphere.GetTileMixture(uid, excite: true);
             tileMix?.AdjustMoles(Gas.Ammonia, molRate * physics.FixturesMass);
         }
diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
index e10158cf357..bd5edb0ea50 100644
--- a/Content.Server/Body/Systems/BodySystem.cs
+++ b/Content.Server/Body/Systems/BodySystem.cs
@@ -34,7 +34,7 @@ public override void Initialize()
     private void OnRelayMoveInput(Entity<BodyComponent> ent, ref MoveInputEvent args)
     {
         // If they haven't actually moved then ignore it.
-        if ((args.Component.HeldMoveButtons &
+        if ((args.Entity.Comp.HeldMoveButtons &
              (MoveButtons.Down | MoveButtons.Left | MoveButtons.Up | MoveButtons.Right)) == 0x0)
         {
             return;
diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs
index 10ebd934aa4..e352b0a58a1 100644
--- a/Content.Server/Body/Systems/InternalsSystem.cs
+++ b/Content.Server/Body/Systems/InternalsSystem.cs
@@ -72,6 +72,9 @@ private void OnGetInteractionVerbs(
         if (!args.CanAccess || !args.CanInteract || args.Hands is null)
             return;
 
+        if (!AreInternalsWorking(ent) && ent.Comp.BreathTools.Count == 0)
+            return;
+
         var user = args.User;
 
         InteractionVerb verb = new()
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 22ae98af7ee..587979a4336 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -137,7 +137,7 @@ public void Inhale(EntityUid uid, BodyComponent? body = null)
         if (!Resolve(uid, ref body, logMissing: false))
             return;
 
-        var organs = _bodySystem.GetBodyOrganComponents<LungComponent>(uid, body);
+        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((uid, body));
 
         // Inhale gas
         var ev = new InhaleLocationEvent();
@@ -154,11 +154,11 @@ public void Inhale(EntityUid uid, BodyComponent? body = null)
 
         var lungRatio = 1.0f / organs.Count;
         var gas = organs.Count == 1 ? actualGas : actualGas.RemoveRatio(lungRatio);
-        foreach (var (lung, _) in organs)
+        foreach (var (organUid, lung, _) in organs)
         {
             // Merge doesn't remove gas from the giver.
             _atmosSys.Merge(lung.Air, gas);
-            _lungSystem.GasToReagent(lung.Owner, lung);
+            _lungSystem.GasToReagent(organUid, lung);
         }
     }
 
@@ -167,7 +167,7 @@ public void Exhale(EntityUid uid, BodyComponent? body = null)
         if (!Resolve(uid, ref body, logMissing: false))
             return;
 
-        var organs = _bodySystem.GetBodyOrganComponents<LungComponent>(uid, body);
+        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((uid, body));
 
         // exhale gas
 
@@ -184,12 +184,12 @@ public void Exhale(EntityUid uid, BodyComponent? body = null)
         }
 
         var outGas = new GasMixture(ev.Gas.Volume);
-        foreach (var (lung, _) in organs)
+        foreach (var (organUid, lung, _) in organs)
         {
             _atmosSys.Merge(outGas, lung.Air);
             lung.Air.Clear();
 
-            if (_solutionContainerSystem.ResolveSolution(lung.Owner, lung.SolutionName, ref lung.Solution))
+            if (_solutionContainerSystem.ResolveSolution(organUid, lung.SolutionName, ref lung.Solution))
                 _solutionContainerSystem.RemoveAllSolution(lung.Solution.Value);
         }
 
@@ -224,7 +224,7 @@ public bool CanMetabolizeGas(Entity<RespiratorComponent?> ent, GasMixture gas)
         if (!Resolve(ent, ref ent.Comp))
             return false;
 
-        var organs = _bodySystem.GetBodyOrganComponents<LungComponent>(ent);
+        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
         if (organs.Count == 0)
             return false;
 
@@ -236,7 +236,7 @@ public bool CanMetabolizeGas(Entity<RespiratorComponent?> ent, GasMixture gas)
         float saturation = 0;
         foreach (var organ in organs)
         {
-            saturation += GetSaturation(solution, organ.Comp.Owner, out var toxic);
+            saturation += GetSaturation(solution, organ.Owner, out var toxic);
             if (toxic)
                 return false;
         }
@@ -310,10 +310,10 @@ private void TakeSuffocationDamage(Entity<RespiratorComponent> ent)
         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.GetBodyOrganComponents<LungComponent>(ent);
-            foreach (var (comp, _) in organs)
+            var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
+            foreach (var entity in organs)
             {
-                _alertsSystem.ShowAlert(ent, comp.Alert);
+                _alertsSystem.ShowAlert(entity.Owner, entity.Comp1.Alert);
             }
         }
 
@@ -326,10 +326,10 @@ private void StopSuffocation(Entity<RespiratorComponent> ent)
             _adminLogger.Add(LogType.Asphyxiation, $"{ToPrettyString(ent):entity} stopped suffocating");
 
         // TODO: This is not going work with multiple different lungs, if that ever becomes a possibility
-        var organs = _bodySystem.GetBodyOrganComponents<LungComponent>(ent);
-        foreach (var (comp, _) in organs)
+        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
+        foreach (var entity in organs)
         {
-            _alertsSystem.ClearAlert(ent, comp.Alert);
+            _alertsSystem.ClearAlert(entity.Owner, entity.Comp1.Alert);
         }
 
         _damageableSys.TryChangeDamage(ent, ent.Comp.DamageRecovery);
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index 4cbf2e63be8..e118f493639 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -3,13 +3,13 @@
 using Content.Server.Cargo.Components;
 using Content.Server.Labels;
 using Content.Server.NameIdentifier;
-using Content.Server.Paper;
 using Content.Shared.Access.Components;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Prototypes;
 using Content.Shared.Database;
 using Content.Shared.NameIdentifier;
+using Content.Shared.Paper;
 using Content.Shared.Stacks;
 using Content.Shared.Whitelist;
 using JetBrains.Annotations;
@@ -125,7 +125,7 @@ public void SetupBountyLabel(EntityUid uid, EntityUid stationId, CargoBountyData
             msg.PushNewline();
         }
         msg.AddMarkup(Loc.GetString("bounty-console-manifest-reward", ("reward", prototype.Reward)));
-        _paperSystem.SetContent(uid, msg.ToMarkup(), paper);
+        _paperSystem.SetContent((uid, paper), msg.ToMarkup());
     }
 
     /// <summary>
@@ -138,7 +138,7 @@ private void OnGetBountyPrice(EntityUid uid, CargoBountyLabelComponent component
             return;
 
         // make sure this label was actually applied to a crate.
-        if (!_container.TryGetContainingContainer(uid, out var container) || container.ID != LabelSystem.ContainerName)
+        if (!_container.TryGetContainingContainer((uid, null, null), out var container) || container.ID != LabelSystem.ContainerName)
             return;
 
         if (component.AssociatedStationId is not { } station || !TryComp<StationCargoBountyDatabaseComponent>(station, out var database))
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index 7a2a3d474aa..f68fe0fa63a 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -1,7 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.Cargo.Components;
 using Content.Server.Labels.Components;
-using Content.Server.Paper;
 using Content.Server.Station.Components;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.BUI;
@@ -10,10 +9,9 @@
 using Content.Shared.Cargo.Prototypes;
 using Content.Shared.Database;
 using Content.Shared.Interaction;
+using Content.Shared.Paper;
 using Robust.Shared.Map;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Cargo.Systems
@@ -512,15 +510,14 @@ private bool FulfillOrder(CargoOrderData order, EntityCoordinates spawn, string?
                 var val = Loc.GetString("cargo-console-paper-print-name", ("orderNumber", order.OrderId));
                 _metaSystem.SetEntityName(printed, val);
 
-                _paperSystem.SetContent(printed, Loc.GetString(
+                _paperSystem.SetContent((printed, paper), Loc.GetString(
                         "cargo-console-paper-print-text",
                         ("orderNumber", order.OrderId),
                         ("itemName", MetaData(item).EntityName),
                         ("orderQuantity", order.OrderQuantity),
                         ("requester", order.Requester),
                         ("reason", order.Reason),
-                        ("approver", order.Approver ?? string.Empty)),
-                    paper);
+                        ("approver", order.Approver ?? string.Empty)));
 
                 // attempt to attach the label to the item
                 if (TryComp<PaperLabelComponent>(item, out var label))
diff --git a/Content.Server/Cargo/Systems/CargoSystem.cs b/Content.Server/Cargo/Systems/CargoSystem.cs
index 1b33404e355..0d205d762bc 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Access.Systems;
 using Content.Server.Cargo.Components;
 using Content.Server.DeviceLinking.Systems;
-using Content.Server.Paper;
 using Content.Server.Popups;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Stack;
@@ -13,6 +12,7 @@
 using Content.Shared.Cargo.Components;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Mobs.Components;
+using Content.Shared.Paper;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs
index f878eeee75c..d936451d524 100644
--- a/Content.Server/Cargo/Systems/PricingSystem.cs
+++ b/Content.Server/Cargo/Systems/PricingSystem.cs
@@ -16,6 +16,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Shared.Research.Prototypes;
 
 namespace Content.Server.Cargo.Systems;
 
@@ -158,6 +159,26 @@ private double GetMaterialPrice(PhysicalCompositionComponent component)
         return price;
     }
 
+    public double GetLatheRecipePrice(LatheRecipePrototype recipe)
+    {
+        var price = 0.0;
+
+        if (recipe.Result is { } result)
+        {
+            price += GetEstimatedPrice(_prototypeManager.Index(result));
+        }
+
+        if (recipe.ResultReagents is { } resultReagents)
+        {
+            foreach (var (reagent, amount) in resultReagents)
+            {
+                price += (_prototypeManager.Index(reagent).PricePerUnit * amount).Double();
+            }
+        }
+
+        return price;
+    }
+
     /// <summary>
     /// Get a rough price for an entityprototype. Does not consider contained entities.
     /// </summary>
diff --git a/Content.Server/Chat/SpeakOnUseComponent.cs b/Content.Server/Chat/SpeakOnUseComponent.cs
new file mode 100644
index 00000000000..f8953aebefe
--- /dev/null
+++ b/Content.Server/Chat/SpeakOnUseComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Dataset;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chat;
+
+/// <summary>
+/// Entity will say the things when activated
+/// </summary>
+[RegisterComponent]
+public sealed partial class SpeakOnUseComponent : Component
+{
+    /// <summary>
+    /// The identifier for the dataset prototype containing messages to be spoken by this entity.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<LocalizedDatasetPrototype> Pack { get; private set; }
+
+}
diff --git a/Content.Server/Chat/Systems/SpeakOnUseSystem.cs b/Content.Server/Chat/Systems/SpeakOnUseSystem.cs
new file mode 100644
index 00000000000..addec79e410
--- /dev/null
+++ b/Content.Server/Chat/Systems/SpeakOnUseSystem.cs
@@ -0,0 +1,42 @@
+using Content.Server.Chat;
+using Content.Shared.Dataset;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Timing;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.Chat.Systems;
+
+/// <summary>
+/// Handles the speech on activating an entity
+/// </summary>
+public sealed partial class SpeakOnUIClosedSystem : EntitySystem
+{
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<SpeakOnUseComponent, UseInHandEvent>(OnUseInHand);
+    }
+
+    public void OnUseInHand(EntityUid uid, SpeakOnUseComponent? component, UseInHandEvent args)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        // Yes it won't work without UseDelayComponent, but we don't want any kind of spam
+        if (!TryComp(uid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((uid, useDelay)))
+            return;
+
+        if (!_prototypeManager.TryIndex(component.Pack, out var messagePack))
+            return;
+
+        var message = Loc.GetString(_random.Pick(messagePack.Values));
+        _chat.TrySendInGameICMessage(uid, message, InGameICChatType.Speak, true);
+        _useDelay.TryResetDelay((uid, useDelay));
+    }
+}
diff --git a/Content.Server/Construction/ConstructionSystem.Interactions.cs b/Content.Server/Construction/ConstructionSystem.Interactions.cs
index ad7b2a11b0e..c844dd2c9ad 100644
--- a/Content.Server/Construction/ConstructionSystem.Interactions.cs
+++ b/Content.Server/Construction/ConstructionSystem.Interactions.cs
@@ -2,7 +2,6 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Construction.Components;
 using Content.Server.Temperature.Components;
-using Content.Server.Temperature.Systems;
 using Content.Shared.Construction;
 using Content.Shared.Construction.Components;
 using Content.Shared.Construction.EntitySystems;
@@ -11,6 +10,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Prying.Systems;
 using Content.Shared.Radio.EntitySystems;
+using Content.Shared.Temperature;
 using Content.Shared.Tools.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Utility;
diff --git a/Content.Server/Containers/ThrowInsertContainerSystem.cs b/Content.Server/Containers/ThrowInsertContainerSystem.cs
index 12bb602811a..cbaec7f5c6e 100644
--- a/Content.Server/Containers/ThrowInsertContainerSystem.cs
+++ b/Content.Server/Containers/ThrowInsertContainerSystem.cs
@@ -30,8 +30,6 @@ private void OnThrowCollide(Entity<ThrowInsertContainerComponent> ent, ref Throw
         if (!_containerSystem.CanInsert(args.Thrown, container))
             return;
 
-
-        var rand = _random.NextFloat();
         if (_random.Prob(ent.Comp.Probability))
         {
             _audio.PlayPvs(ent.Comp.MissSound, ent);
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs
new file mode 100644
index 00000000000..e02ed873223
--- /dev/null
+++ b/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs
@@ -0,0 +1,89 @@
+using System.Numerics;
+using Content.Server.Spawners.Components;
+using Content.Server.Spawners.EntitySystems;
+using Content.Shared.Random;
+using Content.Shared.Random.Helpers;
+using Robust.Server.GameObjects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Spawners;
+
+namespace Content.Server.Destructible.Thresholds.Behaviors;
+
+/// <summary>
+/// Behavior that can be assigned to a trigger that that takes a <see cref="WeightedRandomEntityPrototype"/>
+/// and spawns a number of the same entity between a given min and max
+/// at a random offset from the final position of the entity.
+/// </summary>
+[Serializable]
+[DataDefinition]
+public sealed partial class WeightedSpawnEntityBehavior : IThresholdBehavior
+{
+    /// <summary>
+    /// A table of entities with assigned weights to randomly pick from
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<WeightedRandomEntityPrototype> WeightedEntityTable;
+
+    /// <summary>
+    /// How far away to spawn the entity from the parent position
+    /// </summary>
+    [DataField]
+    public float SpawnOffset = 1;
+
+    /// <summary>
+    /// The mininum number of entities to spawn randomly
+    /// </summary>
+    [DataField]
+    public int MinSpawn = 1;
+
+    /// <summary>
+    /// The max number of entities to spawn randomly
+    /// </summary>
+    [DataField]
+    public int MaxSpawn = 1;
+
+    /// <summary>
+    /// Time in seconds to wait before spawning entities
+    /// </summary>
+    [DataField]
+    public float SpawnAfter;
+
+    public void Execute(EntityUid uid, DestructibleSystem system, EntityUid? cause = null)
+    {
+        // Get the position at which to start initially spawning entities
+        var transform = system.EntityManager.System<TransformSystem>();
+        var position = transform.GetMapCoordinates(uid);
+        // Helper function used to randomly get an offset to apply to the original position
+        Vector2 GetRandomVector() => new (system.Random.NextFloat(-SpawnOffset, SpawnOffset), system.Random.NextFloat(-SpawnOffset, SpawnOffset));
+        // Randomly pick the entity to spawn and randomly pick how many to spawn
+        var entity = system.PrototypeManager.Index(WeightedEntityTable).Pick(system.Random);
+        var amountToSpawn = system.Random.NextFloat(MinSpawn, MaxSpawn);
+
+        // Different behaviors for delayed spawning and immediate spawning
+        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))
+                return;
+
+            // spawn the spawner, assign it a lifetime, and assign the entity that it will spawn when despawned
+            for (var i = 0; i < amountToSpawn; i++)
+            {
+                var spawner = system.EntityManager.SpawnEntity(tempSpawnerProto.ID, position.Offset(GetRandomVector()));
+                system.EntityManager.EnsureComponent<TimedDespawnComponent>(spawner, out var timedDespawnComponent);
+                timedDespawnComponent.Lifetime = SpawnAfter;
+                system.EntityManager.EnsureComponent<SpawnOnDespawnComponent>(spawner, out var spawnOnDespawnComponent);
+                system.EntityManager.System<SpawnOnDespawnSystem>().SetPrototype((spawner, spawnOnDespawnComponent), entity);
+            }
+        }
+        else
+        {
+            // directly spawn the desired entities
+            for (var i = 0; i < amountToSpawn; i++)
+            {
+                system.EntityManager.SpawnEntity(entity, position.Offset(GetRandomVector()));
+            }
+        }
+    }
+}
diff --git a/Content.Server/Drowsiness/DrowsinessSystem.cs b/Content.Server/Drowsiness/DrowsinessSystem.cs
new file mode 100644
index 00000000000..2511bc790e9
--- /dev/null
+++ b/Content.Server/Drowsiness/DrowsinessSystem.cs
@@ -0,0 +1,50 @@
+using Content.Shared.Bed.Sleep;
+using Content.Shared.Drowsiness;
+using Content.Shared.StatusEffect;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Drowsiness;
+
+public sealed class DrowsinessSystem : SharedDrowsinessSystem
+{
+    [ValidatePrototypeId<StatusEffectPrototype>]
+    private const string SleepKey = "ForcedSleep"; // Same one used by N2O and other sleep chems.
+
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<DrowsinessComponent, ComponentStartup>(OnInit);
+    }
+
+    private void OnInit(EntityUid uid, DrowsinessComponent component, ComponentStartup args)
+    {
+        component.NextIncidentTime = _timing.CurTime + TimeSpan.FromSeconds(_random.NextFloat(component.TimeBetweenIncidents.X, component.TimeBetweenIncidents.Y));
+    }
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<DrowsinessComponent>();
+        while (query.MoveNext(out var uid, out var component))
+        {
+            if (_timing.CurTime < component.NextIncidentTime)
+                continue;
+
+            // Set the new time.
+            component.NextIncidentTime = _timing.CurTime + TimeSpan.FromSeconds(_random.NextFloat(component.TimeBetweenIncidents.X, component.TimeBetweenIncidents.Y));
+
+            // sleep duration
+            var duration = TimeSpan.FromSeconds(_random.NextFloat(component.DurationOfIncident.X, component.DurationOfIncident.Y));
+
+            // Make sure the sleep time doesn't cut into the time to next incident.
+            component.NextIncidentTime += duration;
+
+            _statusEffects.TryAddStatusEffect<ForcedSleepingComponent>(uid, SleepKey, duration, false);
+        }
+    }
+}
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
index 55e8de26321..4b59c8f1c48 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
@@ -3,12 +3,12 @@
 using Content.Shared.Atmos;
 using Content.Shared.Damage;
 using Content.Shared.Explosion;
+using Content.Shared.Explosion.EntitySystems;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Map.Components;
-
 namespace Content.Server.Explosion.EntitySystems;
 
-public sealed partial class ExplosionSystem : EntitySystem
+public sealed partial class ExplosionSystem : SharedExplosionSystem
 {
     [Dependency] private readonly DestructibleSystem _destructibleSystem = default!;
 
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs
index 3332d3a4f59..ce98f89de7a 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs
@@ -1,8 +1,8 @@
 using Content.Shared.CCVar;
-
+using Content.Shared.Explosion.EntitySystems;
 namespace Content.Server.Explosion.EntitySystems;
 
-public sealed partial class ExplosionSystem : EntitySystem
+public sealed partial class ExplosionSystem : SharedExplosionSystem
 {
     public int MaxIterations { get; private set; }
     public int MaxArea { get; private set; }
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
index 556fe7c1415..d88945bc19e 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Atmos;
 using Content.Shared.Explosion;
 using Content.Shared.Explosion.Components;
+using Content.Shared.Explosion.EntitySystems;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 
@@ -11,7 +12,7 @@ namespace Content.Server.Explosion.EntitySystems;
 // A good portion of it is focused around keeping track of what tile-indices on a grid correspond to tiles that border
 // space. AFAIK no other system currently needs to track these "edge-tiles". If they do, this should probably be a
 // property of the grid itself?
-public sealed partial class ExplosionSystem : EntitySystem
+public sealed partial class ExplosionSystem : SharedExplosionSystem
 {
     /// <summary>
     ///     Set of tiles of each grid that are directly adjacent to space, along with the directions that face space.
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
index c30a9ce3006..3cab1213b62 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Damage;
 using Content.Shared.Explosion;
 using Content.Shared.Explosion.Components;
+using Content.Shared.Explosion.EntitySystems;
 using Content.Shared.Maps;
 using Content.Shared.Physics;
 using Content.Shared.Projectiles;
@@ -17,10 +18,9 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
-
 namespace Content.Server.Explosion.EntitySystems;
 
-public sealed partial class ExplosionSystem
+public sealed partial class ExplosionSystem : SharedExplosionSystem
 {
     [Dependency] private readonly FlammableSystem _flammableSystem = default!;
 
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
index 8b4c0e14c5f..8c3229e06ee 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
@@ -7,13 +7,13 @@
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
-
+using Content.Shared.Explosion.EntitySystems;
 namespace Content.Server.Explosion.EntitySystems;
 
 // This partial part of the explosion system has all of the functions used to create the actual explosion map.
 // I.e, to get the sets of tiles & intensity values that describe an explosion.
 
-public sealed partial class ExplosionSystem : EntitySystem
+public sealed partial class ExplosionSystem : SharedExplosionSystem
 {
     /// <summary>
     ///     This is the main explosion generating function.
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs
index 5db8b55bf96..219dba4bdeb 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs
@@ -1,14 +1,14 @@
 using System.Numerics;
 using Content.Shared.Explosion;
 using Content.Shared.Explosion.Components;
+using Content.Shared.Explosion.EntitySystems;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
-
 namespace Content.Server.Explosion.EntitySystems;
 
 // This part of the system handled send visual / overlay data to clients.
-public sealed partial class ExplosionSystem : EntitySystem
+public sealed partial class ExplosionSystem : SharedExplosionSystem
 {
     public void InitVisuals()
     {
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index b9f0f6fdb79..1eeed949cc0 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -16,6 +16,8 @@
 using Content.Shared.Inventory;
 using Content.Shared.Projectiles;
 using Content.Shared.Throwing;
+using Content.Shared.Explosion.Components;
+using Content.Shared.Explosion.EntitySystems;
 using Robust.Server.GameStates;
 using Robust.Server.Player;
 using Robust.Shared.Audio.Systems;
@@ -29,7 +31,7 @@
 
 namespace Content.Server.Explosion.EntitySystems;
 
-public sealed partial class ExplosionSystem : EntitySystem
+public sealed partial class ExplosionSystem : SharedExplosionSystem
 {
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
@@ -92,8 +94,6 @@ public override void Initialize()
 
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnReset);
 
-        SubscribeLocalEvent<ExplosionResistanceComponent, ArmorExamineEvent>(OnArmorExamine);
-
         // Handled by ExplosionSystem.Processing.cs
         SubscribeLocalEvent<MapChangedEvent>(OnMapChanged);
 
@@ -418,15 +418,4 @@ private void CameraShake(float range, MapCoordinates epicenter, float totalInten
                 _recoilSystem.KickCamera(uid, -delta.Normalized() * effect);
         }
     }
-
-    private void OnArmorExamine(EntityUid uid, ExplosionResistanceComponent component, ref ArmorExamineEvent args)
-    {
-        var value = MathF.Round((1f - component.DamageCoefficient) * 100, 1);
-
-        if (value == 0)
-            return;
-
-        args.Msg.PushNewline();
-        args.Msg.AddMarkupOrThrow(Loc.GetString(component.Examine, ("value", value)));
-    }
 }
diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs
index 2b059b4b802..3f10e180fe9 100644
--- a/Content.Server/Fax/FaxSystem.cs
+++ b/Content.Server/Fax/FaxSystem.cs
@@ -5,7 +5,6 @@
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Labels;
-using Content.Server.Paper;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Tools;
@@ -591,14 +590,14 @@ private void SpawnPaperFromQueue(EntityUid uid, FaxMachineComponent? component =
 
         if (TryComp<PaperComponent>(printed, out var paper))
         {
-            _paperSystem.SetContent(printed, printout.Content);
+            _paperSystem.SetContent((printed, paper), printout.Content);
 
             // Apply stamps
             if (printout.StampState != null)
             {
                 foreach (var stamp in printout.StampedBy)
                 {
-                    _paperSystem.TryStamp(printed, stamp, printout.StampState);
+                    _paperSystem.TryStamp((printed, paper), stamp, printout.StampState);
                 }
             }
 
diff --git a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
index 5e2a562577d..80062569b85 100644
--- a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
@@ -1,12 +1,12 @@
 using System.Linq;
 using System.Text;
-using Content.Server.Paper;
 using Content.Server.Popups;
 using Content.Shared.UserInterface;
 using Content.Shared.DoAfter;
 using Content.Shared.Forensics;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
+using Content.Shared.Paper;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
 using Robust.Server.GameObjects;
@@ -183,7 +183,7 @@ private void OnPrint(EntityUid uid, ForensicScannerComponent component, Forensic
             var printed = EntityManager.SpawnEntity(component.MachineOutput, Transform(uid).Coordinates);
             _handsSystem.PickupOrDrop(args.Actor, printed, checkActionBlocker: false);
 
-            if (!HasComp<PaperComponent>(printed))
+            if (!TryComp<PaperComponent>(printed, out var paperComp))
             {
                 Log.Error("Printed paper did not have PaperComponent.");
                 return;
@@ -217,7 +217,7 @@ private void OnPrint(EntityUid uid, ForensicScannerComponent component, Forensic
                 text.AppendLine(residue);
             }
 
-            _paperSystem.SetContent(printed, text.ToString());
+            _paperSystem.SetContent((printed, paperComp), text.ToString());
             _audioSystem.PlayPvs(component.SoundPrint, uid,
                 AudioParams.Default
                 .WithVariation(0.25f)
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index a96020d0e3a..9e8a878a2d1 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -42,7 +42,7 @@ public override void Initialize()
     protected override void Added(EntityUid uid, TraitorRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
         base.Added(uid, component, gameRule, args);
-        MakeCodewords(component);
+        SetCodewords(component);
     }
 
     private void AfterEntitySelected(Entity<TraitorRuleComponent> ent, ref AfterAntagEntitySelectedEvent args)
@@ -50,17 +50,23 @@ private void AfterEntitySelected(Entity<TraitorRuleComponent> ent, ref AfterAnta
         MakeTraitor(args.EntityUid, ent);
     }
 
-    private void MakeCodewords(TraitorRuleComponent component)
+    private void SetCodewords(TraitorRuleComponent component)
+    {
+        component.Codewords = GenerateTraitorCodewords(component);
+    }
+
+    public string[] GenerateTraitorCodewords(TraitorRuleComponent component)
     {
         var adjectives = _prototypeManager.Index(component.CodewordAdjectives).Values;
         var verbs = _prototypeManager.Index(component.CodewordVerbs).Values;
         var codewordPool = adjectives.Concat(verbs).ToList();
         var finalCodewordCount = Math.Min(component.CodewordCount, codewordPool.Count);
-        component.Codewords = new string[finalCodewordCount];
+        string[] codewords = new string[finalCodewordCount];
         for (var i = 0; i < finalCodewordCount; i++)
         {
-            component.Codewords[i] = _random.PickAndTake(codewordPool);
+            codewords[i] = _random.PickAndTake(codewordPool);
         }
+        return codewords;
     }
 
     public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component, bool giveUplink = true)
@@ -122,9 +128,9 @@ private string GenerateBriefing(string[] codewords, Note[]? uplinkCode, string?
     {
         var sb = new StringBuilder();
         sb.AppendLine(Loc.GetString("traitor-role-greeting", ("corporation", objectiveIssuer ?? Loc.GetString("objective-issuer-unknown"))));
-        sb.AppendLine(Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", codewords))));
+        sb.AppendLine(Loc.GetString("traitor-role-codewords", ("codewords", string.Join(", ", codewords))));
         if (uplinkCode != null)
-            sb.AppendLine(Loc.GetString("traitor-role-uplink-code-short", ("code", string.Join("-", uplinkCode).Replace("sharp", "#"))));
+            sb.AppendLine(Loc.GetString("traitor-role-uplink-code", ("code", string.Join("-", uplinkCode).Replace("sharp", "#"))));
 
         return sb.ToString();
     }
diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index dce80a450fd..b68c279b3e5 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -128,7 +128,7 @@ private void OnActionPerform(EntityUid uid, GhostComponent component, BooActionE
         private void OnRelayMoveInput(EntityUid uid, GhostOnMoveComponent component, ref MoveInputEvent args)
         {
             // If they haven't actually moved then ignore it.
-            if ((args.Component.HeldMoveButtons &
+            if ((args.Entity.Comp.HeldMoveButtons &
                  (MoveButtons.Down | MoveButtons.Left | MoveButtons.Up | MoveButtons.Right)) == 0x0)
             {
                 return;
diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs
index 7d1cc0b5d9d..8e30420199b 100644
--- a/Content.Server/IoC/ServerContentIoC.cs
+++ b/Content.Server/IoC/ServerContentIoC.cs
@@ -12,6 +12,7 @@
 using Content.Server.EUI;
 using Content.Server.GhostKick;
 using Content.Server.Info;
+using Content.Server.Mapping;
 using Content.Server.Maps;
 using Content.Server.MoMMI;
 using Content.Server.NodeContainer.NodeGroups;
@@ -69,6 +70,7 @@ public static void Register()
             IoCManager.Register<ServerApi>();
             IoCManager.Register<JobWhitelistManager>();
             IoCManager.Register<PlayerRateLimitManager>();
+            IoCManager.Register<MappingManager>();
 
             IoCManager.Register<ServersHubManager>(); // Sunrise-Hub
         }
diff --git a/Content.Server/Labels/Label/LabelSystem.cs b/Content.Server/Labels/Label/LabelSystem.cs
index cbf29e16a26..b70c004123a 100644
--- a/Content.Server/Labels/Label/LabelSystem.cs
+++ b/Content.Server/Labels/Label/LabelSystem.cs
@@ -1,10 +1,10 @@
 using Content.Server.Labels.Components;
-using Content.Server.Paper;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Examine;
 using Content.Shared.Labels;
 using Content.Shared.Labels.Components;
 using Content.Shared.Labels.EntitySystems;
+using Content.Shared.Paper;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 
diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
index 7448a9b84dd..f6e5903bbe2 100644
--- a/Content.Server/Lathe/LatheSystem.cs
+++ b/Content.Server/Lathe/LatheSystem.cs
@@ -1,23 +1,29 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Administration.Logs;
-using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.Fluids.EntitySystems;
 using Content.Server.Lathe.Components;
 using Content.Server.Materials;
+using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
 using Content.Shared.Atmos;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.UserInterface;
 using Content.Shared.Database;
 using Content.Shared.Emag.Components;
+using Content.Shared.Examine;
 using Content.Shared.Lathe;
 using Content.Shared.Materials;
 using Content.Shared.ReagentSpeed;
 using Content.Shared.Research.Components;
 using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
+using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
@@ -34,9 +40,13 @@ public sealed class LatheSystem : SharedLatheSystem
         [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
+        [Dependency] private readonly ContainerSystem _container = default!;
         [Dependency] private readonly UserInterfaceSystem _uiSys = default!;
         [Dependency] private readonly MaterialStorageSystem _materialStorage = default!;
+        [Dependency] private readonly PopupSystem _popup = default!;
+        [Dependency] private readonly PuddleSystem _puddle = default!;
         [Dependency] private readonly ReagentSpeedSystem _reagentSpeed = default!;
+        [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
         [Dependency] private readonly StackSystem _stack = default!;
         [Dependency] private readonly TransformSystem _transform = default!;
 
@@ -63,7 +73,6 @@ public override void Initialize()
             SubscribeLocalEvent<EmagLatheRecipesComponent, LatheGetRecipesEvent>(GetEmagLatheRecipes);
             SubscribeLocalEvent<LatheHeatProducingComponent, LatheStartPrintingEvent>(OnHeatStartPrinting);
         }
-
         public override void Update(float frameTime)
         {
             var query = EntityQueryEnumerator<LatheProducingComponent, LatheComponent>();
@@ -119,7 +128,7 @@ private void OnGetWhitelist(EntityUid uid, LatheComponent component, ref GetMate
             {
                 if (!_proto.TryIndex(id, out var proto))
                     continue;
-                foreach (var (mat, _) in proto.RequiredMaterials)
+                foreach (var (mat, _) in proto.Materials)
                 {
                     if (!materialWhitelist.Contains(mat))
                     {
@@ -165,7 +174,7 @@ public bool TryAddToQueue(EntityUid uid, LatheRecipePrototype recipe, LatheCompo
             if (!CanProduce(uid, recipe, 1, component))
                 return false;
 
-            foreach (var (mat, amount) in recipe.RequiredMaterials)
+            foreach (var (mat, amount) in recipe.Materials)
             {
                 var adjustedAmount = recipe.ApplyMaterialDiscount
                     ? (int) (-amount * component.MaterialUseMultiplier)
@@ -211,8 +220,31 @@ public void FinishProducing(EntityUid uid, LatheComponent? comp = null, LathePro
 
             if (comp.CurrentRecipe != null)
             {
-                var result = Spawn(comp.CurrentRecipe.Result, Transform(uid).Coordinates);
-                _stack.TryMergeToContacts(result);
+                if (comp.CurrentRecipe.Result is { } resultProto)
+                {
+                    var result = Spawn(resultProto, Transform(uid).Coordinates);
+                    _stack.TryMergeToContacts(result);
+                }
+
+                if (comp.CurrentRecipe.ResultReagents is { } resultReagents &&
+                    comp.ReagentOutputSlotId is { } slotId)
+                {
+                    var toAdd = new Solution(
+                        resultReagents.Select(p => new ReagentQuantity(p.Key.Id, p.Value, null)));
+
+                    // dispense it in the container if we have it and dump it if we don't
+                    if (_container.TryGetContainer(uid, slotId, out var container) &&
+                        container.ContainedEntities.Count == 1 &&
+                        _solution.TryGetFitsInDispenser(container.ContainedEntities.First(), out var solution, out _))
+                    {
+                        _solution.AddSolution(solution.Value, toAdd);
+                    }
+                    else
+                    {
+                        _popup.PopupEntity(Loc.GetString("lathe-reagent-dispense-no-container", ("name", uid)), uid);
+                        _puddle.TrySpillAt(uid, toAdd, out _);
+                    }
+                }
             }
 
             comp.CurrentRecipe = null;
@@ -327,6 +359,7 @@ protected override bool HasRecipe(EntityUid uid, LatheRecipePrototype recipe, La
         {
             return GetAvailableRecipes(uid, component).Contains(recipe.ID);
         }
+
         #region UI Messages
 
         private void OnLatheQueueRecipeMessage(EntityUid uid, LatheComponent component, LatheQueueRecipeMessage args)
@@ -343,8 +376,9 @@ private void OnLatheQueueRecipeMessage(EntityUid uid, LatheComponent component,
                 }
                 if (count > 0)
                 {
-                    _adminLogger.Add(LogType.Action, LogImpact.Low,
-                        $"{ToPrettyString(args.Actor):player} queued {count} {recipe.Name} at {ToPrettyString(uid):lathe}");
+                    _adminLogger.Add(LogType.Action,
+                        LogImpact.Low,
+                        $"{ToPrettyString(args.Actor):player} queued {count} {GetRecipeName(recipe)} at {ToPrettyString(uid):lathe}");
                 }
             }
             TryStartProducing(uid, component);
diff --git a/Content.Server/Lightning/LightningSystem.cs b/Content.Server/Lightning/LightningSystem.cs
index 94f3ab88023..8b0a18afb35 100644
--- a/Content.Server/Lightning/LightningSystem.cs
+++ b/Content.Server/Lightning/LightningSystem.cs
@@ -76,9 +76,9 @@ public void ShootRandomLightnings(EntityUid user, float range, int boltCount, st
         //TODO: This is still pretty bad for perf but better than before and at least it doesn't re-allocate
         // several hashsets every time
 
-        var targets = _lookup.GetComponentsInRange<LightningTargetComponent>(_transform.GetMapCoordinates(user), range).ToList();
+        var targets = _lookup.GetEntitiesInRange<LightningTargetComponent>(_transform.GetMapCoordinates(user), range).ToList();
         _random.Shuffle(targets);
-        targets.Sort((x, y) => y.Priority.CompareTo(x.Priority));
+        targets.Sort((x, y) => y.Comp.Priority.CompareTo(x.Comp.Priority));
 
         int shootedCount = 0;
         int count = -1;
@@ -89,13 +89,13 @@ public void ShootRandomLightnings(EntityUid user, float range, int boltCount, st
             if (count >= targets.Count) { break; }
 
             var curTarget = targets[count];
-            if (!_random.Prob(curTarget.HitProbability)) //Chance to ignore target
+            if (!_random.Prob(curTarget.Comp.HitProbability)) //Chance to ignore target
                 continue;
 
             ShootLightning(user, targets[count].Owner, lightningPrototype, triggerLightningEvents);
-            if (arcDepth - targets[count].LightningResistance > 0)
+            if (arcDepth - targets[count].Comp.LightningResistance > 0)
             {
-                ShootRandomLightnings(targets[count].Owner, range, 1, lightningPrototype, arcDepth - targets[count].LightningResistance, triggerLightningEvents);
+                ShootRandomLightnings(targets[count].Owner, range, 1, lightningPrototype, arcDepth - targets[count].Comp.LightningResistance, triggerLightningEvents);
             }
             shootedCount++;
         }
diff --git a/Content.Server/Mapping/MappingManager.cs b/Content.Server/Mapping/MappingManager.cs
new file mode 100644
index 00000000000..e8c6eca204c
--- /dev/null
+++ b/Content.Server/Mapping/MappingManager.cs
@@ -0,0 +1,76 @@
+using System.IO;
+using Content.Server.Administration.Managers;
+using Content.Shared.Administration;
+using Content.Shared.Mapping;
+using Robust.Server.GameObjects;
+using Robust.Server.Player;
+using Robust.Shared.Map;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+using YamlDotNet.Core;
+using YamlDotNet.RepresentationModel;
+
+namespace Content.Server.Mapping;
+
+public sealed class MappingManager : IPostInjectInit
+{
+    [Dependency] private readonly IAdminManager _admin = default!;
+    [Dependency] private readonly ILogManager _log = default!;
+    [Dependency] private readonly IMapManager _map = default!;
+    [Dependency] private readonly IServerNetManager _net = default!;
+    [Dependency] private readonly IPlayerManager _players = default!;
+    [Dependency] private readonly IEntitySystemManager _systems = default!;
+
+    private ISawmill _sawmill = default!;
+    private ZStdCompressionContext _zstd = default!;
+
+    public void PostInject()
+    {
+#if !FULL_RELEASE
+        _net.RegisterNetMessage<MappingSaveMapMessage>(OnMappingSaveMap);
+        _net.RegisterNetMessage<MappingSaveMapErrorMessage>();
+        _net.RegisterNetMessage<MappingMapDataMessage>();
+
+        _sawmill = _log.GetSawmill("mapping");
+        _zstd = new ZStdCompressionContext();
+#endif
+    }
+
+    private void OnMappingSaveMap(MappingSaveMapMessage message)
+    {
+#if !FULL_RELEASE
+        try
+        {
+            if (!_players.TryGetSessionByChannel(message.MsgChannel, out var session) ||
+                !_admin.IsAdmin(session, true) ||
+                !_admin.HasAdminFlag(session, AdminFlags.Host) ||
+                session.AttachedEntity is not { } player)
+            {
+                return;
+            }
+
+            var mapId = _systems.GetEntitySystem<TransformSystem>().GetMapCoordinates(player).MapId;
+            var mapEntity = _map.GetMapEntityIdOrThrow(mapId);
+            var data = _systems.GetEntitySystem<MapLoaderSystem>().GetSaveData(mapEntity);
+            var document = new YamlDocument(data.ToYaml());
+            var stream = new YamlStream { document };
+            var writer = new StringWriter();
+            stream.Save(new YamlMappingFix(new Emitter(writer)), false);
+
+            var msg = new MappingMapDataMessage()
+            {
+                Context = _zstd,
+                Yml = writer.ToString()
+            };
+            _net.ServerSendMessage(msg, message.MsgChannel);
+        }
+        catch (Exception e)
+        {
+            _sawmill.Error($"Error saving map in mapping mode:\n{e}");
+            var msg = new MappingSaveMapErrorMessage();
+            _net.ServerSendMessage(msg, message.MsgChannel);
+        }
+#endif
+    }
+}
diff --git a/Content.Server/Medical/VomitSystem.cs b/Content.Server/Medical/VomitSystem.cs
index 8c3b15aed33..ec04a27db63 100644
--- a/Content.Server/Medical/VomitSystem.cs
+++ b/Content.Server/Medical/VomitSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics;
 using Content.Server.Popups;
@@ -24,7 +24,7 @@ public sealed class VomitSystem : EntitySystem
         [Dependency] private readonly HungerSystem _hunger = default!;
         [Dependency] private readonly PopupSystem _popup = default!;
         [Dependency] private readonly PuddleSystem _puddle = default!;
-        [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
+        [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
         [Dependency] private readonly StunSystem _stun = default!;
         [Dependency] private readonly ThirstSystem _thirst = default!;
         [Dependency] private readonly ForensicsSystem _forensics = default!;
@@ -35,7 +35,7 @@ public sealed class VomitSystem : EntitySystem
         public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -40f)
         {
             // Main requirement: You have a stomach
-            var stomachList = _body.GetBodyOrganComponents<StomachComponent>(uid);
+            var stomachList = _body.GetBodyOrganEntityComps<StomachComponent>(uid);
             if (stomachList.Count == 0)
                 return;
 
@@ -58,11 +58,11 @@ public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -
             // Empty the stomach out into it
             foreach (var stomach in stomachList)
             {
-                if (_solutionContainer.ResolveSolution(stomach.Comp.Owner, StomachSystem.DefaultSolutionName, ref stomach.Comp.Solution, out var sol))
+                if (_solutionContainer.ResolveSolution(stomach.Owner, StomachSystem.DefaultSolutionName, ref stomach.Comp1.Solution, out var sol))
                 {
                     solution.AddSolution(sol, _proto);
                     sol.RemoveAllSolution();
-                    _solutionContainer.UpdateChemicals(stomach.Comp.Solution.Value);
+                    _solutionContainer.UpdateChemicals(stomach.Comp1.Solution.Value);
                 }
             }
             // Adds a tiny amount of the chem stream from earlier along with vomit
@@ -79,7 +79,7 @@ public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -
                     vomitChemstreamAmount.ScaleSolution(chemMultiplier);
                     solution.AddSolution(vomitChemstreamAmount, _proto);
 
-                    vomitAmount -= (float) vomitChemstreamAmount.Volume;
+                    vomitAmount -= (float)vomitChemstreamAmount.Volume;
                 }
 
                 // Makes a vomit solution the size of 90% of the chemicals removed from the chemstream
diff --git a/Content.Server/NPC/HTN/Preconditions/HandcuffedPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/HandcuffedPrecondition.cs
new file mode 100644
index 00000000000..4a56eeb9539
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/HandcuffedPrecondition.cs
@@ -0,0 +1,26 @@
+using Content.Server.Cuffs;
+using Content.Shared.Cuffs.Components;
+
+namespace Content.Server.NPC.HTN.Preconditions;
+
+public sealed partial class HandcuffedPrecondition : HTNPrecondition
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    [DataField]
+    public bool ReactOnlyWhenFullyCuffed = true;
+
+    public override bool IsMet(NPCBlackboard blackboard)
+    {
+        var cuffable = _entManager.System<CuffableSystem>();
+        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
+
+        if (!_entManager.TryGetComponent<CuffableComponent>(owner, out var cuffComp))
+            return false;
+
+        var target = (owner, cuffComp);
+
+        return cuffable.IsCuffed(target, ReactOnlyWhenFullyCuffed);
+    }
+
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs
index 8e3ab5238a3..7d6f0005730 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs
@@ -1,5 +1,6 @@
 using Content.Server.Interaction;
 using Content.Shared.CombatMode;
+using Content.Shared.DoAfter;
 using Content.Shared.Timing;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions;
@@ -7,6 +8,13 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions;
 public sealed partial class InteractWithOperator : HTNOperator
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
+    private SharedDoAfterSystem _doAfterSystem = default!;
+
+    public override void Initialize(IEntitySystemManager sysManager)
+    {
+        base.Initialize(sysManager);
+        _doAfterSystem = sysManager.GetEntitySystem<SharedDoAfterSystem>();
+    }
 
     /// <summary>
     /// Key that contains the target entity.
@@ -14,10 +22,53 @@ public sealed partial class InteractWithOperator : HTNOperator
     [DataField(required: true)]
     public string TargetKey = default!;
 
+    /// <summary>
+    /// Exit with failure if doafter wasn't raised
+    /// </summary>
+    [DataField]
+    public bool ExpectDoAfter = false;
+
+    public string CurrentDoAfter = "CurrentInteractWithDoAfter";
+
+
+    // Ensure that CurrentDoAfter doesn't exist as we enter this operator,
+    // the code currently relies on the result of a TryGetValue
+    public override void Startup(NPCBlackboard blackboard)
+    {
+        blackboard.Remove<ushort>(CurrentDoAfter);
+
+    }
+
+    // Not really sure if we should clean it up, I guess some operator could use it
+    public override void TaskShutdown(NPCBlackboard blackboard, HTNOperatorStatus status)
+    {
+        blackboard.Remove<ushort>(CurrentDoAfter);
+    }
+
     public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
     {
         var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
 
+        // Handle ongoing doAfter, and store the doAfter.nextId so we can detect if we started one
+        ushort nextId = 0;
+        if (_entManager.TryGetComponent<DoAfterComponent>(owner, out var doAfter))
+        {
+            // if CurrentDoAfter contains something, we have an active doAfter
+            if (blackboard.TryGetValue<ushort>(CurrentDoAfter, out var doAfterId, _entManager))
+            {
+                var status = _doAfterSystem.GetStatus(owner, doAfterId, null);
+                return status switch
+                {
+                    DoAfterStatus.Running => HTNOperatorStatus.Continuing,
+                    DoAfterStatus.Finished => HTNOperatorStatus.Finished,
+                    _ => HTNOperatorStatus.Failed
+                };
+            }
+
+            nextId = doAfter.NextId;
+        }
+
+
         if (_entManager.TryGetComponent<UseDelayComponent>(owner, out var useDelay) && _entManager.System<UseDelaySystem>().IsDelayed((owner, useDelay)) ||
             !blackboard.TryGetValue<EntityUid>(TargetKey, out var moveTarget, _entManager) ||
             !_entManager.TryGetComponent<TransformComponent>(moveTarget, out var targetXform))
@@ -31,6 +82,18 @@ public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTi
         }
 
         _entManager.System<InteractionSystem>().UserInteraction(owner, targetXform.Coordinates, moveTarget);
+
+        // Detect doAfter, save it, and don't exit from this operator
+        if (doAfter != null && nextId != doAfter.NextId)
+        {
+            blackboard.SetValue(CurrentDoAfter, nextId);
+            return HTNOperatorStatus.Continuing;
+        }
+
+        // We shouldn't arrive here if we start a doafter, so fail if we expected a doafter
+        if(ExpectDoAfter)
+            return HTNOperatorStatus.Failed;
+
         return HTNOperatorStatus.Finished;
     }
 }
diff --git a/Content.Server/Nuke/NukeCodePaperSystem.cs b/Content.Server/Nuke/NukeCodePaperSystem.cs
index 8025e2bbd51..e890aa0845f 100644
--- a/Content.Server/Nuke/NukeCodePaperSystem.cs
+++ b/Content.Server/Nuke/NukeCodePaperSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Fax;
 using Content.Shared.Fax.Components;
-using Content.Server.Paper;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Paper;
@@ -38,7 +37,8 @@ private void SetupPaper(EntityUid uid, NukeCodePaperComponent? component = null,
 
             if (TryGetRelativeNukeCode(uid, out var paperContent, station, onlyCurrentStation: component.AllNukesAvailable))
             {
-                _paper.SetContent(uid, paperContent);
+                if (TryComp<PaperComponent>(uid, out var paperComp))
+                    _paper.SetContent((uid, paperComp), paperContent);
             }
         }
 
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index 36c4ef4b551..ab4ce450d88 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -258,7 +258,7 @@ private void OnDoAfter(Entity<DrinkComponent> entity, ref ConsumeDoAfterEvent ar
         if (transferAmount <= 0)
             return;
 
-        if (!_body.TryGetBodyOrganComponents<StomachComponent>(args.Target.Value, out var stomachs, body))
+        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>((args.Target.Value, body), out var stomachs))
         {
             _popup.PopupEntity(Loc.GetString(forceDrink ? "drink-component-try-use-drink-cannot-drink-other" : "drink-component-try-use-drink-had-enough"), args.Target.Value, args.User);
 
@@ -272,7 +272,7 @@ private void OnDoAfter(Entity<DrinkComponent> entity, ref ConsumeDoAfterEvent ar
             return;
         }
 
-        var firstStomach = stomachs.FirstOrNull(stomach => _stomach.CanTransferSolution(stomach.Comp.Owner, drained, stomach.Comp));
+        var firstStomach = stomachs.FirstOrNull(stomach => _stomach.CanTransferSolution(stomach.Owner, drained, stomach.Comp1));
 
         //All stomachs are full or can't handle whatever solution we have.
         if (firstStomach == null)
@@ -321,8 +321,7 @@ private void OnDoAfter(Entity<DrinkComponent> entity, ref ConsumeDoAfterEvent ar
         _audio.PlayPvs(entity.Comp.UseSound, args.Target.Value, AudioParams.Default.WithVolume(-2f));
 
         _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion);
-        //TODO: Grab the stomach UIDs somehow without using Owner
-        _stomach.TryTransferSolution(firstStomach.Value.Comp.Owner, drained, firstStomach.Value.Comp);
+        _stomach.TryTransferSolution(firstStomach.Value.Owner, drained, firstStomach.Value.Comp1);
 
         _forensics.TransferDna(entity, args.Target.Value);
 
@@ -336,7 +335,7 @@ private void AddDrinkVerb(Entity<DrinkComponent> entity, ref GetVerbsEvent<Alter
             !ev.CanInteract ||
             !ev.CanAccess ||
             !TryComp<BodyComponent>(ev.User, out var body) ||
-            !_body.TryGetBodyOrganComponents<StomachComponent>(ev.User, out var stomachs, body))
+            !_body.TryGetBodyOrganEntityComps<StomachComponent>((ev.User, body), out var stomachs))
             return;
 
         // Make sure the solution exists
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index 4d670a3eb77..53c1b399821 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Server.Inventory;
 using Content.Server.Nutrition.Components;
 using Content.Shared.Nutrition.Components;
@@ -53,7 +53,7 @@ public sealed class FoodSystem : EntitySystem
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-    [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly StomachSystem _stomach = default!;
@@ -121,7 +121,7 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
         if (!_solutionContainer.TryGetSolution(food, foodComp.Solution, out _, out var foodSolution))
             return (false, false);
 
-        if (!_body.TryGetBodyOrganComponents<StomachComponent>(target, out var stomachs, body))
+        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>((target, body), out var stomachs))
             return (false, false);
 
         // Check for special digestibles
@@ -182,12 +182,12 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
                 user, target);
 
             // logging
-            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to eat {ToPrettyString(food):food} {SolutionContainerSystem.ToPrettyString(foodSolution)}");
+            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to eat {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}");
         }
         else
         {
             // log voluntary eating
-            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is eating {ToPrettyString(food):food} {SolutionContainerSystem.ToPrettyString(foodSolution)}");
+            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is eating {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}");
         }
 
         var doAfterArgs = new DoAfterArgs(EntityManager,
@@ -220,7 +220,7 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
         if (!TryComp<BodyComponent>(args.Target.Value, out var body))
             return;
 
-        if (!_body.TryGetBodyOrganComponents<StomachComponent>(args.Target.Value, out var stomachs, body))
+        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>((args.Target.Value, body), out var stomachs))
             return;
 
         if (args.Used is null || !_solutionContainer.TryGetSolution(args.Used.Value, args.Solution, out var soln, out var solution))
@@ -244,23 +244,22 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
 
         var split = _solutionContainer.SplitSolution(soln.Value, transferAmount);
 
-        //TODO: Get the stomach UID somehow without nabbing owner
         // Get the stomach with the highest available solution volume
         var highestAvailable = FixedPoint2.Zero;
-        StomachComponent? stomachToUse = null;
-        foreach (var (stomach, _) in stomachs)
+        Entity<StomachComponent>? stomachToUse = null;
+        foreach (var ent in stomachs)
         {
-            var owner = stomach.Owner;
-            if (!_stomach.CanTransferSolution(owner, split, stomach))
+            var owner = ent.Owner;
+            if (!_stomach.CanTransferSolution(owner, split, ent.Comp1))
                 continue;
 
-            if (!_solutionContainer.ResolveSolution(owner, StomachSystem.DefaultSolutionName, ref stomach.Solution, out var stomachSol))
+            if (!_solutionContainer.ResolveSolution(owner, StomachSystem.DefaultSolutionName, ref ent.Comp1.Solution, out var stomachSol))
                 continue;
 
             if (stomachSol.AvailableVolume <= highestAvailable)
                 continue;
 
-            stomachToUse = stomach;
+            stomachToUse = ent;
             highestAvailable = stomachSol.AvailableVolume;
         }
 
@@ -273,7 +272,7 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
         }
 
         _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion);
-        _stomach.TryTransferSolution(stomachToUse.Owner, split, stomachToUse);
+        _stomach.TryTransferSolution(stomachToUse!.Value.Owner, split, stomachToUse);
 
         var flavors = args.FlavorMessage;
 
@@ -365,7 +364,7 @@ private void AddEatVerb(Entity<FoodComponent> entity, ref GetVerbsEvent<Alternat
             !ev.CanInteract ||
             !ev.CanAccess ||
             !TryComp<BodyComponent>(ev.User, out var body) ||
-            !_body.TryGetBodyOrganComponents<StomachComponent>(ev.User, out var stomachs, body))
+            !_body.TryGetBodyOrganEntityComps<StomachComponent>((ev.User, body), out var stomachs))
             return;
 
         // have to kill mouse before eating it
@@ -399,7 +398,7 @@ public bool IsDigestibleBy(EntityUid uid, EntityUid food, FoodComponent? foodCom
         if (!Resolve(food, ref foodComp, false))
             return false;
 
-        if (!_body.TryGetBodyOrganComponents<StomachComponent>(uid, out var stomachs))
+        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>(uid, out var stomachs))
             return false;
 
         return IsDigestibleBy(food, foodComp, stomachs);
@@ -409,7 +408,7 @@ public bool IsDigestibleBy(EntityUid uid, EntityUid food, FoodComponent? foodCom
     ///     Returns true if <paramref name="stomachs"/> has a <see cref="StomachComponent.SpecialDigestible"/> that whitelists
     ///     this <paramref name="food"/> (or if they even have enough stomachs in the first place).
     /// </summary>
-    private bool IsDigestibleBy(EntityUid food, FoodComponent component, List<(StomachComponent, OrganComponent)> stomachs)
+    private bool IsDigestibleBy(EntityUid food, FoodComponent component, List<Entity<StomachComponent, OrganComponent>> stomachs)
     {
         var digestible = true;
 
@@ -418,13 +417,13 @@ private bool IsDigestibleBy(EntityUid food, FoodComponent component, List<(Stoma
             return false;
 
         // Run through the mobs' stomachs
-        foreach (var (comp, _) in stomachs)
+        foreach (var ent in stomachs)
         {
             // Find a stomach with a SpecialDigestible
-            if (comp.SpecialDigestible == null)
+            if (ent.Comp1.SpecialDigestible == null)
                 continue;
             // Check if the food is in the whitelist
-            if (_whitelistSystem.IsWhitelistPass(comp.SpecialDigestible, food))
+            if (_whitelistSystem.IsWhitelistPass(ent.Comp1.SpecialDigestible, food))
                 return true;
             // They can only eat whitelist food and the food isn't in the whitelist. It's not edible.
             return false;
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
index a33c944c994..7f8253efedf 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
@@ -142,7 +142,7 @@ public override void Update(float frameTime)
 
                 // This is awful. I hate this so much.
                 // TODO: Please, someone refactor containers and free me from this bullshit.
-                if (!_container.TryGetContainingContainer(uid, out var containerManager) ||
+                if (!_container.TryGetContainingContainer((uid, null, null), out var containerManager) ||
                     !(_inventorySystem.TryGetSlotEntity(containerManager.Owner, "mask", out var inMaskSlotUid) && inMaskSlotUid == uid) ||
                     !TryComp(containerManager.Owner, out BloodstreamComponent? bloodstream))
                 {
diff --git a/Content.Server/Nutrition/Hungry.cs b/Content.Server/Nutrition/Hungry.cs
index ae68dcd2fda..ce5e14ce091 100644
--- a/Content.Server/Nutrition/Hungry.cs
+++ b/Content.Server/Nutrition/Hungry.cs
@@ -4,40 +4,35 @@
 using Content.Shared.Nutrition.EntitySystems;
 using Robust.Shared.Console;
 
-namespace Content.Server.Nutrition
-{
-    [AdminCommand(AdminFlags.Debug)]
-    public sealed class Hungry : IConsoleCommand
-    {
-        [Dependency] private readonly IEntityManager _entities = default!;
+namespace Content.Server.Nutrition;
 
-        public string Command => "hungry";
-        public string Description => "Makes you hungry.";
-        public string Help => $"{Command}";
+[AdminCommand(AdminFlags.Debug)]
+public sealed class Hungry : LocalizedEntityCommands
+{
+    public override string Command => "hungry";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var player = shell.Player;
+        if (player == null)
         {
-            var player = shell.Player;
-            if (player == null)
-            {
-                shell.WriteLine("You cannot use this command unless you are a player.");
-                return;
-            }
-
-            if (player.AttachedEntity is not {Valid: true} playerEntity)
-            {
-                shell.WriteLine("You cannot use this command without an entity.");
-                return;
-            }
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-player"));
+            return;
+        }
 
-            if (!_entities.TryGetComponent(playerEntity, out HungerComponent? hunger))
-            {
-                shell.WriteLine($"Your entity does not have a {nameof(HungerComponent)} component.");
-                return;
-            }
+        if (player.AttachedEntity is not {Valid: true} playerEntity)
+        {
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-entity"));
+            return;
+        }
 
-            var hungryThreshold = hunger.Thresholds[HungerThreshold.Starving];
-            _entities.System<HungerSystem>().SetHunger(playerEntity, hungryThreshold, hunger);
+        if (!EntityManager.TryGetComponent(playerEntity, out HungerComponent? hunger))
+        {
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-component", ("comp", nameof(HungerComponent))));
+            return;
         }
+
+        var hungryThreshold = hunger.Thresholds[HungerThreshold.Starving];
+        EntityManager.System<HungerSystem>().SetHunger(playerEntity, hungryThreshold, hunger);
     }
 }
diff --git a/Content.Server/Nutrition/SetNutrit.cs b/Content.Server/Nutrition/SetNutrit.cs
new file mode 100644
index 00000000000..c7c716b78cc
--- /dev/null
+++ b/Content.Server/Nutrition/SetNutrit.cs
@@ -0,0 +1,115 @@
+using Content.Server.Administration;
+using Content.Server.Database.Migrations.Postgres;
+using Content.Shared.Administration;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Console;
+using System.Linq;
+
+namespace Content.Server.Nutrition;
+
+[AdminCommand(AdminFlags.Debug)]
+public sealed class SetNutrit : LocalizedEntityCommands
+{
+    public override string Command => "setnutrit";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var player = shell.Player;
+        if (player == null)
+        {
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-player"));
+            return;
+        }
+
+        if (player.AttachedEntity is not { Valid: true } playerEntity)
+        {
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-entity"));
+            return;
+        }
+
+        if (args.Length != 2)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number-need-specific",
+                ("properAmount", 2),
+                ("currentAmount", args.Length)
+            ));
+            return;
+        }
+
+        var systemString = args[0];
+        switch (systemString)
+        {
+            case "hunger":
+            {
+                if (!EntityManager.TryGetComponent(playerEntity, out HungerComponent? hunger))
+                {
+                    shell.WriteError(Loc.GetString("cmd-nutrition-error-component", ("comp", nameof(HungerComponent))));
+                    return;
+                }
+
+                if (!Enum.TryParse(args[1], out HungerThreshold hungerThreshold))
+                {
+                    shell.WriteError(Loc.GetString("cmd-setnutrit-error-invalid-threshold",
+                        ("thresholdType", nameof(HungerThreshold)),
+                        ("thresholdString", args[1])
+                    ));
+                    return;
+                }
+
+                var hungerValue = hunger.Thresholds[hungerThreshold];
+                EntityManager.System<HungerSystem>().SetHunger(playerEntity, hungerValue, hunger);
+                return;
+            }
+            case "thirst":
+            {
+                if (!EntityManager.TryGetComponent(playerEntity, out ThirstComponent? thirst))
+                {
+                    shell.WriteError(Loc.GetString("cmd-nutrition-error-component", ("comp", nameof(ThirstComponent))));
+                    return;
+                }
+
+                if (!Enum.TryParse(args[1], out ThirstThreshold thirstThreshold))
+                {
+                    shell.WriteError(Loc.GetString("cmd-setnutrit-error-invalid-threshold",
+                         ("thresholdType", nameof(ThirstThreshold)),
+                         ("thresholdString", args[1])
+                     ));
+                    return;
+                }
+
+                var thirstValue = thirst.ThirstThresholds[thirstThreshold];
+                EntityManager.System<ThirstSystem>().SetThirst(playerEntity, thirst, thirstValue);
+                return;
+            }
+            default:
+            {
+                shell.WriteError($"invalid nutrition system ${systemString}");
+                return;
+            }
+        }
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        switch (args.Length)
+        {
+            case 1:
+            {
+                string[] kinds = { "hunger", "thirst" };
+                return CompletionResult.FromHintOptions(kinds, "nutrition system");
+            }
+            case 2:
+            {
+                return args[0] switch
+                {
+                    "hunger" => CompletionResult.FromHintOptions(Enum.GetNames<HungerThreshold>(), nameof(HungerThreshold)),
+                    "thirst" => CompletionResult.FromHintOptions(Enum.GetNames<ThirstThreshold>(), nameof(ThirstThreshold)),
+                    _ => CompletionResult.Empty,
+                };
+            }
+            default:
+                return CompletionResult.Empty;
+        }
+    }
+}
diff --git a/Content.Server/Nutrition/Thirsty.cs b/Content.Server/Nutrition/Thirsty.cs
new file mode 100644
index 00000000000..8725a62be21
--- /dev/null
+++ b/Content.Server/Nutrition/Thirsty.cs
@@ -0,0 +1,38 @@
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Console;
+
+namespace Content.Server.Nutrition;
+
+[AdminCommand(AdminFlags.Debug)]
+public sealed class Thirsty : LocalizedEntityCommands
+{
+    public override string Command => "thirsty";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var player = shell.Player;
+        if (player == null)
+        {
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-player"));
+            return;
+        }
+
+        if (player.AttachedEntity is not {Valid: true} playerEntity)
+        {
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-entity"));
+            return;
+        }
+
+        if (!EntityManager.TryGetComponent(playerEntity, out ThirstComponent? thirst))
+        {
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-component", ("comp", nameof(ThirstComponent))));
+            return;
+        }
+
+        var thirstyThreshold = thirst.ThirstThresholds[ThirstThreshold.Parched];
+        EntityManager.System<ThirstSystem>().SetThirst(playerEntity, thirst, thirstyThreshold);
+    }
+}
diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs
index e277fcff6f1..ac080d9966b 100644
--- a/Content.Server/PDA/PdaSystem.cs
+++ b/Content.Server/PDA/PdaSystem.cs
@@ -133,7 +133,7 @@ private void OnNotification(Entity<PdaComponent> ent, ref CartridgeLoaderNotific
         {
             _ringer.RingerPlayRingtone(ent.Owner);
 
-            if (!_containerSystem.TryGetContainingContainer(ent, out var container)
+            if (!_containerSystem.TryGetContainingContainer((ent, null, null), out var container)
                 || !TryComp<ActorComponent>(container.Owner, out var actor))
                 return;
 
diff --git a/Content.Server/Paper/PaperComponent.cs b/Content.Server/Paper/PaperComponent.cs
deleted file mode 100644
index 7b04a77d579..00000000000
--- a/Content.Server/Paper/PaperComponent.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Shared.Paper;
-
-namespace Content.Server.Paper;
-
-[RegisterComponent]
-public sealed partial class PaperComponent : SharedPaperComponent
-{
-    public PaperAction Mode;
-    [DataField("content")]
-    public string Content { get; set; } = "";
-
-    [DataField("contentSize")]
-    public int ContentSize { get; set; } = 6000;
-
-    [DataField("stampedBy")]
-    public List<StampDisplayInfo> StampedBy { get; set; } = new();
-
-    /// <summary>
-    ///     Stamp to be displayed on the paper, state from beauracracy.rsi
-    /// </summary>
-    [DataField("stampState")]
-    public string? StampState { get; set; }
-
-    [DataField]
-    public bool EditingDisabled = false;
-}
diff --git a/Content.Server/Paper/PaperRandomStorySystem.cs b/Content.Server/Paper/PaperRandomStorySystem.cs
index 156718f5450..2e43058197b 100644
--- a/Content.Server/Paper/PaperRandomStorySystem.cs
+++ b/Content.Server/Paper/PaperRandomStorySystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Paper;
 using Content.Shared.StoryGen;
 
 namespace Content.Server.Paper;
@@ -11,10 +12,10 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<PaperRandomStoryComponent, MapInitEvent>(OnMapinit);
+        SubscribeLocalEvent<PaperRandomStoryComponent, MapInitEvent>(OnMapInit);
     }
 
-    private void OnMapinit(Entity<PaperRandomStoryComponent> paperStory, ref MapInitEvent ev)
+    private void OnMapInit(Entity<PaperRandomStoryComponent> paperStory, ref MapInitEvent ev)
     {
         if (!TryComp<PaperComponent>(paperStory, out var paper))
             return;
@@ -22,6 +23,6 @@ private void OnMapinit(Entity<PaperRandomStoryComponent> paperStory, ref MapInit
         if (!_storyGen.TryGenerateStoryFromTemplate(paperStory.Comp.Template, out var story))
             return;
 
-        _paper.SetContent(paperStory.Owner, story, paper);
+        _paper.SetContent((paperStory.Owner, paper), story);
     }
 }
diff --git a/Content.Server/Paper/PaperSystem.cs b/Content.Server/Paper/PaperSystem.cs
deleted file mode 100644
index 3935df83701..00000000000
--- a/Content.Server/Paper/PaperSystem.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-using System.Linq;
-using Content.Server.Administration.Logs;
-using Content.Server.Popups;
-using Content.Shared.UserInterface;
-using Content.Shared.Database;
-using Content.Shared.Examine;
-using Content.Shared.Interaction;
-using Content.Shared.Paper;
-using Content.Shared.Tag;
-using Robust.Server.GameObjects;
-using Robust.Shared.Player;
-using Robust.Shared.Audio.Systems;
-using static Content.Shared.Paper.SharedPaperComponent;
-
-namespace Content.Server.Paper
-{
-    public sealed class PaperSystem : EntitySystem
-    {
-        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-        [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-        [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly TagSystem _tagSystem = default!;
-        [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
-        [Dependency] private readonly MetaDataSystem _metaSystem = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<PaperComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<PaperComponent, BeforeActivatableUIOpenEvent>(BeforeUIOpen);
-            SubscribeLocalEvent<PaperComponent, ExaminedEvent>(OnExamined);
-            SubscribeLocalEvent<PaperComponent, InteractUsingEvent>(OnInteractUsing);
-            SubscribeLocalEvent<PaperComponent, PaperInputTextMessage>(OnInputTextMessage);
-
-            SubscribeLocalEvent<ActivateOnPaperOpenedComponent, PaperWriteEvent>(OnPaperWrite);
-
-            SubscribeLocalEvent<PaperComponent, MapInitEvent>(OnMapInit);
-        }
-
-        private void OnMapInit(EntityUid uid, PaperComponent paperComp, MapInitEvent args)
-        {
-            if (!string.IsNullOrEmpty(paperComp.Content))
-            {
-                paperComp.Content = Loc.GetString(paperComp.Content);
-            }
-        }
-
-        private void OnInit(EntityUid uid, PaperComponent paperComp, ComponentInit args)
-        {
-            paperComp.Mode = PaperAction.Read;
-            UpdateUserInterface(uid, paperComp);
-
-            if (TryComp<AppearanceComponent>(uid, out var appearance))
-            {
-                if (paperComp.Content != "")
-                    _appearance.SetData(uid, PaperVisuals.Status, PaperStatus.Written, appearance);
-
-                if (paperComp.StampState != null)
-                    _appearance.SetData(uid, PaperVisuals.Stamp, paperComp.StampState, appearance);
-            }
-
-        }
-
-        private void BeforeUIOpen(EntityUid uid, PaperComponent paperComp, BeforeActivatableUIOpenEvent args)
-        {
-            paperComp.Mode = PaperAction.Read;
-            UpdateUserInterface(uid, paperComp);
-        }
-
-        private void OnExamined(EntityUid uid, PaperComponent paperComp, ExaminedEvent args)
-        {
-            if (!args.IsInDetailsRange)
-                return;
-
-            using (args.PushGroup(nameof(PaperComponent)))
-            {
-                if (paperComp.Content != "")
-                    args.PushMarkup(
-                        Loc.GetString(
-                            "paper-component-examine-detail-has-words", ("paper", uid)
-                        )
-                    );
-
-                if (paperComp.StampedBy.Count > 0)
-                {
-                    var commaSeparated =
-                        string.Join(", ", paperComp.StampedBy.Select(s => Loc.GetString(s.StampedName)));
-                    args.PushMarkup(
-                        Loc.GetString(
-                            "paper-component-examine-detail-stamped-by", ("paper", uid), ("stamps", commaSeparated))
-                    );
-                }
-            }
-        }
-
-        private void OnInteractUsing(EntityUid uid, PaperComponent paperComp, InteractUsingEvent args)
-        {
-            // only allow editing if there are no stamps or when using a cyberpen
-            var editable = paperComp.StampedBy.Count == 0 || _tagSystem.HasTag(args.Used, "WriteIgnoreStamps");
-            if (_tagSystem.HasTag(args.Used, "Write") && editable)
-            {
-                if (paperComp.EditingDisabled)
-                {
-                    var paperEditingDisabledMessage = Loc.GetString("paper-tamper-proof-modified-message");
-                    _popupSystem.PopupEntity(paperEditingDisabledMessage, uid, args.User);
-
-                    args.Handled = true;
-                    return;
-                }
-                var writeEvent = new PaperWriteEvent(uid, args.User);
-                RaiseLocalEvent(args.Used, ref writeEvent);
-
-                paperComp.Mode = PaperAction.Write;
-                _uiSystem.OpenUi(uid, PaperUiKey.Key, args.User);
-                UpdateUserInterface(uid, paperComp);
-                args.Handled = true;
-                return;
-            }
-
-            // If a stamp, attempt to stamp paper
-            if (TryComp<StampComponent>(args.Used, out var stampComp) && TryStamp(uid, GetStampInfo(stampComp), stampComp.StampState, paperComp))
-            {
-                // successfully stamped, play popup
-                var stampPaperOtherMessage = Loc.GetString("paper-component-action-stamp-paper-other",
-                        ("user", args.User), ("target", args.Target), ("stamp", args.Used));
-
-                _popupSystem.PopupEntity(stampPaperOtherMessage, args.User, Filter.PvsExcept(args.User, entityManager: EntityManager), true);
-                var stampPaperSelfMessage = Loc.GetString("paper-component-action-stamp-paper-self",
-                        ("target", args.Target), ("stamp", args.Used));
-                _popupSystem.PopupEntity(stampPaperSelfMessage, args.User, args.User);
-
-                _audio.PlayPvs(stampComp.Sound, uid);
-
-                UpdateUserInterface(uid, paperComp);
-            }
-        }
-
-        private static StampDisplayInfo GetStampInfo(StampComponent stamp)
-        {
-            return new StampDisplayInfo
-            {
-                StampedName = stamp.StampedName,
-                StampedColor = stamp.StampedColor
-            };
-        }
-
-        private void OnInputTextMessage(EntityUid uid, PaperComponent paperComp, PaperInputTextMessage args)
-        {
-            if (args.Text.Length <= paperComp.ContentSize)
-            {
-                paperComp.Content = args.Text;
-
-                if (TryComp<AppearanceComponent>(uid, out var appearance))
-                    _appearance.SetData(uid, PaperVisuals.Status, PaperStatus.Written, appearance);
-
-                if (TryComp(uid, out MetaDataComponent? meta))
-                    _metaSystem.SetEntityDescription(uid, "", meta);
-
-                _adminLogger.Add(LogType.Chat, LogImpact.Low,
-                    $"{ToPrettyString(args.Actor):player} has written on {ToPrettyString(uid):entity} the following text: {args.Text}");
-
-                _audio.PlayPvs(paperComp.Sound, uid);
-            }
-
-            paperComp.Mode = PaperAction.Read;
-            UpdateUserInterface(uid, paperComp);
-        }
-
-        private void OnPaperWrite(EntityUid uid, ActivateOnPaperOpenedComponent comp, ref PaperWriteEvent args)
-        {
-            _interaction.UseInHandInteraction(args.User, uid);
-        }
-
-        /// <summary>
-        ///     Accepts the name and state to be stamped onto the paper, returns true if successful.
-        /// </summary>
-        public bool TryStamp(EntityUid uid, StampDisplayInfo stampInfo, string spriteStampState, PaperComponent? paperComp = null)
-        {
-            if (!Resolve(uid, ref paperComp))
-                return false;
-
-            if (!paperComp.StampedBy.Contains(stampInfo))
-            {
-                paperComp.StampedBy.Add(stampInfo);
-                if (paperComp.StampState == null && TryComp<AppearanceComponent>(uid, out var appearance))
-                {
-                    paperComp.StampState = spriteStampState;
-                    // Would be nice to be able to display multiple sprites on the paper
-                    // but most of the existing images overlap
-                    _appearance.SetData(uid, PaperVisuals.Stamp, paperComp.StampState, appearance);
-                }
-            }
-            return true;
-        }
-
-        public void SetContent(EntityUid uid, string content, PaperComponent? paperComp = null)
-        {
-            if (!Resolve(uid, ref paperComp))
-                return;
-
-            paperComp.Content = content + '\n';
-            UpdateUserInterface(uid, paperComp);
-
-            if (!TryComp<AppearanceComponent>(uid, out var appearance))
-                return;
-
-            var status = string.IsNullOrWhiteSpace(content)
-                ? PaperStatus.Blank
-                : PaperStatus.Written;
-
-            _appearance.SetData(uid, PaperVisuals.Status, status, appearance);
-        }
-
-        public void UpdateUserInterface(EntityUid uid, PaperComponent? paperComp = null)
-        {
-            if (!Resolve(uid, ref paperComp))
-                return;
-
-            _uiSystem.SetUiState(uid, PaperUiKey.Key, new PaperBoundUserInterfaceState(paperComp.Content, paperComp.StampedBy, paperComp.Mode));
-        }
-    }
-
-    /// <summary>
-    /// Event fired when using a pen on paper, opening the UI.
-    /// </summary>
-    [ByRefEvent]
-    public record struct PaperWriteEvent(EntityUid User, EntityUid Paper);
-}
diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index 6edc202d153..8b6839ddd0e 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -30,26 +30,26 @@ public override void Initialize()
             SubscribeLocalEvent<InputMoverComponent, PlayerDetachedEvent>(OnPlayerDetached);
         }
 
-        private void OnRelayPlayerAttached(EntityUid uid, RelayInputMoverComponent component, PlayerAttachedEvent args)
+        private void OnRelayPlayerAttached(Entity<RelayInputMoverComponent> entity, ref PlayerAttachedEvent args)
         {
-            if (MoverQuery.TryGetComponent(component.RelayEntity, out var inputMover))
-                SetMoveInput(inputMover, MoveButtons.None);
+            if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
+                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
         }
 
-        private void OnRelayPlayerDetached(EntityUid uid, RelayInputMoverComponent component, PlayerDetachedEvent args)
+        private void OnRelayPlayerDetached(Entity<RelayInputMoverComponent> entity, ref PlayerDetachedEvent args)
         {
-            if (MoverQuery.TryGetComponent(component.RelayEntity, out var inputMover))
-                SetMoveInput(inputMover, MoveButtons.None);
+            if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
+                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
         }
 
-        private void OnPlayerAttached(EntityUid uid, InputMoverComponent component, PlayerAttachedEvent args)
+        private void OnPlayerAttached(Entity<InputMoverComponent> entity, ref PlayerAttachedEvent args)
         {
-            SetMoveInput(component, MoveButtons.None);
+            SetMoveInput(entity, MoveButtons.None);
         }
 
-        private void OnPlayerDetached(EntityUid uid, InputMoverComponent component, PlayerDetachedEvent args)
+        private void OnPlayerDetached(Entity<InputMoverComponent> entity, ref PlayerDetachedEvent args)
         {
-            SetMoveInput(component, MoveButtons.None);
+            SetMoveInput(entity, MoveButtons.None);
         }
 
         protected override bool CanSound()
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
index b628773f43a..fb4f60726dd 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
@@ -6,6 +6,7 @@
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Events;
 using Content.Server.Mind;
+using Content.Server.Preferences.Managers;
 using Content.Server.Station.Events;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
@@ -13,6 +14,7 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Players;
 using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
@@ -36,6 +38,7 @@ public sealed class PlayTimeTrackingSystem : EntitySystem
     [Dependency] private readonly MindSystem _minds = default!;
     [Dependency] private readonly PlayTimeTrackingManager _tracking = default!;
     [Dependency] private readonly IAdminManager _adminManager = default!;
+    [Dependency] private readonly IServerPreferencesManager _preferencesManager = default!;
     private ISharedSponsorsManager? _sponsorsManager; // Sunrise-Sponsors
 
     public override void Initialize()
@@ -218,7 +221,7 @@ public bool IsAllowed(ICommonSession player, string role)
         }
         // Sunrise-Sponsors-End
 
-        return JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes);
+        return JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, (HumanoidCharacterProfile?) _preferencesManager.GetPreferences(player.UserId).SelectedCharacter);
     }
 
     public HashSet<ProtoId<JobPrototype>> GetDisallowedJobs(ICommonSession player)
@@ -235,7 +238,7 @@ public HashSet<ProtoId<JobPrototype>> GetDisallowedJobs(ICommonSession player)
 
         foreach (var job in _prototypes.EnumeratePrototypes<JobPrototype>())
         {
-            if (JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes))
+            if (JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, (HumanoidCharacterProfile?) _preferencesManager.GetPreferences(player.UserId).SelectedCharacter))
                 roles.Add(job.ID);
         }
 
@@ -259,7 +262,7 @@ public void RemoveDisallowedJobs(NetUserId userId, List<ProtoId<JobPrototype>> j
         {
 
             if (_prototypes.TryIndex(jobs[i], out var job)
-                && JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes))
+                && JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, (HumanoidCharacterProfile?) _preferencesManager.GetPreferences(userId).SelectedCharacter))
             {
                 continue;
             }
diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
index f2f60f3063e..d5ad1fb123e 100644
--- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Pointing.Components;
+using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.Examine;
 using Content.Shared.Eye;
@@ -14,6 +15,7 @@
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
+using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.GameStates;
 using Robust.Shared.Input.Binding;
@@ -27,6 +29,7 @@ namespace Content.Server.Pointing.EntitySystems
     [UsedImplicitly]
     internal sealed class PointingSystem : SharedPointingSystem
     {
+        [Dependency] private readonly IConfigurationManager _config = default!;
         [Dependency] private readonly IReplayRecordingManager _replay = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -40,7 +43,7 @@ internal sealed class PointingSystem : SharedPointingSystem
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
         [Dependency] private readonly ExamineSystemShared _examine = default!;
 
-        private static readonly TimeSpan PointDelay = TimeSpan.FromSeconds(0.5f);
+        private TimeSpan _pointDelay = TimeSpan.FromSeconds(0.5f);
 
         /// <summary>
         ///     A dictionary of players to the last time that they
@@ -124,7 +127,7 @@ public bool TryPoint(ICommonSession? session, EntityCoordinates coordsPointed, E
             }
 
             if (_pointers.TryGetValue(session, out var lastTime) &&
-                _gameTiming.CurTime < lastTime + PointDelay)
+                _gameTiming.CurTime < lastTime + _pointDelay)
             {
                 return false;
             }
@@ -257,6 +260,8 @@ public override void Initialize()
             CommandBinds.Builder
                 .Bind(ContentKeyFunctions.Point, new PointerInputCmdHandler(TryPoint))
                 .Register<PointingSystem>();
+
+            Subs.CVar(_config, CCVars.PointingCooldownSeconds, v => _pointDelay = TimeSpan.FromSeconds(v), true);
         }
 
         private void OnPointAttempt(PointingAttemptEvent ev, EntitySessionEventArgs args)
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
index d4a9159d44f..daff200982d 100644
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
@@ -211,7 +211,7 @@ private void OnDestruction(Entity<PolymorphedEntityComponent> ent, ref Destructi
         var childXform = Transform(child);
         _transform.SetLocalRotation(child, targetTransformComp.LocalRotation, childXform);
 
-        if (_container.TryGetContainingContainer(uid, out var cont))
+        if (_container.TryGetContainingContainer((uid, targetTransformComp, null), out var cont))
             _container.Insert(child, cont);
 
         //Transfers all damage from the original to the new one
diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs
index 038295eac11..4e2543d2a70 100644
--- a/Content.Server/Power/EntitySystems/ChargerSystem.cs
+++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs
@@ -43,7 +43,37 @@ private void OnStartup(EntityUid uid, ChargerComponent component, ComponentStart
 
     private void OnChargerExamine(EntityUid uid, ChargerComponent component, ExaminedEvent args)
     {
-        args.PushMarkup(Loc.GetString("charger-examine", ("color", "yellow"), ("chargeRate", (int) component.ChargeRate)));
+        using (args.PushGroup(nameof(ChargerComponent)))
+        {
+            // rate at which the charger charges
+            args.PushMarkup(Loc.GetString("charger-examine", ("color", "yellow"), ("chargeRate", (int) component.ChargeRate)));
+
+            // try to get contents of the charger
+            if (!_container.TryGetContainer(uid, component.SlotId, out var container))
+                return;
+
+            if (HasComp<PowerCellSlotComponent>(uid))
+                return;
+
+            // if charger is empty and not a power cell type charger, add empty message
+            // power cells have their own empty message by default, for things like flash lights
+            if (container.ContainedEntities.Count == 0)
+            {
+                args.PushMarkup(Loc.GetString("charger-empty"));
+            }
+            else
+            {
+                // add how much each item is charged it 
+                foreach (var contained in container.ContainedEntities)
+                {
+                    if (!TryComp<BatteryComponent>(contained, out var battery))
+                        continue;
+
+                    var chargePercentage = (battery.CurrentCharge / battery.MaxCharge) * 100;
+                    args.PushMarkup(Loc.GetString("charger-content", ("chargePercentage", (int) chargePercentage)));
+                }
+            }
+        }
     }
 
     public override void Update(float frameTime)
diff --git a/Content.Server/PowerCell/PowerCellSystem.cs b/Content.Server/PowerCell/PowerCellSystem.cs
index 0d2d9012bc7..f7b4cf02491 100644
--- a/Content.Server/PowerCell/PowerCellSystem.cs
+++ b/Content.Server/PowerCell/PowerCellSystem.cs
@@ -64,11 +64,11 @@ private void OnChargeChanged(EntityUid uid, PowerCellComponent component, ref Ch
         }
 
         var frac = args.Charge / args.MaxCharge;
-        var level = (byte) ContentHelpers.RoundToNearestLevels(frac, 1, PowerCellComponent.PowerCellVisualsLevels);
+        var level = (byte)ContentHelpers.RoundToNearestLevels(frac, 1, PowerCellComponent.PowerCellVisualsLevels);
         _sharedAppearanceSystem.SetData(uid, PowerCellVisuals.ChargeLevel, level);
 
         // If this power cell is inside a cell-slot, inform that entity that the power has changed (for updating visuals n such).
-        if (_containerSystem.TryGetContainingContainer(uid, out var container)
+        if (_containerSystem.TryGetContainingContainer((uid, null, null), out var container)
             && TryComp(container.Owner, out PowerCellSlotComponent? slot)
             && _itemSlotsSystem.TryGetSlot(container.Owner, slot.CellSlotId, out var itemSlot))
         {
diff --git a/Content.Server/Radiation/Components/RadiationProtectionComponent.cs b/Content.Server/Radiation/Components/RadiationProtectionComponent.cs
new file mode 100644
index 00000000000..44b11af8347
--- /dev/null
+++ b/Content.Server/Radiation/Components/RadiationProtectionComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.Prototypes;
+using Content.Shared.Damage.Prototypes;
+
+namespace Content.Server.Radiation.Components;
+
+/// <summary>
+///     Exists for use as a status effect.
+///     Adds the DamageProtectionBuffComponent to the entity and adds the specified DamageModifierSet to its list of modifiers.
+/// </summary>
+[RegisterComponent]
+public sealed partial class RadiationProtectionComponent : Component
+{
+    /// <summary>
+    ///     The radiation damage modifier for entities with this component.
+    /// </summary>
+    [DataField("modifier")]
+    public ProtoId<DamageModifierSetPrototype> RadiationProtectionModifierSetId = "PotassiumIodide";
+}
diff --git a/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs b/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs
new file mode 100644
index 00000000000..5222c31bfe6
--- /dev/null
+++ b/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs
@@ -0,0 +1,38 @@
+using Content.Server.Radiation.Components;
+using Content.Shared.Damage.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Radiation.EntitySystems;
+
+public sealed class RadiationProtectionSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<RadiationProtectionComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<RadiationProtectionComponent, ComponentShutdown>(OnShutdown);
+    }
+
+    private void OnInit(EntityUid uid, RadiationProtectionComponent component, ComponentInit args)
+    {
+        if (!_prototypeManager.TryIndex(component.RadiationProtectionModifierSetId, out var modifier))
+            return;
+        var buffComp = EnsureComp<DamageProtectionBuffComponent>(uid);
+        // add the damage modifier if it isn't in the dict yet
+        if (!buffComp.Modifiers.ContainsKey(component.RadiationProtectionModifierSetId))
+            buffComp.Modifiers.Add(component.RadiationProtectionModifierSetId, modifier);
+    }
+
+    private void OnShutdown(EntityUid uid, RadiationProtectionComponent component, ComponentShutdown args)
+    {
+        if (!TryComp<DamageProtectionBuffComponent>(uid, out var buffComp))
+            return;
+        // remove the damage modifier from the dict
+        buffComp.Modifiers.Remove(component.RadiationProtectionModifierSetId);
+        // if the dict is empty now, remove the buff component
+        if (buffComp.Modifiers.Count == 0)
+            RemComp<DamageProtectionBuffComponent>(uid);
+    }
+}
diff --git a/Content.Server/Resist/EscapeInventorySystem.cs b/Content.Server/Resist/EscapeInventorySystem.cs
index 56dd5dde93b..f31a373ddd1 100644
--- a/Content.Server/Resist/EscapeInventorySystem.cs
+++ b/Content.Server/Resist/EscapeInventorySystem.cs
@@ -37,7 +37,7 @@ private void OnRelayMovement(EntityUid uid, CanEscapeInventoryComponent componen
         if (!args.HasDirectionalMovement)
             return;
 
-        if (!_containerSystem.TryGetContainingContainer(uid, out var container) || !_actionBlockerSystem.CanInteract(uid, container.Owner))
+        if (!_containerSystem.TryGetContainingContainer((uid, null, null), out var container) || !_actionBlockerSystem.CanInteract(uid, container.Owner))
             return;
 
         // Make sure there's nothing stopped the removal (like being glued)
diff --git a/Content.Server/Shuttles/Components/StationArrivalsComponent.cs b/Content.Server/Shuttles/Components/StationArrivalsComponent.cs
index 0bb2f8d7b89..1d469f9bffe 100644
--- a/Content.Server/Shuttles/Components/StationArrivalsComponent.cs
+++ b/Content.Server/Shuttles/Components/StationArrivalsComponent.cs
@@ -9,7 +9,8 @@ namespace Content.Server.Shuttles.Components;
 [RegisterComponent, Access(typeof(ArrivalsSystem))]
 public sealed partial class StationArrivalsComponent : Component
 {
-    public List<EntityUid> Shuttles = [];
+    [DataField("shuttle")]
+    public EntityUid Shuttle;
 
     [DataField("shuttlePath")] public ResPath ShuttlePath = new("/Maps/Shuttles/arrivals.yml");
 }
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index a7d84a5dd9f..67768d5045e 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -1,11 +1,11 @@
 using System.Linq;
 using System.Numerics;
-using Content.Server._Sunrise.DontSellingGrid;
-using Content.Server._Sunrise.ImmortalGrid;
 using Content.Server.Administration;
+using Content.Server.Chat.Managers;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.GameTicking;
+using Content.Server.GameTicking.Events;
 using Content.Server.Parallax;
 using Content.Server.Screens.Components;
 using Content.Server.Shuttles.Components;
@@ -21,8 +21,7 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Components;
 using Content.Shared.Parallax.Biomes;
-using Content.Shared.Preferences;
-using Content.Shared.Roles.Jobs;
+using Content.Shared.Salvage;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Tiles;
 using Robust.Server.GameObjects;
@@ -30,6 +29,7 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
@@ -46,7 +46,10 @@ public sealed class ArrivalsSystem : EntitySystem
     [Dependency] private readonly IConsoleHost _console = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IChatManager _chat = default!;
+    [Dependency] private readonly BiomeSystem _biomes = default!;
     [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly MapLoaderSystem _loader = default!;
     [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
@@ -54,6 +57,7 @@ public sealed class ArrivalsSystem : EntitySystem
     [Dependency] private readonly ShuttleSystem _shuttles = default!;
     [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
     [Dependency] private readonly StationSystem _station = default!;
+    [Dependency] private readonly ActorSystem _actor = default!;
 
     private EntityQuery<PendingClockInComponent> _pendingQuery;
     private EntityQuery<ArrivalsBlacklistComponent> _blacklistQuery;
@@ -79,6 +83,14 @@ public sealed class ArrivalsSystem : EntitySystem
     /// </summary>
     private const float RoundStartFTLDuration = 10f;
 
+    // Sunrise-Edit
+    // private readonly List<ProtoId<BiomeTemplatePrototype>> _arrivalsBiomeOptions = new()
+    // {
+    //     "Grasslands",
+    //     "LowDesert",
+    //     "Snow",
+    // };
+
     public override void Initialize()
     {
         base.Initialize();
@@ -88,6 +100,8 @@ public override void Initialize()
         SubscribeLocalEvent<ArrivalsShuttleComponent, ComponentStartup>(OnShuttleStartup);
         SubscribeLocalEvent<ArrivalsShuttleComponent, FTLTagEvent>(OnShuttleTag);
 
+        // Sunrise-Edit
+        //SubscribeLocalEvent<RoundStartingEvent>(OnRoundStarting);
         SubscribeLocalEvent<ArrivalsShuttleComponent, FTLStartedEvent>(OnArrivalsFTL);
         SubscribeLocalEvent<ArrivalsShuttleComponent, FTLCompletedEvent>(OnArrivalsDocked);
 
@@ -160,7 +174,7 @@ private void ArrivalsCommand(IConsoleShell shell, string argstr, string[] args)
                 var query = AllEntityQuery<PendingClockInComponent, TransformComponent>();
                 var spawnPoints = EntityQuery<SpawnPointComponent, TransformComponent>().ToList();
 
-                TryGetArrivalsSource(out var arrivalsUid);
+                TryGetArrivals(out var arrivalsUid);
 
                 while (query.MoveNext(out var uid, out _, out var pendingXform))
                 {
@@ -191,7 +205,7 @@ private void ArrivalsCommand(IConsoleShell shell, string argstr, string[] args)
     /// </summary>
     private void OnArrivalsFTL(EntityUid shuttleUid, ArrivalsShuttleComponent component, ref FTLStartedEvent args)
     {
-        if (!TryGetArrivalsSource(out EntityUid arrivals))
+        if (!TryGetArrivals(out EntityUid arrivals))
             return;
 
         if (TryComp<DeviceNetworkComponent>(shuttleUid, out var netComp))
@@ -285,16 +299,20 @@ private void OnArrivalsDocked(EntityUid uid, ArrivalsShuttleComponent component,
     private void DumpChildren(EntityUid uid, ref FTLStartedEvent args)
     {
         var toDump = new List<Entity<TransformComponent>>();
-        DumpChildren(uid, ref args, toDump);
+        FindDumpChildren(uid, toDump);
         foreach (var (ent, xform) in toDump)
         {
             var rotation = xform.LocalRotation;
             _transform.SetCoordinates(ent, new EntityCoordinates(args.FromMapUid!.Value, Vector2.Transform(xform.LocalPosition, args.FTLFrom)));
             _transform.SetWorldRotation(ent, args.FromRotation + rotation);
+            if (_actor.TryGetSession(ent, out var session))
+            {
+                _chat.DispatchServerMessage(session!, Loc.GetString("latejoin-arrivals-dumped-from-shuttle"));
+            }
         }
     }
 
-    private void DumpChildren(EntityUid uid, ref FTLStartedEvent args, List<Entity<TransformComponent>> toDump)
+    private void FindDumpChildren(EntityUid uid, List<Entity<TransformComponent>> toDump)
     {
         if (_pendingQuery.HasComponent(uid))
             return;
@@ -310,7 +328,7 @@ private void DumpChildren(EntityUid uid, ref FTLStartedEvent args, List<Entity<T
         var children = xform.ChildEnumerator;
         while (children.MoveNext(out var child))
         {
-            DumpChildren(child, ref args, toDump);
+            FindDumpChildren(child, toDump);
         }
     }
 
@@ -329,7 +347,7 @@ public void HandlePlayerSpawning(PlayerSpawningEvent ev)
         if (!HasComp<StationArrivalsComponent>(ev.Station))
             return;
 
-        TryGetArrivalsSource(out var arrivals);
+        TryGetArrivals(out var arrivals);
 
         if (!TryComp(arrivals, out TransformComponent? arrivalsXform))
             return;
@@ -387,6 +405,10 @@ private bool TryTeleportToMapSpawn(EntityUid player, EntityUid stationId, Transf
         {
             // Move the player to a random late-join spawnpoint.
             _transform.SetCoordinates(player, transform, _random.Pick(possiblePositions));
+            if (_actor.TryGetSession(player, out var session))
+            {
+                _chat.DispatchServerMessage(session!, Loc.GetString("latejoin-arrivals-teleport-to-spawn"));
+            }
             return true;
         }
 
@@ -398,11 +420,11 @@ private void OnShuttleStartup(EntityUid uid, ArrivalsShuttleComponent component,
         EnsureComp<PreventPilotComponent>(uid);
     }
 
-    private bool TryGetArrivalsSource(out EntityUid uid)
+    private bool TryGetArrivals(out EntityUid uid)
     {
-        var arrivalsSourceQuery = EntityQueryEnumerator<ArrivalsSourceComponent>();
+        var arrivalsQuery = EntityQueryEnumerator<ArrivalsSourceComponent>();
 
-        while (arrivalsSourceQuery.MoveNext(out uid, out _))
+        while (arrivalsQuery.MoveNext(out uid, out _))
         {
             return true;
         }
@@ -430,9 +452,9 @@ public override void Update(float frameTime)
 
         var query = EntityQueryEnumerator<ArrivalsShuttleComponent, ShuttleComponent, TransformComponent>();
         var curTime = _timing.CurTime;
-        TryGetArrivalsSource(out var arrivalsSource);
+        TryGetArrivals(out var arrivals);
 
-        if (TryComp(arrivalsSource, out TransformComponent? arrivalsXform))
+        if (TryComp(arrivals, out TransformComponent? arrivalsXform))
         {
             while (query.MoveNext(out var uid, out var comp, out var shuttle, out var xform))
             {
@@ -444,8 +466,8 @@ public override void Update(float frameTime)
                 // Go back to arrivals source
                 if (xform.MapUid != arrivalsXform.MapUid)
                 {
-                    if (arrivalsSource.IsValid())
-                        _shuttles.FTLToDock(uid, shuttle, arrivalsSource, priorityTag: "DockArrivals");
+                    if (arrivals.IsValid())
+                        _shuttles.FTLToDock(uid, shuttle, arrivals);
 
                     comp.NextArrivalsTime = _timing.CurTime + TimeSpan.FromSeconds(tripTime);
                 }
@@ -455,7 +477,7 @@ public override void Update(float frameTime)
                     var targetGrid = _station.GetLargestGrid(data);
 
                     if (targetGrid != null)
-                        _shuttles.FTLToDock(uid, shuttle, targetGrid.Value, priorityTag: "DockArrivals", ignored: true);
+                        _shuttles.FTLToDock(uid, shuttle, targetGrid.Value);
 
                     // The ArrivalsCooldown includes the trip there, so we only need to add the time taken for
                     // the trip back.
@@ -468,18 +490,70 @@ public override void Update(float frameTime)
         }
     }
 
+    // Sunrise-Edit
+    // private void OnRoundStarting(RoundStartingEvent ev)
+    // {
+    //     // Setup arrivals station
+    //     if (!Enabled)
+    //         return;
+    //
+    //     SetupArrivalsStation();
+    // }
+    //
+    // private void SetupArrivalsStation()
+    // {
+    //     var mapId = _mapManager.CreateMap();
+    //     var mapUid = _mapManager.GetMapEntityId(mapId);
+    //     _mapManager.AddUninitializedMap(mapId);
+    //
+    //     if (!_loader.TryLoad(mapId, _cfgManager.GetCVar(CCVars.ArrivalsMap), out var uids))
+    //     {
+    //         return;
+    //     }
+    //
+    //     foreach (var id in uids)
+    //     {
+    //         EnsureComp<ArrivalsSourceComponent>(id);
+    //         EnsureComp<ProtectedGridComponent>(id);
+    //         EnsureComp<PreventPilotComponent>(id);
+    //     }
+    //
+    //     // Setup planet arrivals if relevant
+    //     if (_cfgManager.GetCVar(CCVars.ArrivalsPlanet))
+    //     {
+    //         var template = _random.Pick(_arrivalsBiomeOptions);
+    //         _biomes.EnsurePlanet(mapUid, _protoManager.Index(template));
+    //         var restricted = new RestrictedRangeComponent
+    //         {
+    //             Range = 32f
+    //         };
+    //         AddComp(mapUid, restricted);
+    //     }
+    //
+    //     _mapManager.DoMapInitialize(mapId);
+    //
+    //     // Handle roundstart stations.
+    //     var query = AllEntityQuery<StationArrivalsComponent>();
+    //
+    //     while (query.MoveNext(out var uid, out var comp))
+    //     {
+    //         SetupShuttle(uid, comp);
+    //     }
+    // }
+
     private void SetArrivals(bool obj)
     {
         Enabled = obj;
 
         if (Enabled)
         {
+            // Sunrise-Edit
+            //SetupArrivalsStation();
             var query = AllEntityQuery<StationArrivalsComponent>();
 
             while (query.MoveNext(out var sUid, out var comp))
             {
-                SetupShuttle(sUid, comp, Destination.Station);
-                SetupShuttle(sUid, comp, Destination.Arrivals);
+                SetupShuttle(sUid, comp);
             }
         }
         else
@@ -505,30 +579,27 @@ private void OnStationPostInit(EntityUid uid, StationArrivalsComponent component
         if (!Enabled)
             return;
 
-        SetupShuttle(uid, component, Destination.Station);
-        SetupShuttle(uid, component, Destination.Arrivals);
+        // If it's a latespawn station then this will fail but that's okey
+        SetupShuttle(uid, component);
     }
 
-    private void SetupShuttle(EntityUid uid, StationArrivalsComponent component, Destination destination)
+    private void SetupShuttle(EntityUid uid, StationArrivalsComponent component)
     {
-        // if (!Deleted(component.Shuttle))
-        //     return;
+        if (!Deleted(component.Shuttle))
+            return;
 
         // Spawn arrivals on a dummy map then dock it to the source.
         var dummyMap = _mapManager.CreateMap();
 
-        if (TryGetArrivalsSource(out var arrivals) &&
+        if (TryGetArrivals(out var arrivals) &&
             _loader.TryLoad(dummyMap, component.ShuttlePath.ToString(), out var shuttleUids))
         {
-            component.Shuttles.Add(shuttleUids[0]);
-            var shuttleComp = Comp<ShuttleComponent>(shuttleUids[0]);
-            var arrivalsComp = EnsureComp<ArrivalsShuttleComponent>(shuttleUids[0]);
+            component.Shuttle = shuttleUids[0];
+            var shuttleComp = Comp<ShuttleComponent>(component.Shuttle);
+            var arrivalsComp = EnsureComp<ArrivalsShuttleComponent>(component.Shuttle);
             arrivalsComp.Station = uid;
-            EnsureComp<ImmortalGridComponent>(shuttleUids[0]); // Sunrise-Edit
-            EnsureComp<DontSellingGridComponent>(shuttleUids[0]); // Sunrise-Edit
-
-            var target = destination == Destination.Station ? uid : arrivals;
-            _shuttles.FTLToDock(shuttleUids[0], shuttleComp, target, hyperspaceTime: RoundStartFTLDuration, priorityTag: "DockArrivals");
+            EnsureComp<ProtectedGridComponent>(uid);
+            _shuttles.FTLToDock(component.Shuttle, shuttleComp, arrivals, hyperspaceTime: RoundStartFTLDuration);
             arrivalsComp.NextTransfer = _timing.CurTime + TimeSpan.FromSeconds(_cfgManager.GetCVar(CCVars.ArrivalsCooldown));
         }
 
@@ -536,10 +607,4 @@ private void SetupShuttle(EntityUid uid, StationArrivalsComponent component, Des
         var timer = AddComp<TimedDespawnComponent>(_mapManager.GetMapEntityId(dummyMap));
         timer.Lifetime = 15f;
     }
-
-    private enum Destination
-    {
-        Station,
-        Arrivals
-    }
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
index a31fda074f3..c0eff119314 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
@@ -2,9 +2,7 @@
 using Content.Server.Shuttles.Components;
 using Content.Server.Station.Components;
 using Content.Server.Station.Events;
-using Content.Shared.Cargo.Components;
 using Content.Shared.CCVar;
-using Content.Shared.Procedural;
 using Content.Shared.Salvage;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Station.Components;
@@ -72,11 +70,11 @@ private void CargoSpawn(EntityUid uid, StationCargoShuttleComponent component)
         if (targetGrid == null)
             return;
 
-        var mapId = _mapManager.CreateMap();
+        _mapSystem.CreateMap(out var mapId);
 
         if (_loader.TryLoad(mapId, component.Path.ToString(), out var ent) && ent.Count > 0)
         {
-            if (TryComp<ShuttleComponent>(ent[0], out var shuttle))
+            if (HasComp<ShuttleComponent>(ent[0]))
             {
                 TryFTLProximity(ent[0], targetGrid.Value);
             }
@@ -87,7 +85,7 @@ private void CargoSpawn(EntityUid uid, StationCargoShuttleComponent component)
         _mapManager.DeleteMap(mapId);
     }
 
-    private bool TryDungeonSpawn(Entity<MapGridComponent?> targetGrid, EntityUid stationUid, MapId mapId, DungeonSpawnGroup group, out EntityUid spawned)
+    private bool TryDungeonSpawn(Entity<MapGridComponent?> targetGrid, MapId mapId, DungeonSpawnGroup group, out EntityUid spawned)
     {
         spawned = EntityUid.Invalid;
 
@@ -146,7 +144,7 @@ private bool TryGridSpawn(EntityUid targetGrid, EntityUid stationUid, MapId mapI
 
         if (_loader.TryLoad(mapId, path.ToString(), out var ent) && ent.Count == 1)
         {
-            if (TryComp<ShuttleComponent>(ent[0], out var shuttle))
+            if (HasComp<ShuttleComponent>(ent[0]))
             {
                 TryFTLProximity(ent[0], targetGrid);
             }
@@ -181,7 +179,7 @@ private void GridSpawns(EntityUid uid, GridSpawnComponent component)
             return;
 
         // Spawn on a dummy map and try to FTL if possible, otherwise dump it.
-        var mapId = _mapManager.CreateMap();
+        _mapSystem.CreateMap(out var mapId);
 
         foreach (var group in component.Groups.Values)
         {
@@ -194,7 +192,7 @@ private void GridSpawns(EntityUid uid, GridSpawnComponent component)
                 switch (group)
                 {
                     case DungeonSpawnGroup dungeon:
-                        if (!TryDungeonSpawn(targetGrid.Value, uid, mapId, dungeon, out spawned))
+                        if (!TryDungeonSpawn(targetGrid.Value, mapId, dungeon, out spawned))
                             continue;
 
                         break;
@@ -244,7 +242,7 @@ private void OnGridFillMapInit(EntityUid uid, GridFillComponent component, MapIn
         }
 
         // Spawn on a dummy map and try to dock if possible, otherwise dump it.
-        var mapId = _mapManager.CreateMap();
+        _mapSystem.CreateMap(out var mapId);
         var valid = false;
 
         if (_loader.TryLoad(mapId, component.Path.ToString(), out var ent) &&
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index aae466ba0dc..6ae4aff2f4a 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -34,6 +34,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
     [Dependency] private readonly IComponentFactory _factory = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly MapSystem _mapSystem = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index e6c627f353e..6e3d9e92516 100644
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -95,7 +95,7 @@ public void Update(EntityUid uid, EventHorizonComponent? eventHorizon = null, Tr
             return;
 
         // Handle singularities some admin smited into a locker.
-        if (_containerSystem.TryGetContainingContainer(uid, out var container, transform: xform)
+        if (_containerSystem.TryGetContainingContainer((uid, xform, null), out var container)
         && !AttemptConsumeEntity(uid, container.Owner, eventHorizon))
         {
             // Locker is indestructible. Consume everything else in the locker instead of magically teleporting out.
@@ -214,7 +214,7 @@ public void ConsumeEntitiesInContainer(EntityUid hungry, BaseContainer container
                 if (_containerSystem.Insert(entity, target_container))
                     break;
 
-                _containerSystem.TryGetContainingContainer(target_container.Owner, out target_container);
+                _containerSystem.TryGetContainingContainer((target_container.Owner, null, null), out target_container);
             }
 
             // If we couldn't or there was no container to insert into just dump them to the map/grid.
@@ -470,7 +470,7 @@ private void OnContainerConsumed(EntityUid uid, ContainerManagerComponent comp,
     {
         var drop_container = args.Container;
         if (drop_container is null)
-            _containerSystem.TryGetContainingContainer(uid, out drop_container);
+            _containerSystem.TryGetContainingContainer((uid, null, null), out drop_container);
 
         foreach (var container in comp.GetAllContainers())
         {
diff --git a/Content.Server/Spawners/EntitySystems/SpawnOnDespawnSystem.cs b/Content.Server/Spawners/EntitySystems/SpawnOnDespawnSystem.cs
index f5a34728dc8..2f850faab13 100644
--- a/Content.Server/Spawners/EntitySystems/SpawnOnDespawnSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/SpawnOnDespawnSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Spawners.Components;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Spawners;
 
 namespace Content.Server.Spawners.EntitySystems;
@@ -19,4 +20,9 @@ private void OnDespawn(EntityUid uid, SpawnOnDespawnComponent comp, ref TimedDes
 
         Spawn(comp.Prototype, xform.Coordinates);
     }
+
+    public void SetPrototype(Entity<SpawnOnDespawnComponent> entity, EntProtoId prototype)
+    {
+        entity.Comp.Prototype = prototype;
+    }
 }
diff --git a/Content.Server/Station/Systems/StationJobsSystem.cs b/Content.Server/Station/Systems/StationJobsSystem.cs
index 307610d136f..91a8b7ade4a 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.cs
@@ -24,9 +24,9 @@ namespace Content.Server.Station.Systems;
 public sealed partial class StationJobsSystem : EntitySystem
 {
     [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly GameTicker _gameTicker = default!;
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -56,7 +56,7 @@ public override void Update(float _)
         if (_availableJobsDirty)
         {
             _cachedAvailableJobs = GenerateJobsAvailableEvent();
-            RaiseNetworkEvent(_cachedAvailableJobs, Filter.Empty().AddPlayers(_playerManager.Sessions));
+            RaiseNetworkEvent(_cachedAvailableJobs, Filter.Empty().AddPlayers(_player.Sessions));
             _availableJobsDirty = false;
         }
     }
diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs
index 5ddb0e7746b..22c0cba3f78 100644
--- a/Content.Server/Station/Systems/StationSystem.cs
+++ b/Content.Server/Station/Systems/StationSystem.cs
@@ -31,7 +31,6 @@ public sealed class StationSystem : EntitySystem
     [Dependency] private readonly ILogManager _logManager = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly ChatSystem _chatSystem = default!;
-    [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly MapSystem _map = default!;
diff --git a/Content.Server/StationEvents/Components/StationEventComponent.cs b/Content.Server/StationEvents/Components/StationEventComponent.cs
index fdd1d3962e7..a188d5c052c 100644
--- a/Content.Server/StationEvents/Components/StationEventComponent.cs
+++ b/Content.Server/StationEvents/Components/StationEventComponent.cs
@@ -81,4 +81,10 @@ public sealed partial class StationEventComponent : Component
     [DataField("endTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
     [AutoPausedField]
     public TimeSpan? EndTime;
+
+    /// <summary>
+    /// If false, the event won't trigger during ongoing evacuation.
+    /// </summary>
+    [DataField]
+    public bool OccursDuringRoundEnd = true;
 }
diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
index f2fdb8ff5a7..2e44040fcc8 100644
--- a/Content.Server/StationEvents/EventManagerSystem.cs
+++ b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
+using Content.Server.RoundEnd;
 using Content.Server.StationEvents.Components;
 using Content.Shared.CCVar;
 using Robust.Server.Player;
@@ -18,6 +19,7 @@ public sealed class EventManagerSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] public readonly GameTicker GameTicker = default!;
+    [Dependency] private readonly RoundEndSystem _roundEnd = default!;
 
     public bool EventsEnabled { get; private set; }
     private void SetEnabled(bool value) => EventsEnabled = value;
@@ -191,6 +193,11 @@ private bool CanRun(EntityPrototype prototype, StationEventComponent stationEven
             return false;
         }
 
+        if (_roundEnd.IsRoundEndRequested() && !stationEvent.OccursDuringRoundEnd)
+        {
+            return false;
+        }
+
         return true;
     }
 }
diff --git a/Content.Server/Temperature/Components/TemperatureComponent.cs b/Content.Server/Temperature/Components/TemperatureComponent.cs
index 3bfa12f2693..ae2c373b140 100644
--- a/Content.Server/Temperature/Components/TemperatureComponent.cs
+++ b/Content.Server/Temperature/Components/TemperatureComponent.cs
@@ -1,4 +1,3 @@
-using Content.Server.Temperature.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Damage;
@@ -51,15 +50,6 @@ public sealed partial class TemperatureComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float AtmosTemperatureTransferEfficiency = 0.1f;
 
-    [Obsolete("Use system method")]
-    public float HeatCapacity
-    {
-        get
-        {
-            return IoCManager.Resolve<IEntityManager>().System<TemperatureSystem>().GetHeatCapacity(Owner, this);
-        }
-    }
-
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public DamageSpecifier ColdDamage = new();
 
@@ -71,7 +61,7 @@ public float HeatCapacity
     /// </summary>
     /// <remarks>
     /// Okay it genuinely reaches this basically immediately for a plasma fire.
-    /// </summary>
+    /// </remarks>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public FixedPoint2 DamageCap = FixedPoint2.New(8);
 
@@ -79,7 +69,7 @@ public float HeatCapacity
     /// Used to keep track of when damage starts/stops. Useful for logs.
     /// </summary>
     [DataField]
-    public bool TakingDamage = false;
+    public bool TakingDamage;
 
     [DataField]
     public ProtoId<AlertPrototype> HotAlert = "Hot";
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index d33bf6e0256..8b6fa107cc0 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -412,17 +412,3 @@ private void RecalculateAndApplyParentThresholds(EntityUid uid,
         return (newHeatThreshold, newColdThreshold);
     }
 }
-
-public sealed class OnTemperatureChangeEvent : EntityEventArgs
-{
-    public float CurrentTemperature { get; }
-    public float LastTemperature { get; }
-    public float TemperatureDelta { get; }
-
-    public OnTemperatureChangeEvent(float current, float last, float delta)
-    {
-        CurrentTemperature = current;
-        LastTemperature = last;
-        TemperatureDelta = delta;
-    }
-}
diff --git a/Content.Server/Traitor/Components/TraitorCodePaperComponent.cs b/Content.Server/Traitor/Components/TraitorCodePaperComponent.cs
new file mode 100644
index 00000000000..7887248f21d
--- /dev/null
+++ b/Content.Server/Traitor/Components/TraitorCodePaperComponent.cs
@@ -0,0 +1,27 @@
+namespace Content.Server.Traitor.Components;
+
+/// <summary>
+///     Paper with written traitor codewords on it.
+/// </summary>
+[RegisterComponent]
+public sealed partial class TraitorCodePaperComponent : Component
+{
+    /// <summary>
+    /// The number of codewords that should be generated on this paper.
+    /// Will not extend past the max number of available codewords.
+    /// </summary>
+    [DataField]
+    public int CodewordAmount = 1;
+
+    /// <summary>
+    /// Whether the codewords should be faked if there is no traitor gamerule set.
+    /// </summary>
+    [DataField]
+    public bool FakeCodewords = true;
+
+    /// <summary>
+    /// Whether all codewords added to the round should be used. Overrides CodewordAmount if true.
+    /// </summary>
+    [DataField]
+    public bool CodewordShowAll = false;
+}
diff --git a/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs
new file mode 100644
index 00000000000..5a252fc105a
--- /dev/null
+++ b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs
@@ -0,0 +1,94 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Server.GameTicking;
+using Content.Server.GameTicking.Rules;
+using Content.Server.GameTicking.Rules.Components;
+using Content.Server.Paper;
+using Content.Server.Traitor.Components;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
+using System.Linq;
+using Content.Shared.Paper;
+
+namespace Content.Server.Traitor.Systems;
+
+public sealed class TraitorCodePaperSystem : EntitySystem
+{
+    [Dependency] private readonly GameTicker _gameTicker = default!;
+    [Dependency] private readonly TraitorRuleSystem _traitorRuleSystem = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly PaperSystem _paper = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<TraitorCodePaperComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(EntityUid uid, TraitorCodePaperComponent component, MapInitEvent args)
+    {
+        SetupPaper(uid, component);
+    }
+
+    private void SetupPaper(EntityUid uid, TraitorCodePaperComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        if (TryComp(uid, out PaperComponent? paperComp))
+        {
+            if (TryGetTraitorCode(out var paperContent, component))
+            {
+                _paper.SetContent((uid, paperComp), paperContent);
+            }
+        }
+    }
+
+    private bool TryGetTraitorCode([NotNullWhen(true)] out string? traitorCode, TraitorCodePaperComponent component)
+    {
+        traitorCode = null;
+
+        var codesMessage = new FormattedMessage();
+        List<string> codeList = new();
+        // Find the first nuke that matches the passed location.
+        if (_gameTicker.IsGameRuleAdded<TraitorRuleComponent>())
+        {
+            var ruleEnts = _gameTicker.GetAddedGameRules();
+            foreach (var ruleEnt in ruleEnts)
+            {
+                if (TryComp(ruleEnt, out TraitorRuleComponent? traitorComp))
+                {
+                    codeList.AddRange(traitorComp.Codewords.ToList());
+                }
+            }
+        }
+        if (codeList.Count == 0)
+        {
+            if (component.FakeCodewords)
+                codeList = _traitorRuleSystem.GenerateTraitorCodewords(new TraitorRuleComponent()).ToList();
+            else
+                codeList = [Loc.GetString("traitor-codes-none")];
+        }
+
+        _random.Shuffle(codeList);
+
+        int i = 0;
+        foreach (var code in codeList)
+        {
+            i++;
+            if (i > component.CodewordAmount && !component.CodewordShowAll)
+                break;
+
+            codesMessage.PushNewline();
+            codesMessage.AddMarkup(code);
+        }
+
+        if (!codesMessage.IsEmpty)
+        {
+            if (i == 1)
+                traitorCode = Loc.GetString("traitor-codes-message-singular") + codesMessage;
+            else
+                traitorCode = Loc.GetString("traitor-codes-message-plural") + codesMessage;
+        }
+        return !codesMessage.IsEmpty;
+    }
+}
diff --git a/Content.Server/UserInterface/StatValuesCommand.cs b/Content.Server/UserInterface/StatValuesCommand.cs
index cb599f7b09f..85b979f83a7 100644
--- a/Content.Server/UserInterface/StatValuesCommand.cs
+++ b/Content.Server/UserInterface/StatValuesCommand.cs
@@ -7,7 +7,6 @@
 using Content.Server.Power.Components;
 using Content.Shared.Administration;
 using Content.Shared.Item;
-using Content.Shared.Materials;
 using Content.Shared.Research.Prototypes;
 using Content.Shared.UserInterface;
 using Content.Shared.Weapons.Melee;
@@ -224,13 +223,13 @@ private StatValuesEuiMessage GetLatheMessage()
         {
             var cost = 0.0;
 
-            foreach (var (material, count) in proto.RequiredMaterials)
+            foreach (var (material, count) in proto.Materials)
             {
-                var materialPrice = _proto.Index<MaterialPrototype>(material).Price;
+                var materialPrice = _proto.Index(material).Price;
                 cost += materialPrice * count;
             }
 
-            var sell = priceSystem.GetEstimatedPrice(_proto.Index<EntityPrototype>(proto.Result));
+            var sell = priceSystem.GetLatheRecipePrice(proto);
 
             values.Add(new[]
             {
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index 29f91988182..3a5fa4540af 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -129,27 +129,8 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                 case CartridgeAmmoComponent cartridge:
                     if (!cartridge.Spent)
                     {
-                        if (cartridge.Count > 1)
-                        {
-                            var ev = new GunGetAmmoSpreadEvent(cartridge.Spread);
-                            RaiseLocalEvent(gunUid, ref ev);
-
-                            var angles = LinearSpread(mapAngle - ev.Spread / 2,
-                                mapAngle + ev.Spread / 2, cartridge.Count);
-
-                            for (var i = 0; i < cartridge.Count; i++)
-                            {
-                                var uid = Spawn(cartridge.Prototype, fromEnt);
-                                ShootOrThrow(uid, angles[i].ToVec(), gunVelocity, gun, gunUid, user);
-                                shotProjectiles.Add(uid);
-                            }
-                        }
-                        else
-                        {
-                            var uid = Spawn(cartridge.Prototype, fromEnt);
-                            ShootOrThrow(uid, mapDirection, gunVelocity, gun, gunUid, user);
-                            shotProjectiles.Add(uid);
-                        }
+                        var uid = Spawn(cartridge.Prototype, fromEnt);
+                        CreateAndFireProjectiles(uid, cartridge);
 
                         RaiseLocalEvent(ent!.Value, new AmmoShotEvent()
                         {
@@ -157,8 +138,6 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                         });
 
                         SetCartridgeSpent(ent.Value, cartridge, true);
-                        MuzzleFlash(gunUid, cartridge, mapDirection.ToAngle(), user);
-                        Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
 
                         if (cartridge.DeleteOnSpawn)
                             Del(ent.Value);
@@ -177,10 +156,10 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                     break;
                 // Ammo shoots itself
                 case AmmoComponent newAmmo:
-                    shotProjectiles.Add(ent!.Value);
-                    MuzzleFlash(gunUid, newAmmo, mapDirection.ToAngle(), user);
-                    Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
-                    ShootOrThrow(ent.Value, mapDirection, gunVelocity, gun, gunUid, user);
+                    if (ent == null)
+                        break;
+                    CreateAndFireProjectiles(ent.Value, newAmmo);
+
                     break;
                 case HitscanPrototype hitscan:
 
@@ -295,6 +274,36 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
         {
             FiredProjectiles = shotProjectiles,
         });
+
+        void CreateAndFireProjectiles(EntityUid ammoEnt, AmmoComponent ammoComp)
+        {
+            if (TryComp<ProjectileSpreadComponent>(ammoEnt, out var ammoSpreadComp))
+            {
+                var spreadEvent = new GunGetAmmoSpreadEvent(ammoSpreadComp.Spread);
+                RaiseLocalEvent(gunUid, ref spreadEvent);
+
+                var angles = LinearSpread(mapAngle - spreadEvent.Spread / 2,
+                    mapAngle + spreadEvent.Spread / 2, ammoSpreadComp.Count);
+
+                ShootOrThrow(ammoEnt, angles[0].ToVec(), gunVelocity, gun, gunUid, user);
+                shotProjectiles.Add(ammoEnt);
+
+                for (var i = 1; i < ammoSpreadComp.Count; i++)
+                {
+                    var newuid = Spawn(ammoSpreadComp.Proto, fromEnt);
+                    ShootOrThrow(newuid, angles[i].ToVec(), gunVelocity, gun, gunUid, user);
+                    shotProjectiles.Add(ammoEnt);
+                }
+            }
+            else
+            {
+                ShootOrThrow(ammoEnt, mapDirection, gunVelocity, gun, gunUid, user);
+                shotProjectiles.Add(ammoEnt);
+            }
+
+            MuzzleFlash(gunUid, ammoComp, mapDirection.ToAngle(), user);
+            Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
+        }
     }
 
     private void ShootOrThrow(EntityUid uid, Vector2 mapDirection, Vector2 gunVelocity, GunComponent gun, EntityUid gunUid, EntityUid? user)
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
index 59ca913a398..8fc2f26fa63 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using Content.Server.Paper;
 using Content.Server.Power.Components;
 using Content.Server.Research.Systems;
 using Content.Shared.UserInterface;
@@ -9,6 +8,7 @@
 using Content.Shared.Audio;
 using Content.Shared.DeviceLinking;
 using Content.Shared.DeviceLinking.Events;
+using Content.Shared.Paper;
 using Content.Shared.Placeable;
 using Content.Shared.Popups;
 using Content.Shared.Research.Components;
@@ -290,7 +290,8 @@ private void OnPrintButton(EntityUid uid, AnalysisConsoleComponent component, An
             return;
 
         _popup.PopupEntity(Loc.GetString("analysis-console-print-popup"), uid);
-        _paper.SetContent(report, msg.ToMarkup());
+        if (TryComp<PaperComponent>(report, out var paperComp))
+            _paper.SetContent((report, paperComp), msg.ToMarkup());
         UpdateUserInterface(uid, component);
     }
 
diff --git a/Content.Server/_Sunrise/Execution/ExecutionSystem.cs b/Content.Server/_Sunrise/Execution/ExecutionSystem.cs
index 7379a8ac4e4..5afb3050048 100644
--- a/Content.Server/_Sunrise/Execution/ExecutionSystem.cs
+++ b/Content.Server/_Sunrise/Execution/ExecutionSystem.cs
@@ -336,7 +336,12 @@ private void OnDoafterGun(EntityUid uid, GunComponent component, DoAfterEvent ar
                 prototype.TryGetComponent<ProjectileComponent>(out var projectileA, _componentFactory); // sloth forgive me
                 if (projectileA != null)
                 {
-                    damage = projectileA.Damage * cartridge.Count;
+                    damage = projectileA.Damage;
+                }
+                prototype.TryGetComponent<ProjectileSpreadComponent>(out var projectilespreaderA, _componentFactory);
+                if (projectilespreaderA != null)
+                {
+                    damage *= projectilespreaderA.Count;
                 }
 
                 // Expend the cartridge
diff --git a/Content.Server/_Sunrise/StationGoal/StationGoalPaperSystem.cs b/Content.Server/_Sunrise/StationGoal/StationGoalPaperSystem.cs
index e81ee467cfa..314b914f317 100644
--- a/Content.Server/_Sunrise/StationGoal/StationGoalPaperSystem.cs
+++ b/Content.Server/_Sunrise/StationGoal/StationGoalPaperSystem.cs
@@ -116,14 +116,14 @@ private EntityUid SpawnPaperGoal(EntityCoordinates coords, FaxPrintout printout)
             if (!TryComp<PaperComponent>(printed, out var paper))
                 return printed;
 
-            _paperSystem.SetContent(printed, printout.Content);
+            _paperSystem.SetContent((printed, paper), printout.Content);
 
             if (printout.StampState == null)
                 return printed;
 
             foreach (var stamp in printout.StampedBy)
             {
-                _paperSystem.TryStamp(printed, stamp, printout.StampState);
+                _paperSystem.TryStamp((printed, paper), stamp, printout.StampState);
             }
 
             return printed;
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
index 30fed573b89..f83dd50c998 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
@@ -124,7 +124,7 @@ public bool InsertOrgan(
     /// </summary>
     public bool RemoveOrgan(EntityUid organId, OrganComponent? organ = null)
     {
-        if (!Containers.TryGetContainingContainer(organId, out var container))
+        if (!Containers.TryGetContainingContainer((organId, null, null), out var container))
             return false;
 
         var parent = container.Owner;
@@ -157,32 +157,6 @@ public bool AddOrganToFirstValidSlot(
         return false;
     }
 
-    /// <summary>
-    ///     Returns a list of ValueTuples of <see cref="T"/> and OrganComponent on each organ
-    ///     in the given body.
-    /// </summary>
-    /// <param name="uid">The body entity id to check on.</param>
-    /// <param name="body">The body to check for organs on.</param>
-    /// <typeparam name="T">The component to check for.</typeparam>
-    public List<(T Comp, OrganComponent Organ)> GetBodyOrganComponents<T>(
-        EntityUid uid,
-        BodyComponent? body = null)
-        where T : IComponent
-    {
-        if (!Resolve(uid, ref body))
-            return new List<(T Comp, OrganComponent Organ)>();
-
-        var query = GetEntityQuery<T>();
-        var list = new List<(T Comp, OrganComponent Organ)>(3);
-        foreach (var organ in GetBodyOrgans(uid, body))
-        {
-            if (query.TryGetComponent(organ.Id, out var comp))
-                list.Add((comp, organ.Component));
-        }
-
-        return list;
-    }
-
     /// <summary>
     /// Returns a list of Entity<<see cref="T"/>, <see cref="OrganComponent"/>>
     /// for each organ of the body
@@ -216,19 +190,18 @@ public List<Entity<T, OrganComponent>> GetBodyOrganEntityComps<T>(
     /// <param name="body">The body to check for organs on.</param>
     /// <typeparam name="T">The component to check for.</typeparam>
     /// <returns>Whether any were found.</returns>
-    public bool TryGetBodyOrganComponents<T>(
-        EntityUid uid,
-        [NotNullWhen(true)] out List<(T Comp, OrganComponent Organ)>? comps,
-        BodyComponent? body = null)
+    public bool TryGetBodyOrganEntityComps<T>(
+        Entity<BodyComponent?> entity,
+        [NotNullWhen(true)] out List<Entity<T, OrganComponent>>? comps)
         where T : IComponent
     {
-        if (!Resolve(uid, ref body))
+        if (!Resolve(entity.Owner, ref entity.Comp))
         {
             comps = null;
             return false;
         }
 
-        comps = GetBodyOrganComponents<T>(uid, body);
+        comps = GetBodyOrganEntityComps<T>(entity);
 
         if (comps.Count != 0)
             return true;
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
index ee79faa0b8e..0917197e29f 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
@@ -189,7 +189,7 @@ private void PartRemoveDamage(Entity<BodyComponent?> bodyEnt, Entity<BodyPartCom
     /// </summary>
     public EntityUid? GetParentPartOrNull(EntityUid uid)
     {
-        if (!Containers.TryGetContainingContainer(uid, out var container))
+        if (!Containers.TryGetContainingContainer((uid, null, null), out var container))
             return null;
 
         var parent = container.Owner;
@@ -205,7 +205,7 @@ private void PartRemoveDamage(Entity<BodyComponent?> bodyEnt, Entity<BodyPartCom
     /// </summary>
     public (EntityUid Parent, string Slot)? GetParentPartAndSlotOrNull(EntityUid uid)
     {
-        if (!Containers.TryGetContainingContainer(uid, out var container))
+        if (!Containers.TryGetContainingContainer((uid, null, null), out var container))
             return null;
 
         var slotId = GetPartSlotContainerIdFromContainer(container.ID);
@@ -235,7 +235,7 @@ public bool TryGetParentBodyPart(
         parentUid = null;
         parentComponent = null;
 
-        if (Containers.TryGetContainingContainer(partUid, out var container) &&
+        if (Containers.TryGetContainingContainer((partUid, null, null), out var container) &&
             TryComp(container.Owner, out parentComponent))
         {
             parentUid = container.Owner;
diff --git a/Content.Shared/Burial/BurialSystem.cs b/Content.Shared/Burial/BurialSystem.cs
index 5cf7d8820e9..c86b2ec0248 100644
--- a/Content.Shared/Burial/BurialSystem.cs
+++ b/Content.Shared/Burial/BurialSystem.cs
@@ -160,7 +160,7 @@ private void OnRelayMovement(EntityUid uid, GraveComponent component, ref Contai
     {
         // We track a separate doAfter here, as we want someone with a shovel to
         // be able to come along and help someone trying to claw their way out
-        if (component.HandDiggingDoAfter != null)
+        if (_doAfterSystem.IsRunning(component.HandDiggingDoAfter))
             return;
 
         if (!_actionBlocker.CanMove(args.Entity))
@@ -178,7 +178,7 @@ private void OnRelayMovement(EntityUid uid, GraveComponent component, ref Contai
         if (component.Stream == null)
             component.Stream = _audioSystem.PlayPredicted(component.DigSound, uid, args.Entity)?.Entity;
 
-        if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs))
+        if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs, out component.HandDiggingDoAfter))
         {
             _audioSystem.Stop(component.Stream);
             return;
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 567982b4301..9a75fb504ee 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -904,6 +904,15 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> AdminBypassMaxPlayers =
             CVarDef.Create("admin.bypass_max_players", true, CVar.SERVERONLY);
 
+        /// <summary>
+        /// Determine if custom rank names are used.
+        /// If it is false, it'd use the actual rank name regardless of the individual's title.
+        /// </summary>
+        /// <seealso cref="AhelpAdminPrefix"/>
+        /// <seealso cref="AhelpAdminPrefixWebhook"/>
+        public static readonly CVarDef<bool> AdminUseCustomNamesAdminRank =
+            CVarDef.Create("admin.use_custom_names_admin_rank", true, CVar.SERVERONLY);
+
         /*
          * AHELP
          */
@@ -923,6 +932,24 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<int> AhelpRateLimitCount =
             CVarDef.Create("ahelp.rate_limit_count", 10, CVar.SERVERONLY);
 
+        /// <summary>
+        /// Should the administrator's position be displayed in ahelp.
+        /// If it is is false, only the admin's ckey will be displayed in the ahelp.
+        /// </summary>
+        /// <seealso cref="AdminUseCustomNamesAdminRank"/>
+        /// <seealso cref="AhelpAdminPrefixWebhook"/>
+        public static readonly CVarDef<bool> AhelpAdminPrefix =
+            CVarDef.Create("ahelp.admin_prefix", true, CVar.SERVERONLY);
+
+        /// <summary>
+        /// Should the administrator's position be displayed in the webhook.
+        /// If it is is false, only the admin's ckey will be displayed in webhook.
+        /// </summary>
+        /// <seealso cref="AdminUseCustomNamesAdminRank"/>
+        /// <seealso cref="AhelpAdminPrefix"/>
+        public static readonly CVarDef<bool> AhelpAdminPrefixWebhook =
+            CVarDef.Create("ahelp.admin_prefix_webhook", true, CVar.SERVERONLY);
+
         /*
          * Explosions
          */
@@ -2187,6 +2214,12 @@ public static readonly CVarDef<float>
         public static readonly CVarDef<string> TippyEntity =
             CVarDef.Create("tippy.entity", "Tippy", CVar.SERVER | CVar.REPLICATED);
 
+        /// <summary>
+        ///     The number of seconds that must pass for a single entity to be able to point at something again.
+        /// </summary>
+        public static readonly CVarDef<float> PointingCooldownSeconds =
+            CVarDef.Create("pointing.cooldown_seconds", 0.5f, CVar.SERVERONLY);
+
         /*
          * DEBUG
          */
diff --git a/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs b/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs
index 100ee3975f9..1e3c14bfd49 100644
--- a/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs
@@ -53,5 +53,17 @@ public sealed partial class SolutionContainerVisualsComponent : Component
         /// </summary>
         [DataField]
         public int InHandsMaxFillLevels = 0;
+
+        /// <summary>
+        /// Optional equipped visuals to show someone is wearing a something with a filled container.
+        /// </summary>
+        [DataField]
+        public string? EquippedFillBaseName = null;
+
+        /// <summary>
+        /// A separate max fill levels for equipped items (to reduce number of sprites needed)
+        /// </summary>
+        [DataField]
+        public int EquippedMaxFillLevels = 0;
     }
 }
diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
index e5d8cc5f597..b0f55a32720 100644
--- a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
@@ -76,6 +76,9 @@ private void AddSetTransferVerbs(Entity<SolutionTransferComponent> ent, ref GetV
         var user = args.User;
         foreach (var amount in DefaultTransferAmounts)
         {
+          if (amount < comp.MinimumTransferAmount || amount > comp.MaximumTransferAmount)
+                continue;
+
             AlternativeVerb verb = new();
             verb.Text = Loc.GetString("comp-solution-transfer-verb-amount", ("amount", amount));
             verb.Category = VerbCategory.SetTransferAmount;
diff --git a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
index 897f3791561..21afd4e591d 100644
--- a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
+++ b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
@@ -48,7 +48,7 @@ private void OnHandleState(EntityUid uid, ClothingSpeedModifierComponent compone
 
         // Avoid raising the event for the container if nothing changed.
         // We'll still set the values in case they're slightly different but within tolerance.
-        if (diff && _container.TryGetContainingContainer(uid, out var container))
+        if (diff && _container.TryGetContainingContainer((uid, null, null), out var container))
         {
             _movementSpeed.RefreshMovementSpeedModifiers(container.Owner);
         }
@@ -112,7 +112,7 @@ private void OnToggled(Entity<ClothingSpeedModifierComponent> ent, ref ItemToggl
         // make sentient boots slow or fast too
         _movementSpeed.RefreshMovementSpeedModifiers(ent);
 
-        if (_container.TryGetContainingContainer(ent.Owner, out var container))
+        if (_container.TryGetContainingContainer((ent.Owner, null, null), out var container))
         {
             // inventory system will automatically hook into the event raised by this and update accordingly
             _movementSpeed.RefreshMovementSpeedModifiers(container.Owner);
diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
index 14137b38365..082b040a320 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -162,7 +162,7 @@ private void OnHandleState(EntityUid uid, ClothingComponent component, ref Compo
         if (args.Current is ClothingComponentState state)
         {
             SetEquippedPrefix(uid, state.EquippedPrefix, component);
-            if (component.InSlot != null && _containerSys.TryGetContainingContainer(uid, out var container))
+            if (component.InSlot != null && _containerSys.TryGetContainingContainer((uid, null, null), out var container))
             {
                 CheckEquipmentForLayerHide(uid, container.Owner);
             }
diff --git a/Content.Shared/Clothing/LoadoutSystem.cs b/Content.Shared/Clothing/LoadoutSystem.cs
index 4ec8d3c2fb6..9c20651f426 100644
--- a/Content.Shared/Clothing/LoadoutSystem.cs
+++ b/Content.Shared/Clothing/LoadoutSystem.cs
@@ -40,12 +40,25 @@ public static string GetJobPrototype(string? loadout)
         return "Job" + loadout;
     }
 
+    public EntProtoId? GetFirstOrNull(LoadoutPrototype loadout)
+    {
+        EntProtoId? proto = null;
+
+        if (_protoMan.TryIndex(loadout.StartingGear, out var gear))
+        {
+            proto = GetFirstOrNull(gear);
+        }
+
+        proto ??= GetFirstOrNull((IEquipmentLoadout)loadout);
+        return proto;
+    }
+
     /// <summary>
     /// Tries to get the first entity prototype for operations such as sprite drawing.
     /// </summary>
-    public EntProtoId? GetFirstOrNull(LoadoutPrototype loadout)
+    public EntProtoId? GetFirstOrNull(IEquipmentLoadout? gear)
     {
-        if (!_protoMan.TryIndex(loadout.Equipment, out var gear))
+        if (gear == null)
             return null;
 
         var count = gear.Equipment.Count + gear.Inhand.Count + gear.Storage.Values.Sum(x => x.Count);
@@ -75,13 +88,23 @@ public static string GetJobPrototype(string? loadout)
         return null;
     }
 
+    public string GetName(LoadoutPrototype loadout)
+    {
+        if (_protoMan.TryIndex(loadout.StartingGear, out var gear))
+        {
+            return GetName(gear);
+        }
+
+        return GetName((IEquipmentLoadout) loadout);
+    }
+
     /// <summary>
     /// Tries to get the name of a loadout.
     /// </summary>
-    public string GetName(LoadoutPrototype loadout)
+    public string GetName(IEquipmentLoadout? gear)
     {
-        if (!_protoMan.TryIndex(loadout.Equipment, out var gear))
-            return Loc.GetString("loadout-unknown");
+        if (gear == null)
+            return string.Empty;
 
         var count = gear.Equipment.Count + gear.Storage.Values.Sum(o => o.Count) + gear.Inhand.Count;
 
@@ -111,7 +134,7 @@ public string GetName(LoadoutPrototype loadout)
             }
         }
 
-        return Loc.GetString($"loadout-{loadout.ID}");
+        return Loc.GetString($"unknown");
     }
 
     private void OnMapInit(EntityUid uid, LoadoutComponent component, MapInitEvent args)
@@ -119,8 +142,7 @@ private void OnMapInit(EntityUid uid, LoadoutComponent component, MapInitEvent a
         // Use starting gear if specified
         if (component.StartingGear != null)
         {
-            var gear = _protoMan.Index(_random.Pick(component.StartingGear));
-            _station.EquipStartingGear(uid, gear);
+            _station.EquipStartingGear(uid, _random.Pick(component.StartingGear));
             return;
         }
 
diff --git a/Content.Shared/Clothing/MagbootsSystem.cs b/Content.Shared/Clothing/MagbootsSystem.cs
index 88d987aae18..d41f27fefb0 100644
--- a/Content.Shared/Clothing/MagbootsSystem.cs
+++ b/Content.Shared/Clothing/MagbootsSystem.cs
@@ -36,7 +36,7 @@ private void OnToggled(Entity<MagbootsComponent> ent, ref ItemToggledEvent args)
     {
         var (uid, comp) = ent;
         // only stick to the floor if being worn in the correct slot
-        if (_container.TryGetContainingContainer(uid, out var container) &&
+        if (_container.TryGetContainingContainer((uid, null, null), out var container) &&
             _inventory.TryGetSlotEntity(container.Owner, comp.Slot, out var worn)
             && uid == worn)
         {
diff --git a/Content.Shared/Construction/MachinePartSystem.cs b/Content.Shared/Construction/MachinePartSystem.cs
index f357a395e64..f3314dfc11b 100644
--- a/Content.Shared/Construction/MachinePartSystem.cs
+++ b/Content.Shared/Construction/MachinePartSystem.cs
@@ -81,9 +81,9 @@ public Dictionary<string, int> GetMachineBoardMaterialCost(Entity<MachineBoardCo
                 {
                     var partRecipe = recipes[0];
                     if (recipes.Count > 1)
-                        partRecipe = recipes.MinBy(p => p.RequiredMaterials.Values.Sum());
+                        partRecipe = recipes.MinBy(p => p.Materials.Values.Sum());
 
-                    foreach (var (mat, matAmount) in partRecipe!.RequiredMaterials)
+                    foreach (var (mat, matAmount) in partRecipe!.Materials)
                     {
                         materials.TryAdd(mat, 0);
                         materials[mat] += matAmount * amount * coefficient;
@@ -101,9 +101,9 @@ public Dictionary<string, int> GetMachineBoardMaterialCost(Entity<MachineBoardCo
                 {
                     var partRecipe = recipes[0];
                     if (recipes.Count > 1)
-                        partRecipe = recipes.MinBy(p => p.RequiredMaterials.Values.Sum());
+                        partRecipe = recipes.MinBy(p => p.Materials.Values.Sum());
 
-                    foreach (var (mat, matAmount) in partRecipe!.RequiredMaterials)
+                    foreach (var (mat, matAmount) in partRecipe!.Materials)
                     {
                         materials.TryAdd(mat, 0);
                         materials[mat] += matAmount * amount * coefficient;
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index f294693c0aa..2139d53ae47 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -543,6 +543,25 @@ public bool TryCuffing(EntityUid user, EntityUid target, EntityUid handcuff, Han
             return true;
         }
 
+        /// <summary>
+        /// Checks if the target is handcuffed.
+        /// </summary>
+        /// <param name="requireFullyCuffed">when true, return false if the target is only partially cuffed (for things with more than 2 hands)</param>
+        /// <returns></returns>
+        public bool IsCuffed(Entity<CuffableComponent> target, bool requireFullyCuffed = true)
+        {
+            if (!TryComp<HandsComponent>(target, out var hands))
+                return false;
+
+            if (target.Comp.CuffedHandCount <= 0)
+                return false;
+
+            if (requireFullyCuffed && hands.Count > target.Comp.CuffedHandCount)
+                return false;
+
+            return true;
+        }
+
         /// <summary>
         /// Attempt to uncuff a cuffed entity. Can be called by the cuffed entity, or another entity trying to help uncuff them.
         /// If the uncuffing succeeds, the cuffs will drop on the floor.
diff --git a/Content.Shared/Damage/Components/DamageProtectionBuffComponent.cs b/Content.Shared/Damage/Components/DamageProtectionBuffComponent.cs
new file mode 100644
index 00000000000..99b055a6456
--- /dev/null
+++ b/Content.Shared/Damage/Components/DamageProtectionBuffComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Damage.Prototypes;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Damage.Components;
+
+/// <summary>
+///     Applies the specified DamageModifierSets when the entity takes damage.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class DamageProtectionBuffComponent : Component
+{
+    /// <summary>
+    ///     The damage modifiers for entities with this component.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, DamageModifierSetPrototype> Modifiers = new();
+}
diff --git a/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs b/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs
index c13ec0a1b9f..78e86f5ab42 100644
--- a/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs
@@ -37,7 +37,7 @@ public override void Update(float frameTime)
         {
             if (!component.Enabled || component.NextDamage > _timing.CurTime)
                 continue;
-            if (_container.TryGetContainingContainer(uid, out var container))
+            if (_container.TryGetContainingContainer((uid, null, null), out var container))
             {
                 _damageableSystem.TryChangeDamage(container.Owner, component.Damage, origin: uid);
             }
diff --git a/Content.Shared/Damage/Systems/DamageProtectionBuffSystem.cs b/Content.Shared/Damage/Systems/DamageProtectionBuffSystem.cs
new file mode 100644
index 00000000000..bbb7bfda323
--- /dev/null
+++ b/Content.Shared/Damage/Systems/DamageProtectionBuffSystem.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Damage.Components;
+
+namespace Content.Shared.Damage.Systems;
+
+public sealed class DamageProtectionBuffSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DamageProtectionBuffComponent, DamageModifyEvent>(OnDamageModify);
+    }
+
+    private void OnDamageModify(EntityUid uid, DamageProtectionBuffComponent component, DamageModifyEvent args)
+    {
+        foreach (var modifier in component.Modifiers.Values)
+            args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, modifier);
+    }
+}
diff --git a/Content.Shared/Decals/DecalPrototype.cs b/Content.Shared/Decals/DecalPrototype.cs
index 2721f5d2d25..543537f1bf7 100644
--- a/Content.Shared/Decals/DecalPrototype.cs
+++ b/Content.Shared/Decals/DecalPrototype.cs
@@ -1,10 +1,11 @@
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Decals
 {
     [Prototype("decal")]
-    public sealed partial class DecalPrototype : IPrototype
+    public sealed partial class DecalPrototype : IPrototype, IInheritingPrototype
     {
         [IdDataField] public string ID { get; } = null!;
         [DataField("sprite")] public SpriteSpecifier Sprite { get; private set; } = SpriteSpecifier.Invalid;
@@ -33,5 +34,13 @@ public sealed partial class DecalPrototype : IPrototype
         /// </summary>
         [DataField]
         public bool DefaultSnap = true;
+
+        [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<DecalPrototype>))]
+        public string[]? Parents { get; }
+
+        [NeverPushInheritance]
+        [AbstractDataField]
+        public bool Abstract { get; }
+
     }
 }
diff --git a/Content.Shared/Drowsiness/DrowsinessComponent.cs b/Content.Shared/Drowsiness/DrowsinessComponent.cs
new file mode 100644
index 00000000000..7e170ed232e
--- /dev/null
+++ b/Content.Shared/Drowsiness/DrowsinessComponent.cs
@@ -0,0 +1,28 @@
+using System.Numerics;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Drowsiness;
+
+/// <summary>
+///     Exists for use as a status effect. Adds a shader to the client that scales with the effect duration.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
+public sealed partial class DrowsinessComponent : Component
+{
+    /// <summary>
+    /// The random time between sleeping incidents, (min, max).
+    /// </summary>
+    [DataField(required: true)]
+    public Vector2 TimeBetweenIncidents = new Vector2(5f, 60f);
+
+    /// <summary>
+    /// The duration of sleeping incidents, (min, max).
+    /// </summary>
+    [DataField(required: true)]
+    public Vector2 DurationOfIncident = new Vector2(2, 5);
+
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
+    public TimeSpan NextIncidentTime = TimeSpan.Zero;
+}
diff --git a/Content.Shared/Drowsiness/DrowsinessSystem.cs b/Content.Shared/Drowsiness/DrowsinessSystem.cs
new file mode 100644
index 00000000000..97d7c0952dc
--- /dev/null
+++ b/Content.Shared/Drowsiness/DrowsinessSystem.cs
@@ -0,0 +1,9 @@
+using Content.Shared.StatusEffect;
+
+namespace Content.Shared.Drowsiness;
+
+public abstract class SharedDrowsinessSystem : EntitySystem
+{
+    [ValidatePrototypeId<StatusEffectPrototype>]
+    public const string DrowsinessKey = "Drowsiness";
+}
diff --git a/Content.Server/Explosion/Components/ExplosionResistanceComponent.cs b/Content.Shared/Explosion/Components/ExplosionResistanceComponent.cs
similarity index 89%
rename from Content.Server/Explosion/Components/ExplosionResistanceComponent.cs
rename to Content.Shared/Explosion/Components/ExplosionResistanceComponent.cs
index d4a93c2b569..3b5c64c3ec9 100644
--- a/Content.Server/Explosion/Components/ExplosionResistanceComponent.cs
+++ b/Content.Shared/Explosion/Components/ExplosionResistanceComponent.cs
@@ -1,8 +1,8 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Explosion;
+using Content.Shared.Explosion.EntitySystems;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Explosion.Components;
+namespace Content.Shared.Explosion.Components;
 
 /// <summary>
 /// Component that provides entities with explosion resistance.
@@ -13,8 +13,8 @@ namespace Content.Server.Explosion.Components;
 ///     This is desirable over just using damage modifier sets, given that equipment like bomb-suits need to
 ///     significantly reduce the damage, but shouldn't be silly overpowered in regular combat.
 /// </remarks>
-[RegisterComponent]
-[Access(typeof(ExplosionSystem))]
+[NetworkedComponent, RegisterComponent]
+[Access(typeof(SharedExplosionSystem))]
 public sealed partial class ExplosionResistanceComponent : Component
 {
     /// <summary>
diff --git a/Content.Shared/Explosion/EntitySystems/SharedExplosionSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedExplosionSystem.cs
new file mode 100644
index 00000000000..1d926dd0b67
--- /dev/null
+++ b/Content.Shared/Explosion/EntitySystems/SharedExplosionSystem.cs
@@ -0,0 +1,25 @@
+using Content.Shared.Explosion.Components;
+using Content.Shared.Armor;
+
+namespace Content.Shared.Explosion.EntitySystems;
+
+public abstract class SharedExplosionSystem : EntitySystem
+{
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<ExplosionResistanceComponent, ArmorExamineEvent>(OnArmorExamine);
+    }
+
+    private void OnArmorExamine(EntityUid uid, ExplosionResistanceComponent component, ref ArmorExamineEvent args)
+    {
+        var value = MathF.Round((1f - component.DamageCoefficient) * 100, 1);
+
+        if (value == 0)
+            return;
+
+        args.Msg.PushNewline();
+        args.Msg.AddMarkupOrThrow(Loc.GetString(component.Examine, ("value", value)));
+    }
+}
diff --git a/Content.Shared/Foldable/DeployFoldableComponent.cs b/Content.Shared/Foldable/DeployFoldableComponent.cs
new file mode 100644
index 00000000000..4ccca6b7427
--- /dev/null
+++ b/Content.Shared/Foldable/DeployFoldableComponent.cs
@@ -0,0 +1,7 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Foldable;
+
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(DeployFoldableSystem))]
+public sealed partial class DeployFoldableComponent : Component;
diff --git a/Content.Shared/Foldable/DeployFoldableSystem.cs b/Content.Shared/Foldable/DeployFoldableSystem.cs
new file mode 100644
index 00000000000..fa2e3f87892
--- /dev/null
+++ b/Content.Shared/Foldable/DeployFoldableSystem.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Interaction;
+
+namespace Content.Shared.Foldable;
+
+public sealed class DeployFoldableSystem : EntitySystem
+{
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly FoldableSystem _foldable = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DeployFoldableComponent, AfterInteractEvent>(OnAfterInteract);
+    }
+
+    private void OnAfterInteract(Entity<DeployFoldableComponent> ent, ref AfterInteractEvent args)
+    {
+        if (args.Handled || !args.CanReach)
+            return;
+
+        if (!TryComp<FoldableComponent>(ent, out var foldable))
+            return;
+
+        if (!TryComp(args.User, out HandsComponent? hands)
+            || !_hands.TryDrop(args.User, args.Used, targetDropLocation: args.ClickLocation, handsComp: hands))
+            return;
+
+        if (!_foldable.TrySetFolded(ent, foldable, false))
+        {
+            _hands.TryPickup(args.User, args.Used, handsComp: hands);
+            return;
+        }
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index 55923547401..1ccddb11e62 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -105,5 +105,14 @@ public static BoundKeyFunction[] GetHotbarBoundKeys() =>
         public static readonly BoundKeyFunction EditorCopyObject = "EditorCopyObject";
         public static readonly BoundKeyFunction EditorFlipObject = "EditorFlipObject";
         public static readonly BoundKeyFunction InspectEntity = "InspectEntity";
+
+        public static readonly BoundKeyFunction MappingUnselect = "MappingUnselect";
+        public static readonly BoundKeyFunction SaveMap = "SaveMap";
+        public static readonly BoundKeyFunction MappingEnablePick = "MappingEnablePick";
+        public static readonly BoundKeyFunction MappingEnableDelete = "MappingEnableDelete";
+        public static readonly BoundKeyFunction MappingPick = "MappingPick";
+        public static readonly BoundKeyFunction MappingRemoveDecal = "MappingRemoveDecal";
+        public static readonly BoundKeyFunction MappingCancelEraseDecal = "MappingCancelEraseDecal";
+        public static readonly BoundKeyFunction MappingOpenContextMenu = "MappingOpenContextMenu";
     }
 }
diff --git a/Content.Shared/Interaction/InteractionPopupSystem.cs b/Content.Shared/Interaction/InteractionPopupSystem.cs
index d956ff3d953..2a742d4211b 100644
--- a/Content.Shared/Interaction/InteractionPopupSystem.cs
+++ b/Content.Shared/Interaction/InteractionPopupSystem.cs
@@ -113,7 +113,7 @@ private void SharedInteract(
                 Spawn(component.InteractFailureSpawn, _transform.GetMapCoordinates(uid));
         }
 
-        if (component.MessagePerceivedByOthers != null)
+        if (!string.IsNullOrEmpty(component.MessagePerceivedByOthers))
         {
             var msgOthers = Loc.GetString(component.MessagePerceivedByOthers,
                 ("user", Identity.Entity(user, EntityManager)), ("target", Identity.Entity(uid, EntityManager)));
@@ -131,7 +131,7 @@ private void SharedInteract(
             return;
         }
 
-        _popupSystem.PopupPredicted(msg, uid, user);
+        _popupSystem.PopupClient(msg, uid, user);
 
         if (sfx == null)
             return;
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 036f9c72d04..e5af8cd8ebc 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -165,10 +165,7 @@ private void OnBoundInterfaceInteractAttempt(BoundUserInterfaceMessageAttempt ev
                 return;
             }
 
-            if (!uiComp.RequireHands)
-                return;
-
-            if (!_handsQuery.TryComp(ev.Actor, out var hands) || hands.Hands.Count == 0)
+            if (uiComp.RequireHands && !_handsQuery.HasComp(ev.Actor))
                 ev.Cancel();
         }
 
@@ -1175,7 +1172,7 @@ public bool IsAccessible(Entity<TransformComponent?> user, Entity<TransformCompo
         /// </summary>
         public bool CanAccessViaStorage(EntityUid user, EntityUid target)
         {
-            if (!_containerSystem.TryGetContainingContainer(target, out var container))
+            if (!_containerSystem.TryGetContainingContainer((target, null, null), out var container))
                 return false;
 
             return CanAccessViaStorage(user, target, container);
@@ -1201,7 +1198,7 @@ public bool CanAccessEquipment(EntityUid user, EntityUid target)
             if (Deleted(target))
                 return false;
 
-            if (!_containerSystem.TryGetContainingContainer(target, out var container))
+            if (!_containerSystem.TryGetContainingContainer((target, null, null), out var container))
                 return false;
 
             var wearer = container.Owner;
diff --git a/Content.Shared/Item/SharedItemSystem.cs b/Content.Shared/Item/SharedItemSystem.cs
index 5eaa25f4847..a058cb86588 100644
--- a/Content.Shared/Item/SharedItemSystem.cs
+++ b/Content.Shared/Item/SharedItemSystem.cs
@@ -110,8 +110,8 @@ private void AddPickupVerb(EntityUid uid, ItemComponent component, GetVerbsEvent
 
         // if the item already in a container (that is not the same as the user's), then change the text.
         // this occurs when the item is in their inventory or in an open backpack
-        Container.TryGetContainingContainer(args.User, out var userContainer);
-        if (Container.TryGetContainingContainer(args.Target, out var container) && container != userContainer)
+        Container.TryGetContainingContainer((args.User, null, null), out var userContainer);
+        if (Container.TryGetContainingContainer((args.Target, null, null), out var container) && container != userContainer)
             verb.Text = Loc.GetString("pick-up-verb-get-data-text-inventory");
         else
             verb.Text = Loc.GetString("pick-up-verb-get-data-text");
diff --git a/Content.Shared/Lathe/LatheComponent.cs b/Content.Shared/Lathe/LatheComponent.cs
index 5039e78cb07..d776a65e233 100644
--- a/Content.Shared/Lathe/LatheComponent.cs
+++ b/Content.Shared/Lathe/LatheComponent.cs
@@ -33,6 +33,9 @@ public sealed partial class LatheComponent : Component
         [DataField]
         public SoundSpecifier? ProducingSound;
 
+        [DataField]
+        public string? ReagentOutputSlotId;
+
         #region Visualizer info
         [DataField]
         public string? IdleState;
diff --git a/Content.Shared/Lathe/SharedLatheSystem.cs b/Content.Shared/Lathe/SharedLatheSystem.cs
index b41a91f9c34..e240571f315 100644
--- a/Content.Shared/Lathe/SharedLatheSystem.cs
+++ b/Content.Shared/Lathe/SharedLatheSystem.cs
@@ -1,5 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Content.Shared.Emag.Systems;
+using Content.Shared.Examine;
+using Content.Shared.Localizations;
 using Content.Shared.Materials;
 using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
@@ -23,10 +26,21 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<EmagLatheRecipesComponent, GotEmaggedEvent>(OnEmagged);
+        SubscribeLocalEvent<LatheComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
+
         BuildInverseRecipeDictionary();
     }
 
+    private void OnExamined(Entity<LatheComponent> ent, ref ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        if (ent.Comp.ReagentOutputSlotId != null)
+            args.PushMarkup(Loc.GetString("lathe-menu-reagent-slot-examine"));
+    }
+
     [PublicAPI]
     public bool CanProduce(EntityUid uid, string recipe, int amount = 1, LatheComponent? component = null)
     {
@@ -40,7 +54,7 @@ public bool CanProduce(EntityUid uid, LatheRecipePrototype recipe, int amount =
         if (!HasRecipe(uid, recipe, component))
             return false;
 
-        foreach (var (material, needed) in recipe.RequiredMaterials)
+        foreach (var (material, needed) in recipe.Materials)
         {
             var adjustedAmount = AdjustMaterial(needed, recipe.ApplyMaterialDiscount, component.MaterialUseMultiplier);
 
@@ -72,6 +86,9 @@ private void BuildInverseRecipeDictionary()
         _inverseRecipeDictionary.Clear();
         foreach (var latheRecipe in _proto.EnumeratePrototypes<LatheRecipePrototype>())
         {
+            if (latheRecipe.Result == null)
+                continue;
+
             _inverseRecipeDictionary.GetOrNew(latheRecipe.Result).Add(latheRecipe);
         }
     }
@@ -83,4 +100,55 @@ public bool TryGetRecipesFromEntity(string prototype, [NotNullWhen(true)] out Li
             recipes.AddRange(r);
         return recipes.Count != 0;
     }
+
+    public string GetRecipeName(ProtoId<LatheRecipePrototype> proto)
+    {
+        return GetRecipeName(_proto.Index(proto));
+    }
+
+    public string GetRecipeName(LatheRecipePrototype proto)
+    {
+        if (!string.IsNullOrWhiteSpace(proto.Name))
+            return Loc.GetString(proto.Name);
+
+        if (proto.Result is { } result)
+        {
+            return _proto.Index(result).Name;
+        }
+
+        if (proto.ResultReagents is { } resultReagents)
+        {
+            return ContentLocalizationManager.FormatList(resultReagents
+                .Select(p => Loc.GetString("lathe-menu-result-reagent-display", ("reagent", _proto.Index(p.Key).LocalizedName), ("amount", p.Value)))
+                .ToList());
+        }
+
+        return string.Empty;
+    }
+
+    [PublicAPI]
+    public string GetRecipeDescription(ProtoId<LatheRecipePrototype> proto)
+    {
+        return GetRecipeDescription(_proto.Index(proto));
+    }
+
+    public string GetRecipeDescription(LatheRecipePrototype proto)
+    {
+        if (!string.IsNullOrWhiteSpace(proto.Description))
+            return Loc.GetString(proto.Description);
+
+        if (proto.Result is { } result)
+        {
+            return _proto.Index(result).Description;
+        }
+
+        if (proto.ResultReagents is { } resultReagents)
+        {
+            // We only use the first one for the description since these descriptions don't combine very well.
+            var reagent = resultReagents.First().Key;
+            return _proto.Index(reagent).LocalizedDescription;
+        }
+
+        return string.Empty;
+    }
 }
diff --git a/Content.Shared/Mapping/MappingMapDataMessage.cs b/Content.Shared/Mapping/MappingMapDataMessage.cs
new file mode 100644
index 00000000000..a3961a68099
--- /dev/null
+++ b/Content.Shared/Mapping/MappingMapDataMessage.cs
@@ -0,0 +1,46 @@
+using System.IO;
+using Lidgren.Network;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Mapping;
+
+public sealed class MappingMapDataMessage : NetMessage
+{
+    public override MsgGroups MsgGroup => MsgGroups.Command;
+    public override NetDeliveryMethod DeliveryMethod => NetDeliveryMethod.ReliableUnordered;
+
+    public ZStdCompressionContext Context = default!;
+    public string Yml = default!;
+
+    public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
+    {
+        MsgSize = buffer.LengthBytes;
+
+        var uncompressedLength = buffer.ReadVariableInt32();
+        var compressedLength = buffer.ReadVariableInt32();
+        var stream = new MemoryStream(compressedLength);
+        buffer.ReadAlignedMemory(stream, compressedLength);
+        using var decompress = new ZStdDecompressStream(stream);
+        using var decompressed = new MemoryStream(uncompressedLength);
+
+        decompress.CopyTo(decompressed, uncompressedLength);
+        decompressed.Position = 0;
+        serializer.DeserializeDirect(decompressed, out Yml);
+    }
+
+    public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer)
+    {
+        var stream = new MemoryStream();
+        serializer.SerializeDirect(stream, Yml);
+        buffer.WriteVariableInt32((int) stream.Length);
+
+        stream.Position = 0;
+        var buf = new byte[ZStd.CompressBound((int) stream.Length)];
+        var length = Context.Compress2(buf, stream.AsSpan());
+
+        buffer.WriteVariableInt32(length);
+        buffer.Write(buf.AsSpan(0, length));
+    }
+}
diff --git a/Content.Shared/Mapping/MappingSaveMapErrorMessage.cs b/Content.Shared/Mapping/MappingSaveMapErrorMessage.cs
new file mode 100644
index 00000000000..e30e2573052
--- /dev/null
+++ b/Content.Shared/Mapping/MappingSaveMapErrorMessage.cs
@@ -0,0 +1,19 @@
+using Lidgren.Network;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Mapping;
+
+public sealed class MappingSaveMapErrorMessage : NetMessage
+{
+    public override MsgGroups MsgGroup => MsgGroups.Command;
+    public override NetDeliveryMethod DeliveryMethod => NetDeliveryMethod.ReliableUnordered;
+
+    public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
+    {
+    }
+
+    public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer)
+    {
+    }
+}
diff --git a/Content.Shared/Mapping/MappingSaveMapMessage.cs b/Content.Shared/Mapping/MappingSaveMapMessage.cs
new file mode 100644
index 00000000000..f80b8661210
--- /dev/null
+++ b/Content.Shared/Mapping/MappingSaveMapMessage.cs
@@ -0,0 +1,19 @@
+using Lidgren.Network;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Mapping;
+
+public sealed class MappingSaveMapMessage : NetMessage
+{
+    public override MsgGroups MsgGroup => MsgGroups.Command;
+    public override NetDeliveryMethod DeliveryMethod => NetDeliveryMethod.ReliableUnordered;
+
+    public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
+    {
+    }
+
+    public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer)
+    {
+    }
+}
diff --git a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
index a8a539ec251..5b0d1390776 100644
--- a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
@@ -97,7 +97,7 @@ public bool TryStartProcessItem(EntityUid uid, EntityUid item, MaterialReclaimer
             _whitelistSystem.IsBlacklistPass(component.Blacklist, item))
             return false;
 
-        if (Container.TryGetContainingContainer(item, out _) && !Container.TryRemoveFromContainer(item))
+        if (Container.TryGetContainingContainer((item, null, null), out _) && !Container.TryRemoveFromContainer(item))
             return false;
 
         if (user != null)
diff --git a/Content.Shared/Movement/Events/MoveInputEvent.cs b/Content.Shared/Movement/Events/MoveInputEvent.cs
index 1c677a42e87..9c49da722cb 100644
--- a/Content.Shared/Movement/Events/MoveInputEvent.cs
+++ b/Content.Shared/Movement/Events/MoveInputEvent.cs
@@ -9,16 +9,14 @@ namespace Content.Shared.Movement.Events;
 [ByRefEvent]
 public readonly struct MoveInputEvent
 {
-    public readonly EntityUid Entity;
-    public readonly InputMoverComponent Component;
+    public readonly Entity<InputMoverComponent> Entity;
     public readonly MoveButtons OldMovement;
 
-    public bool HasDirectionalMovement => (Component.HeldMoveButtons & MoveButtons.AnyDirection) != MoveButtons.None;
+    public bool HasDirectionalMovement => (Entity.Comp.HeldMoveButtons & MoveButtons.AnyDirection) != MoveButtons.None;
 
-    public MoveInputEvent(EntityUid entity, InputMoverComponent component, MoveButtons oldMovement)
+    public MoveInputEvent(Entity<InputMoverComponent> entity, MoveButtons oldMovement)
     {
         Entity = entity;
-        Component = component;
         OldMovement = oldMovement;
     }
 }
diff --git a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
index 724eca682fb..276aa620324 100644
--- a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
+++ b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
@@ -13,12 +13,12 @@ namespace Content.Shared.Movement.Systems;
 
 public abstract class SharedJetpackSystem : EntitySystem
 {
-    [Dependency] private   readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
-    [Dependency] protected  readonly SharedAppearanceSystem Appearance = default!;
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
+    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] protected readonly SharedContainerSystem Container = default!;
-    [Dependency] private   readonly SharedMoverController _mover = default!;
-    [Dependency] private   readonly SharedPopupSystem _popup = default!;
-    [Dependency] private   readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedMoverController _mover = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
 
     public override void Initialize()
@@ -158,7 +158,7 @@ public void SetEnabled(EntityUid uid, JetpackComponent component, bool enabled,
 
         if (user == null)
         {
-            Container.TryGetContainingContainer(uid, out var container);
+            Container.TryGetContainingContainer((uid, null, null), out var container);
             user = container?.Owner;
         }
 
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
index 1ccb7f0c3f1..9dda249423e 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
@@ -83,53 +83,53 @@ public static MoveButtons GetNormalizedMovement(MoveButtons buttons)
             return oldMovement;
         }
 
-        protected void SetMoveInput(InputMoverComponent component, MoveButtons buttons)
+        protected void SetMoveInput(Entity<InputMoverComponent> entity, MoveButtons buttons)
         {
-            if (component.HeldMoveButtons == buttons)
+            if (entity.Comp.HeldMoveButtons == buttons)
                 return;
 
             // Relay the fact we had any movement event.
             // TODO: Ideally we'd do these in a tick instead of out of sim.
-            var moveEvent = new MoveInputEvent(component.Owner, component, component.HeldMoveButtons);
-            component.HeldMoveButtons = buttons;
-            RaiseLocalEvent(component.Owner, ref moveEvent);
-            Dirty(component.Owner, component);
+            var moveEvent = new MoveInputEvent(entity, entity.Comp.HeldMoveButtons);
+            entity.Comp.HeldMoveButtons = buttons;
+            RaiseLocalEvent(entity, ref moveEvent);
+            Dirty(entity, entity.Comp);
         }
 
-        private void OnMoverHandleState(EntityUid uid, InputMoverComponent component, ComponentHandleState args)
+        private void OnMoverHandleState(Entity<InputMoverComponent> entity, ref ComponentHandleState args)
         {
             if (args.Current is not InputMoverComponentState state)
                 return;
 
             // Handle state
-            component.LerpTarget = state.LerpTarget;
-            component.RelativeRotation = state.RelativeRotation;
-            component.TargetRelativeRotation = state.TargetRelativeRotation;
-            component.CanMove = state.CanMove;
-            component.RelativeEntity = EnsureEntity<InputMoverComponent>(state.RelativeEntity, uid);
+            entity.Comp.LerpTarget = state.LerpTarget;
+            entity.Comp.RelativeRotation = state.RelativeRotation;
+            entity.Comp.TargetRelativeRotation = state.TargetRelativeRotation;
+            entity.Comp.CanMove = state.CanMove;
+            entity.Comp.RelativeEntity = EnsureEntity<InputMoverComponent>(state.RelativeEntity, entity.Owner);
 
             // Reset
-            component.LastInputTick = GameTick.Zero;
-            component.LastInputSubTick = 0;
+            entity.Comp.LastInputTick = GameTick.Zero;
+            entity.Comp.LastInputSubTick = 0;
 
-            if (component.HeldMoveButtons != state.HeldMoveButtons)
+            if (entity.Comp.HeldMoveButtons != state.HeldMoveButtons)
             {
-                var moveEvent = new MoveInputEvent(uid, component, component.HeldMoveButtons);
-                component.HeldMoveButtons = state.HeldMoveButtons;
-                RaiseLocalEvent(uid, ref moveEvent);
+                var moveEvent = new MoveInputEvent(entity, entity.Comp.HeldMoveButtons);
+                entity.Comp.HeldMoveButtons = state.HeldMoveButtons;
+                RaiseLocalEvent(entity.Owner, ref moveEvent);
             }
         }
 
-        private void OnMoverGetState(EntityUid uid, InputMoverComponent component, ref ComponentGetState args)
+        private void OnMoverGetState(Entity<InputMoverComponent> entity, ref ComponentGetState args)
         {
             args.State = new InputMoverComponentState()
             {
-                CanMove = component.CanMove,
-                RelativeEntity = GetNetEntity(component.RelativeEntity),
-                LerpTarget = component.LerpTarget,
-                HeldMoveButtons = component.HeldMoveButtons,
-                RelativeRotation = component.RelativeRotation,
-                TargetRelativeRotation = component.TargetRelativeRotation,
+                CanMove = entity.Comp.CanMove,
+                RelativeEntity = GetNetEntity(entity.Comp.RelativeEntity),
+                LerpTarget = entity.Comp.LerpTarget,
+                HeldMoveButtons = entity.Comp.HeldMoveButtons,
+                RelativeRotation = entity.Comp.RelativeRotation,
+                TargetRelativeRotation = entity.Comp.TargetRelativeRotation,
             };
         }
 
@@ -142,9 +142,9 @@ private void ShutdownInput()
 
         protected virtual void HandleShuttleInput(EntityUid uid, ShuttleButtons button, ushort subTick, bool state) {}
 
-        private void OnAutoParentChange(EntityUid uid, AutoOrientComponent component, ref EntParentChangedMessage args)
+        private void OnAutoParentChange(Entity<AutoOrientComponent> entity, ref EntParentChangedMessage args)
         {
-            ResetCamera(uid);
+            ResetCamera(entity.Owner);
         }
 
         public void RotateCamera(EntityUid uid, Angle angle)
@@ -233,28 +233,28 @@ public Angle GetParentGridAngle(InputMoverComponent mover)
             return rotation;
         }
 
-        private void OnFollowedParentChange(EntityUid uid, FollowedComponent component, ref EntParentChangedMessage args)
+        private void OnFollowedParentChange(Entity<FollowedComponent> entity, ref EntParentChangedMessage args)
         {
-            foreach (var foll in component.Following)
+            foreach (var foll in entity.Comp.Following)
             {
                 if (!MoverQuery.TryGetComponent(foll, out var mover))
                     continue;
 
                 var ev = new EntParentChangedMessage(foll, null, args.OldMapId, XformQuery.GetComponent(foll));
-                OnInputParentChange(foll, mover, ref ev);
+                OnInputParentChange((foll, mover), ref ev);
             }
         }
 
-        private void OnInputParentChange(EntityUid uid, InputMoverComponent component, ref EntParentChangedMessage args)
+        private void OnInputParentChange(Entity<InputMoverComponent> entity, ref EntParentChangedMessage args)
         {
             // If we change our grid / map then delay updating our LastGridAngle.
             var relative = args.Transform.GridUid;
             relative ??= args.Transform.MapUid;
 
-            if (component.LifeStage < ComponentLifeStage.Running)
+            if (entity.Comp.LifeStage < ComponentLifeStage.Running)
             {
-                component.RelativeEntity = relative;
-                Dirty(uid, component);
+                entity.Comp.RelativeEntity = relative;
+                Dirty(entity.Owner, entity.Comp);
                 return;
             }
 
@@ -264,28 +264,28 @@ private void OnInputParentChange(EntityUid uid, InputMoverComponent component, r
             // If we change maps then reset eye rotation entirely.
             if (oldMapId != mapId)
             {
-                component.RelativeEntity = relative;
-                component.TargetRelativeRotation = Angle.Zero;
-                component.RelativeRotation = Angle.Zero;
-                component.LerpTarget = TimeSpan.Zero;
-                Dirty(uid, component);
+                entity.Comp.RelativeEntity = relative;
+                entity.Comp.TargetRelativeRotation = Angle.Zero;
+                entity.Comp.RelativeRotation = Angle.Zero;
+                entity.Comp.LerpTarget = TimeSpan.Zero;
+                Dirty(entity.Owner, entity.Comp);
                 return;
             }
 
             // If we go on a grid and back off then just reset the accumulator.
-            if (relative == component.RelativeEntity)
+            if (relative == entity.Comp.RelativeEntity)
             {
-                if (component.LerpTarget >= Timing.CurTime)
+                if (entity.Comp.LerpTarget >= Timing.CurTime)
                 {
-                    component.LerpTarget = TimeSpan.Zero;
-                    Dirty(uid, component);
+                    entity.Comp.LerpTarget = TimeSpan.Zero;
+                    Dirty(entity.Owner, entity.Comp);
                 }
 
                 return;
             }
 
-            component.LerpTarget = TimeSpan.FromSeconds(InputMoverComponent.LerpTime) + Timing.CurTime;
-            Dirty(uid, component);
+            entity.Comp.LerpTarget = TimeSpan.FromSeconds(InputMoverComponent.LerpTime) + Timing.CurTime;
+            Dirty(entity.Owner, entity.Comp);
         }
 
         private void HandleDirChange(EntityUid entity, Direction dir, ushort subTick, bool state)
@@ -299,7 +299,7 @@ private void HandleDirChange(EntityUid entity, Direction dir, ushort subTick, bo
                 DebugTools.AssertNotNull(relayMover.RelayEntity);
 
                 if (MoverQuery.TryGetComponent(entity, out var mover))
-                    SetMoveInput(mover, MoveButtons.None);
+                    SetMoveInput((entity, mover), MoveButtons.None);
 
                 if (!_mobState.IsIncapacitated(entity))
                     HandleDirChange(relayMover.RelayEntity, dir, subTick, state);
@@ -321,18 +321,18 @@ private void HandleDirChange(EntityUid entity, Direction dir, ushort subTick, bo
                 RaiseLocalEvent(xform.ParentUid, ref relayMoveEvent);
             }
 
-            SetVelocityDirection(entity, moverComp, dir, subTick, state);
+            SetVelocityDirection((entity, moverComp), dir, subTick, state);
         }
 
-        private void OnInputInit(EntityUid uid, InputMoverComponent component, ComponentInit args)
+        private void OnInputInit(Entity<InputMoverComponent> entity, ref ComponentInit args)
         {
-            var xform = Transform(uid);
+            var xform = Transform(entity.Owner);
 
             if (!xform.ParentUid.IsValid())
                 return;
 
-            component.RelativeEntity = xform.GridUid ?? xform.MapUid;
-            component.TargetRelativeRotation = Angle.Zero;
+            entity.Comp.RelativeEntity = xform.GridUid ?? xform.MapUid;
+            entity.Comp.TargetRelativeRotation = Angle.Zero;
         }
 
         private void HandleRunChange(EntityUid uid, ushort subTick, bool walking)
@@ -344,7 +344,7 @@ private void HandleRunChange(EntityUid uid, ushort subTick, bool walking)
                 // if we swap to relay then stop our existing input if we ever change back.
                 if (moverComp != null)
                 {
-                    SetMoveInput(moverComp, MoveButtons.None);
+                    SetMoveInput((uid, moverComp), MoveButtons.None);
                 }
 
                 HandleRunChange(relayMover.RelayEntity, subTick, walking);
@@ -353,7 +353,7 @@ private void HandleRunChange(EntityUid uid, ushort subTick, bool walking)
 
             if (moverComp == null) return;
 
-            SetSprinting(uid, moverComp, subTick, walking);
+            SetSprinting((uid, moverComp), subTick, walking);
         }
 
         public (Vector2 Walking, Vector2 Sprinting) GetVelocityInput(InputMoverComponent mover)
@@ -404,7 +404,7 @@ private void HandleRunChange(EntityUid uid, ushort subTick, bool walking)
         ///     composed into a single direction vector, <see cref="VelocityDir"/>. Enabling
         ///     opposite directions will cancel each other out, resulting in no direction.
         /// </summary>
-        public void SetVelocityDirection(EntityUid entity, InputMoverComponent component, Direction direction, ushort subTick, bool enabled)
+        public void SetVelocityDirection(Entity<InputMoverComponent> entity, Direction direction, ushort subTick, bool enabled)
         {
             // Logger.Info($"[{_gameTiming.CurTick}/{subTick}] {direction}: {enabled}");
 
@@ -417,26 +417,26 @@ public void SetVelocityDirection(EntityUid entity, InputMoverComponent component
                 _ => throw new ArgumentException(nameof(direction))
             };
 
-            SetMoveInput(entity, component, subTick, enabled, bit);
+            SetMoveInput(entity, subTick, enabled, bit);
         }
 
-        private void SetMoveInput(EntityUid entity, InputMoverComponent component, ushort subTick, bool enabled, MoveButtons bit)
+        private void SetMoveInput(Entity<InputMoverComponent> entity, ushort subTick, bool enabled, MoveButtons bit)
         {
             // Modifies held state of a movement button at a certain sub tick and updates current tick movement vectors.
-            ResetSubtick(component);
+            ResetSubtick(entity.Comp);
 
-            if (subTick >= component.LastInputSubTick)
+            if (subTick >= entity.Comp.LastInputSubTick)
             {
-                var fraction = (subTick - component.LastInputSubTick) / (float) ushort.MaxValue;
+                var fraction = (subTick - entity.Comp.LastInputSubTick) / (float) ushort.MaxValue;
 
-                ref var lastMoveAmount = ref component.Sprinting ? ref component.CurTickSprintMovement : ref component.CurTickWalkMovement;
+                ref var lastMoveAmount = ref entity.Comp.Sprinting ? ref entity.Comp.CurTickSprintMovement : ref entity.Comp.CurTickWalkMovement;
 
-                lastMoveAmount += DirVecForButtons(component.HeldMoveButtons) * fraction;
+                lastMoveAmount += DirVecForButtons(entity.Comp.HeldMoveButtons) * fraction;
 
-                component.LastInputSubTick = subTick;
+                entity.Comp.LastInputSubTick = subTick;
             }
 
-            var buttons = component.HeldMoveButtons;
+            var buttons = entity.Comp.HeldMoveButtons;
 
             if (enabled)
             {
@@ -447,7 +447,7 @@ private void SetMoveInput(EntityUid entity, InputMoverComponent component, ushor
                 buttons &= ~bit;
             }
 
-            SetMoveInput(component, buttons);
+            SetMoveInput(entity, buttons);
         }
 
         private void ResetSubtick(InputMoverComponent component)
@@ -460,11 +460,11 @@ private void ResetSubtick(InputMoverComponent component)
             component.LastInputSubTick = 0;
         }
 
-        public void SetSprinting(EntityUid entity, InputMoverComponent component, ushort subTick, bool walking)
+        public void SetSprinting(Entity<InputMoverComponent> entity, ushort subTick, bool walking)
         {
             // Logger.Info($"[{_gameTiming.CurTick}/{subTick}] Sprint: {enabled}");
 
-            SetMoveInput(entity, component, subTick, walking, MoveButtons.Walk);
+            SetMoveInput(entity, subTick, walking, MoveButtons.Walk);
         }
 
         /// <summary>
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
index 8568290bffb..81569553772 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
@@ -12,14 +12,14 @@ private void InitializeRelay()
         SubscribeLocalEvent<RelayInputMoverComponent, AfterAutoHandleStateEvent>(OnAfterRelayState);
     }
 
-    private void OnAfterRelayTargetState(EntityUid uid, MovementRelayTargetComponent component, ref AfterAutoHandleStateEvent args)
+    private void OnAfterRelayTargetState(Entity<MovementRelayTargetComponent> entity, ref AfterAutoHandleStateEvent args)
     {
-        Physics.UpdateIsPredicted(uid);
+        Physics.UpdateIsPredicted(entity.Owner);
     }
 
-    private void OnAfterRelayState(EntityUid uid, RelayInputMoverComponent component, ref AfterAutoHandleStateEvent args)
+    private void OnAfterRelayState(Entity<RelayInputMoverComponent> entity, ref AfterAutoHandleStateEvent args)
     {
-        Physics.UpdateIsPredicted(uid);
+        Physics.UpdateIsPredicted(entity.Owner);
     }
 
     /// <summary>
@@ -61,30 +61,30 @@ public void SetRelay(EntityUid uid, EntityUid relayEntity)
         Dirty(relayEntity, targetComp);
     }
 
-    private void OnRelayShutdown(EntityUid uid, RelayInputMoverComponent component, ComponentShutdown args)
+    private void OnRelayShutdown(Entity<RelayInputMoverComponent> entity, ref ComponentShutdown args)
     {
-        Physics.UpdateIsPredicted(uid);
-        Physics.UpdateIsPredicted(component.RelayEntity);
+        Physics.UpdateIsPredicted(entity.Owner);
+        Physics.UpdateIsPredicted(entity.Comp.RelayEntity);
 
-        if (TryComp<InputMoverComponent>(component.RelayEntity, out var inputMover))
-            SetMoveInput(inputMover, MoveButtons.None);
+        if (TryComp<InputMoverComponent>(entity.Comp.RelayEntity, out var inputMover))
+            SetMoveInput((entity.Comp.RelayEntity, inputMover), MoveButtons.None);
 
         if (Timing.ApplyingState)
             return;
 
-        if (TryComp(component.RelayEntity, out MovementRelayTargetComponent? target) && target.LifeStage <= ComponentLifeStage.Running)
-            RemComp(component.RelayEntity, target);
+        if (TryComp(entity.Comp.RelayEntity, out MovementRelayTargetComponent? target) && target.LifeStage <= ComponentLifeStage.Running)
+            RemComp(entity.Comp.RelayEntity, target);
     }
 
-    private void OnTargetRelayShutdown(EntityUid uid, MovementRelayTargetComponent component, ComponentShutdown args)
+    private void OnTargetRelayShutdown(Entity<MovementRelayTargetComponent> entity, ref ComponentShutdown args)
     {
-        Physics.UpdateIsPredicted(uid);
-        Physics.UpdateIsPredicted(component.Source);
+        Physics.UpdateIsPredicted(entity.Owner);
+        Physics.UpdateIsPredicted(entity.Comp.Source);
 
         if (Timing.ApplyingState)
             return;
 
-        if (TryComp(component.Source, out RelayInputMoverComponent? relay) && relay.LifeStage <= ComponentLifeStage.Running)
-            RemComp(component.Source, relay);
+        if (TryComp(entity.Comp.Source, out RelayInputMoverComponent? relay) && relay.LifeStage <= ComponentLifeStage.Running)
+            RemComp(entity.Comp.Source, relay);
     }
 }
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 68e384a1b42..1f647178239 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -57,6 +57,8 @@ public abstract partial class SharedMoverController : VirtualController
         protected EntityQuery<TransformComponent> XformQuery;
         protected EntityQuery<CanMoveInAirComponent> CanMoveInAirQuery;
         protected EntityQuery<NoRotateOnMoveComponent> NoRotateQuery;
+        protected EntityQuery<FootstepModifierComponent> FootstepModifierQuery;
+        protected EntityQuery<MapGridComponent> MapGridQuery;
 
         /// <summary>
         /// <see cref="CCVars.StopSpeed"/>
@@ -84,6 +86,8 @@ public override void Initialize()
             XformQuery = GetEntityQuery<TransformComponent>();
             NoRotateQuery = GetEntityQuery<NoRotateOnMoveComponent>();
             CanMoveInAirQuery = GetEntityQuery<CanMoveInAirComponent>();
+            FootstepModifierQuery = GetEntityQuery<FootstepModifierComponent>();
+            MapGridQuery = GetEntityQuery<MapGridComponent>();
 
             InitializeInput();
             InitializeRelay();
@@ -181,7 +185,7 @@ protected void HandleMobMovement(
 
             // Don't bother getting the tiledef here if we're weightless or in-air
             // since no tile-based modifiers should be applying in that situation
-            if (TryComp(xform.GridUid, out MapGridComponent? gridComp)
+            if (MapGridQuery.TryComp(xform.GridUid, out var gridComp)
                 && _mapSystem.TryGetTileRef(xform.GridUid.Value, gridComp, xform.Coordinates, out var tile)
                 && !(weightless || physicsComponent.BodyStatus == BodyStatus.InAir))
             {
@@ -430,14 +434,14 @@ private bool TryGetSound(
 
             mobMover.StepSoundDistance -= distanceNeeded;
 
-            if (TryComp<FootstepModifierComponent>(uid, out var moverModifier))
+            if (FootstepModifierQuery.TryComp(uid, out var moverModifier))
             {
                 sound = moverModifier.FootstepSoundCollection;
                 return true;
             }
 
             if (_inventory.TryGetSlotEntity(uid, "shoes", out var shoes) &&
-                TryComp<FootstepModifierComponent>(shoes, out var modifier))
+                FootstepModifierQuery.TryComp(shoes, out var modifier))
             {
                 sound = modifier.FootstepSoundCollection;
                 return true;
@@ -456,9 +460,9 @@ private bool TryGetFootstepSound(
             sound = null;
 
             // Fallback to the map?
-            if (!TryComp<MapGridComponent>(xform.GridUid, out var grid))
+            if (!MapGridQuery.TryComp(xform.GridUid, out var grid))
             {
-                if (TryComp<FootstepModifierComponent>(xform.MapUid, out var modifier))
+                if (FootstepModifierQuery.TryComp(xform.MapUid, out var modifier))
                 {
                     sound = modifier.FootstepSoundCollection;
                     return true;
@@ -484,7 +488,7 @@ private bool TryGetFootstepSound(
                     return true;
                 }
 
-                if (TryComp<FootstepModifierComponent>(maybeFootstep, out var footstep))
+                if (FootstepModifierQuery.TryComp(maybeFootstep, out var footstep))
                 {
                     sound = footstep.FootstepSoundCollection;
                     return true;
diff --git a/Content.Server/Paper/ActivateOnPaperOpenedComponent.cs b/Content.Shared/Paper/ActivateOnPaperOpenedComponent.cs
similarity index 78%
rename from Content.Server/Paper/ActivateOnPaperOpenedComponent.cs
rename to Content.Shared/Paper/ActivateOnPaperOpenedComponent.cs
index 0d0f72b6126..82b366decd8 100644
--- a/Content.Server/Paper/ActivateOnPaperOpenedComponent.cs
+++ b/Content.Shared/Paper/ActivateOnPaperOpenedComponent.cs
@@ -1,4 +1,6 @@
-namespace Content.Server.Paper;
+using Content.Shared.Paper;
+
+namespace Content.Shared.Paper;
 
 /// <summary>
 /// Activates the item when used to write on paper, as if Z was pressed.
diff --git a/Content.Shared/Paper/SharedPaperComponent.cs b/Content.Shared/Paper/PaperComponent.cs
similarity index 68%
rename from Content.Shared/Paper/SharedPaperComponent.cs
rename to Content.Shared/Paper/PaperComponent.cs
index f65a599e539..cd0758589db 100644
--- a/Content.Shared/Paper/SharedPaperComponent.cs
+++ b/Content.Shared/Paper/PaperComponent.cs
@@ -4,9 +4,28 @@
 
 namespace Content.Shared.Paper;
 
-[NetworkedComponent]
-public abstract partial class SharedPaperComponent : Component
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class PaperComponent : Component
 {
+    public PaperAction Mode;
+    [DataField("content"), AutoNetworkedField]
+    public string Content { get; set; } = "";
+
+    [DataField("contentSize")]
+    public int ContentSize { get; set; } = 6000;
+
+    [DataField("stampedBy"), AutoNetworkedField]
+    public List<StampDisplayInfo> StampedBy { get; set; } = new();
+
+    /// <summary>
+    ///     Stamp to be displayed on the paper, state from bureaucracy.rsi
+    /// </summary>
+    [DataField("stampState"), AutoNetworkedField]
+    public string? StampState { get; set; }
+
+    [DataField, AutoNetworkedField]
+    public bool EditingDisabled;
+
     /// <summary>
     /// Sound played after writing to the paper.
     /// </summary>
diff --git a/Content.Shared/Paper/PaperSystem.cs b/Content.Shared/Paper/PaperSystem.cs
new file mode 100644
index 00000000000..0f4bfef983d
--- /dev/null
+++ b/Content.Shared/Paper/PaperSystem.cs
@@ -0,0 +1,228 @@
+using System.Linq;
+using Content.Shared.Administration.Logs;
+using Content.Shared.UserInterface;
+using Content.Shared.Database;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Tag;
+using Robust.Shared.Player;
+using Robust.Shared.Audio.Systems;
+using static Content.Shared.Paper.PaperComponent;
+
+namespace Content.Shared.Paper;
+
+public sealed class PaperSystem : EntitySystem
+{
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly TagSystem _tagSystem = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly MetaDataSystem _metaSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PaperComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<PaperComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<PaperComponent, BeforeActivatableUIOpenEvent>(BeforeUIOpen);
+        SubscribeLocalEvent<PaperComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<PaperComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<PaperComponent, PaperInputTextMessage>(OnInputTextMessage);
+
+        SubscribeLocalEvent<ActivateOnPaperOpenedComponent, PaperWriteEvent>(OnPaperWrite);
+    }
+
+    private void OnMapInit(Entity<PaperComponent> entity, ref MapInitEvent args)
+    {
+        if (!string.IsNullOrEmpty(entity.Comp.Content))
+        {
+            SetContent(entity, Loc.GetString(entity.Comp.Content));
+        }
+    }
+
+    private void OnInit(Entity<PaperComponent> entity, ref ComponentInit args)
+    {
+        entity.Comp.Mode = PaperAction.Read;
+        UpdateUserInterface(entity);
+
+        if (TryComp<AppearanceComponent>(entity, out var appearance))
+        {
+            if (entity.Comp.Content != "")
+                _appearance.SetData(entity, PaperVisuals.Status, PaperStatus.Written, appearance);
+
+            if (entity.Comp.StampState != null)
+                _appearance.SetData(entity, PaperVisuals.Stamp, entity.Comp.StampState, appearance);
+        }
+    }
+
+    private void BeforeUIOpen(Entity<PaperComponent> entity, ref BeforeActivatableUIOpenEvent args)
+    {
+        entity.Comp.Mode = PaperAction.Read;
+        UpdateUserInterface(entity);
+    }
+
+    private void OnExamined(Entity<PaperComponent> entity, ref ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        using (args.PushGroup(nameof(PaperComponent)))
+        {
+            if (entity.Comp.Content != "")
+            {
+                args.PushMarkup(
+                    Loc.GetString(
+                        "paper-component-examine-detail-has-words",
+                        ("paper", entity)
+                    )
+                );
+            }
+
+            if (entity.Comp.StampedBy.Count > 0)
+            {
+                var commaSeparated =
+                    string.Join(", ", entity.Comp.StampedBy.Select(s => Loc.GetString(s.StampedName)));
+                args.PushMarkup(
+                    Loc.GetString(
+                        "paper-component-examine-detail-stamped-by",
+                        ("paper", entity),
+                        ("stamps", commaSeparated))
+                );
+            }
+        }
+    }
+
+    private void OnInteractUsing(Entity<PaperComponent> entity, ref InteractUsingEvent args)
+    {
+        // only allow editing if there are no stamps or when using a cyberpen
+        var editable = entity.Comp.StampedBy.Count == 0 || _tagSystem.HasTag(args.Used, "WriteIgnoreStamps");
+        if (_tagSystem.HasTag(args.Used, "Write") && editable)
+        {
+            if (entity.Comp.EditingDisabled)
+            {
+                var paperEditingDisabledMessage = Loc.GetString("paper-tamper-proof-modified-message");
+                _popupSystem.PopupEntity(paperEditingDisabledMessage, entity, args.User);
+
+                args.Handled = true;
+                return;
+            }
+            var writeEvent = new PaperWriteEvent(entity, args.User);
+            RaiseLocalEvent(args.Used, ref writeEvent);
+
+            entity.Comp.Mode = PaperAction.Write;
+            _uiSystem.OpenUi(entity.Owner, PaperUiKey.Key, args.User);
+            UpdateUserInterface(entity);
+            args.Handled = true;
+            return;
+        }
+
+        // If a stamp, attempt to stamp paper
+        if (TryComp<StampComponent>(args.Used, out var stampComp) && TryStamp(entity, GetStampInfo(stampComp), stampComp.StampState))
+        {
+            // successfully stamped, play popup
+            var stampPaperOtherMessage = Loc.GetString("paper-component-action-stamp-paper-other",
+                    ("user", args.User),
+                    ("target", args.Target),
+                    ("stamp", args.Used));
+
+            _popupSystem.PopupEntity(stampPaperOtherMessage, args.User, Filter.PvsExcept(args.User, entityManager: EntityManager), true);
+            var stampPaperSelfMessage = Loc.GetString("paper-component-action-stamp-paper-self",
+                    ("target", args.Target),
+                    ("stamp", args.Used));
+            _popupSystem.PopupClient(stampPaperSelfMessage, args.User, args.User);
+
+            _audio.PlayPredicted(stampComp.Sound, entity, args.User);
+
+            UpdateUserInterface(entity);
+        }
+    }
+
+    private static StampDisplayInfo GetStampInfo(StampComponent stamp)
+    {
+        return new StampDisplayInfo
+        {
+            StampedName = stamp.StampedName,
+            StampedColor = stamp.StampedColor
+        };
+    }
+
+    private void OnInputTextMessage(Entity<PaperComponent> entity, ref PaperInputTextMessage args)
+    {
+        if (args.Text.Length <= entity.Comp.ContentSize)
+        {
+            SetContent(entity, args.Text);
+
+            if (TryComp<AppearanceComponent>(entity, out var appearance))
+                _appearance.SetData(entity, PaperVisuals.Status, PaperStatus.Written, appearance);
+
+            if (TryComp(entity, out MetaDataComponent? meta))
+                _metaSystem.SetEntityDescription(entity, "", meta);
+
+            _adminLogger.Add(LogType.Chat,
+                LogImpact.Low,
+                $"{ToPrettyString(args.Actor):player} has written on {ToPrettyString(entity):entity} the following text: {args.Text}");
+
+            _audio.PlayPvs(entity.Comp.Sound, entity);
+        }
+
+        entity.Comp.Mode = PaperAction.Read;
+        UpdateUserInterface(entity);
+    }
+
+    private void OnPaperWrite(Entity<ActivateOnPaperOpenedComponent> entity, ref PaperWriteEvent args)
+    {
+        _interaction.UseInHandInteraction(args.User, entity);
+    }
+
+    /// <summary>
+    ///     Accepts the name and state to be stamped onto the paper, returns true if successful.
+    /// </summary>
+    public bool TryStamp(Entity<PaperComponent> entity, StampDisplayInfo stampInfo, string spriteStampState)
+    {
+        if (!entity.Comp.StampedBy.Contains(stampInfo))
+        {
+            entity.Comp.StampedBy.Add(stampInfo);
+            Dirty(entity);
+            if (entity.Comp.StampState == null && TryComp<AppearanceComponent>(entity, out var appearance))
+            {
+                entity.Comp.StampState = spriteStampState;
+                // Would be nice to be able to display multiple sprites on the paper
+                // but most of the existing images overlap
+                _appearance.SetData(entity, PaperVisuals.Stamp, entity.Comp.StampState, appearance);
+            }
+        }
+        return true;
+    }
+
+    public void SetContent(Entity<PaperComponent> entity, string content)
+    {
+        entity.Comp.Content = content + '\n';
+        Dirty(entity);
+        UpdateUserInterface(entity);
+
+        if (!TryComp<AppearanceComponent>(entity, out var appearance))
+            return;
+
+        var status = string.IsNullOrWhiteSpace(content)
+            ? PaperStatus.Blank
+            : PaperStatus.Written;
+
+        _appearance.SetData(entity, PaperVisuals.Status, status, appearance);
+    }
+
+    private void UpdateUserInterface(Entity<PaperComponent> entity)
+    {
+        _uiSystem.SetUiState(entity.Owner, PaperUiKey.Key, new PaperBoundUserInterfaceState(entity.Comp.Content, entity.Comp.StampedBy, entity.Comp.Mode));
+    }
+}
+
+/// <summary>
+/// Event fired when using a pen on paper, opening the UI.
+/// </summary>
+[ByRefEvent]
+public record struct PaperWriteEvent(EntityUid User, EntityUid Paper);
diff --git a/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
index 4a40e2c65e6..2f7e7b7c487 100644
--- a/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
+++ b/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
@@ -25,8 +25,10 @@ public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout load
 
         var manager = collection.Resolve<ISharedPlaytimeManager>();
         var playtimes = manager.GetPlayTimes(session);
-        return JobRequirements.TryRequirementMet(Requirement, playtimes, out reason,
-            collection.Resolve<IEntityManager>(),
-            collection.Resolve<IPrototypeManager>());
+        return Requirement.Check(collection.Resolve<IEntityManager>(),
+            collection.Resolve<IPrototypeManager>(),
+            profile,
+            playtimes,
+            out reason);
     }
 }
diff --git a/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs b/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
index aaa9055373a..15527f1ce86 100644
--- a/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
+++ b/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
@@ -8,13 +8,17 @@ namespace Content.Shared.Preferences.Loadouts;
 /// Individual loadout item to be applied.
 /// </summary>
 [Prototype]
-public sealed partial class LoadoutPrototype : IPrototype
+public sealed partial class LoadoutPrototype : IPrototype, IEquipmentLoadout
 {
     [IdDataField]
     public string ID { get; } = string.Empty;
 
-    [DataField(required: true)]
-    public ProtoId<StartingGearPrototype> Equipment;
+    /*
+     * You can either use an existing StartingGearPrototype or specify it inline to avoid bloating yaml.
+     */
+
+    [DataField]
+    public ProtoId<StartingGearPrototype>? StartingGear;
 
     /// <summary>
     /// Effects to be applied when the loadout is applied.
@@ -23,6 +27,18 @@ public sealed partial class LoadoutPrototype : IPrototype
     [DataField]
     public List<LoadoutEffect> Effects = new();
 
+    /// <inheritdoc />
+    [DataField]
+    public Dictionary<string, EntProtoId> Equipment { get; set; } = new();
+
+    /// <inheritdoc />
+    [DataField]
+    public List<EntProtoId> Inhand { get; set; } = new();
+
+    /// <inheritdoc />
+    [DataField]
+    public Dictionary<string, List<EntProtoId>> Storage { get; set; } = new();
+
     // Sunrise-Sponsors-Start
     [DataField]
     public bool SponsorOnly;
diff --git a/Content.Shared/Projectiles/ProjectileSpreadComponent.cs b/Content.Shared/Projectiles/ProjectileSpreadComponent.cs
new file mode 100644
index 00000000000..1edffe3ba56
--- /dev/null
+++ b/Content.Shared/Projectiles/ProjectileSpreadComponent.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Projectiles;
+
+/// <summary>
+/// Spawns a spread of the projectiles when fired
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedGunSystem))]
+public sealed partial class ProjectileSpreadComponent : Component
+{
+    /// <summary>
+    /// The entity prototype that will be fired by the rest of the spread.
+    /// Will generally be the same entity prototype as the first projectile being fired.
+    /// Needed for ammo components that do not specify a fired prototype, unlike cartridges.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Proto;
+
+    /// <summary>
+    /// How much the ammo spreads when shot, in degrees. Does nothing if count is 0.
+    /// </summary>
+    [DataField]
+    public Angle Spread = Angle.FromDegrees(5);
+
+    /// <summary>
+    /// How many prototypes are spawned when shot.
+    /// </summary>
+    [DataField]
+    public int Count = 1;
+}
diff --git a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
index 8b0c866cbe3..40c20df3437 100644
--- a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
+++ b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
@@ -1,101 +1,58 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
 using Content.Shared.Lathe.Prototypes;
 using Content.Shared.Materials;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Research.Prototypes
 {
-    [NetSerializable, Serializable, Prototype("latheRecipe")]
+    [NetSerializable, Serializable, Prototype]
     public sealed partial class LatheRecipePrototype : IPrototype
     {
         [ViewVariables]
         [IdDataField]
         public string ID { get; private set; } = default!;
 
-        [DataField("name")]
-        private string _name = string.Empty;
+        /// <summary>
+        ///     Name displayed in the lathe GUI.
+        /// </summary>
+        [DataField]
+        public LocId? Name;
 
-        [DataField("description")]
-        private string _description = string.Empty;
+        /// <summary>
+        ///     Short description displayed in the lathe GUI.
+        /// </summary>
+        [DataField]
+        public LocId? Description;
 
         /// <summary>
         ///     The prototype name of the resulting entity when the recipe is printed.
         /// </summary>
-        [DataField("result", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string Result = string.Empty;
+        [DataField]
+        public EntProtoId? Result;
+
+        [DataField]
+        public Dictionary<ProtoId<ReagentPrototype>, FixedPoint2>? ResultReagents;
 
         /// <summary>
         ///     An entity whose sprite is displayed in the ui in place of the actual recipe result.
         /// </summary>
-        [DataField("icon")]
+        [DataField]
         public SpriteSpecifier? Icon;
 
         [DataField("completetime")]
-        private TimeSpan _completeTime = TimeSpan.FromSeconds(5);
-
-        [DataField("materials", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<int, MaterialPrototype>))]
-        private Dictionary<string, int> _requiredMaterials = new();
-
-        //todo make these function calls because we're eating tons of resolves here.
-        /// <summary>
-        ///     Name displayed in the lathe GUI.
-        /// </summary>
-        [ViewVariables]
-        public string Name
-        {
-            get
-            {
-                if (_name.Trim().Length != 0)
-                    return _name;
-                var protoMan = IoCManager.Resolve<IPrototypeManager>();
-                protoMan.TryIndex(Result, out EntityPrototype? prototype);
-                if (prototype?.Name != null)
-                    _name = prototype.Name;
-                return _name;
-            }
-        }
-
-        /// <summary>
-        ///     Short description displayed in the lathe GUI.
-        /// </summary>
-        [ViewVariables]
-        public string Description
-        {
-            get
-            {
-                if (_description.Trim().Length != 0)
-                    return _description;
-                var protoMan = IoCManager.Resolve<IPrototypeManager>();
-                protoMan.TryIndex(Result, out EntityPrototype? prototype);
-                if (prototype?.Description != null)
-                    _description = prototype.Description;
-                return _description;
-            }
-        }
+        public TimeSpan CompleteTime = TimeSpan.FromSeconds(5);
 
         /// <summary>
         ///     The materials required to produce this recipe.
         ///     Takes a material ID as string.
         /// </summary>
-        [ViewVariables]
-        public Dictionary<string, int> RequiredMaterials
-        {
-            get => _requiredMaterials;
-            private set => _requiredMaterials = value;
-        }
-
-
-        /// <summary>
-        ///     How many milliseconds it'll take for the lathe to finish this recipe.
-        ///     Might lower depending on the lathe's upgrade level.
-        /// </summary>
-        [ViewVariables]
-        public TimeSpan CompleteTime => _completeTime;
+        [DataField]
+        public Dictionary<ProtoId<MaterialPrototype>, int> Materials = new();
 
-        [DataField("applyMaterialDiscount")]
+        [DataField]
         public bool ApplyMaterialDiscount = true;
 
         /// <summary>
diff --git a/Content.Shared/Research/Systems/SharedResearchSystem.cs b/Content.Shared/Research/Systems/SharedResearchSystem.cs
index 81c6950f283..d8ce0634d3e 100644
--- a/Content.Shared/Research/Systems/SharedResearchSystem.cs
+++ b/Content.Shared/Research/Systems/SharedResearchSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Shared.Lathe;
 using Content.Shared.Research.Components;
 using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
@@ -12,6 +13,7 @@ public abstract class SharedResearchSystem : EntitySystem
 {
     [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedLatheSystem _lathe = default!;
 
     public override void Initialize()
     {
@@ -185,7 +187,7 @@ public FormattedMessage GetTechnologyDescription(
             var recipeProto = PrototypeManager.Index(recipe);
             description.PushNewline();
             description.AddMarkup(Loc.GetString("research-console-unlocks-list-entry",
-                ("name",recipeProto.Name)));
+                ("name", _lathe.GetRecipeName(recipeProto))));
         }
         foreach (var generic in technology.GenericUnlocks)
         {
diff --git a/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs b/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs
index b0d615fcb3b..93c7c22471c 100644
--- a/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs
+++ b/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
+using Content.Shared.Lathe;
 using Content.Shared.Popups;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Research.Components;
@@ -19,6 +20,7 @@ public sealed class TechnologyDiskSystem : EntitySystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedResearchSystem _research = default!;
+    [Dependency] private readonly SharedLatheSystem _lathe = default!;
 
     public override void Initialize()
     {
@@ -83,8 +85,7 @@ private void OnExamine(Entity<TechnologyDiskComponent> ent, ref ExaminedEvent ar
         if (ent.Comp.Recipes != null && ent.Comp.Recipes.Count > 0)
         {
             var prototype = _protoMan.Index(ent.Comp.Recipes[0]);
-            var resultPrototype = _protoMan.Index<EntityPrototype>(prototype.Result);
-            message = Loc.GetString("tech-disk-examine", ("result", resultPrototype.Name));
+            message = Loc.GetString("tech-disk-examine", ("result", _lathe.GetRecipeName(prototype)));
 
             if (ent.Comp.Recipes.Count > 1) //idk how to do this well. sue me.
                 message += " " + Loc.GetString("tech-disk-examine-more");
diff --git a/Content.Shared/Roles/DepartmentPrototype.cs b/Content.Shared/Roles/DepartmentPrototype.cs
index 9866a2061ed..b98868e7ffb 100644
--- a/Content.Shared/Roles/DepartmentPrototype.cs
+++ b/Content.Shared/Roles/DepartmentPrototype.cs
@@ -9,10 +9,16 @@ public sealed partial class DepartmentPrototype : IPrototype
     public string ID { get; } = string.Empty;
 
     /// <summary>
-    /// A description string to display in the character menu as an explanation of the department's function.
+    /// The name LocId of the department that will be displayed in the various menus.
     /// </summary>
     [DataField(required: true)]
-    public string Description = string.Empty;
+    public LocId Name = string.Empty;
+
+    /// <summary>
+    /// A description LocId to display in the character menu as an explanation of the department's function.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId Description = string.Empty;
 
     /// <summary>
     /// A color representing this department to use for text.
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index c8efb4c3179..f5d2e23c8b9 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -94,8 +94,8 @@ public sealed partial class JobPrototype : IPrototype
         [DataField("antagAdvantage")]
         public int AntagAdvantage = 0;
 
-        [DataField("startingGear", customTypeSerializer: typeof(PrototypeIdSerializer<StartingGearPrototype>))]
-        public string? StartingGear { get; private set; }
+        [DataField]
+        public ProtoId<StartingGearPrototype>? StartingGear { get; private set; }
 
         /// <summary>
         /// Use this to spawn in as a non-humanoid (borg, test subject, etc.)
diff --git a/Content.Shared/Roles/JobRequirement/AgeRequirement.cs b/Content.Shared/Roles/JobRequirement/AgeRequirement.cs
new file mode 100644
index 00000000000..2cdc8e001c1
--- /dev/null
+++ b/Content.Shared/Roles/JobRequirement/AgeRequirement.cs
@@ -0,0 +1,50 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Preferences;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+/// <summary>
+/// Requires the character to be older or younger than a certain age (inclusive)
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class AgeRequirement : JobRequirement
+{
+    [DataField(required: true)]
+    public int RequiredAge;
+
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason)
+    {
+        reason = new FormattedMessage();
+
+        if (profile is null) //the profile could be null if the player is a ghost. In this case we don't need to block the role selection for ghostrole
+            return true;
+
+        if (!Inverted)
+        {
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-age-to-young",
+                ("age", RequiredAge)));
+
+            if (profile.Age <= RequiredAge)
+                return false;
+        }
+        else
+        {
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-age-to-old",
+                ("age", RequiredAge)));
+
+            if (profile.Age >= RequiredAge)
+                return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs b/Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
new file mode 100644
index 00000000000..56b7d8ba811
--- /dev/null
+++ b/Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
@@ -0,0 +1,83 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Preferences;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class DepartmentTimeRequirement : JobRequirement
+{
+    /// <summary>
+    /// Which department needs the required amount of time.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<DepartmentPrototype> Department = default!;
+
+    /// <summary>
+    /// How long (in seconds) this requirement is.
+    /// </summary>
+    [DataField(required: true)]
+    public TimeSpan Time;
+
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason)
+    {
+        reason = new FormattedMessage();
+        var playtime = TimeSpan.Zero;
+
+        // Check all jobs' departments
+        var department = protoManager.Index(Department);
+        var jobs = department.Roles;
+        string proto;
+
+        // Check all jobs' playtime
+        foreach (var other in jobs)
+        {
+            // The schema is stored on the Job role but we want to explode if the timer isn't found anyway.
+            proto = protoManager.Index(other).PlayTimeTracker;
+
+            playTimes.TryGetValue(proto, out var otherTime);
+            playtime += otherTime;
+        }
+
+        var deptDiff = Time.TotalMinutes - playtime.TotalMinutes;
+        var nameDepartment = "role-timer-department-unknown";
+
+        if (protoManager.TryIndex(Department, out var departmentIndexed))
+        {
+            nameDepartment = departmentIndexed.Name;
+        }
+
+        if (!Inverted)
+        {
+            if (deptDiff <= 0)
+                return true;
+
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
+                "role-timer-department-insufficient",
+                ("time", Math.Ceiling(deptDiff)),
+                ("department", Loc.GetString(nameDepartment)),
+                ("departmentColor", department.Color.ToHex())));
+            return false;
+        }
+
+        if (deptDiff <= 0)
+        {
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
+                "role-timer-department-too-high",
+                ("time", -deptDiff),
+                ("department", Loc.GetString(nameDepartment)),
+                ("departmentColor", department.Color.ToHex())));
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs b/Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
new file mode 100644
index 00000000000..acbb8f2b4d4
--- /dev/null
+++ b/Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
@@ -0,0 +1,50 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class OverallPlaytimeRequirement : JobRequirement
+{
+    /// <inheritdoc cref="DepartmentTimeRequirement.Time"/>
+    [DataField(required: true)]
+    public TimeSpan Time;
+
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason)
+    {
+        reason = new FormattedMessage();
+
+        var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
+        var overallDiff = Time.TotalMinutes - overallTime.TotalMinutes;
+
+        if (!Inverted)
+        {
+            if (overallDiff <= 0 || overallTime >= Time)
+                return true;
+
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
+                "role-timer-overall-insufficient",
+                ("time", Math.Ceiling(overallDiff))));
+            return false;
+        }
+
+        if (overallDiff <= 0 || overallTime >= Time)
+        {
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-overall-too-high",
+                ("time", -overallDiff)));
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs b/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
new file mode 100644
index 00000000000..658db95ab56
--- /dev/null
+++ b/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
@@ -0,0 +1,73 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
+using Content.Shared.Roles.Jobs;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class RoleTimeRequirement : JobRequirement
+{
+    /// <summary>
+    /// What particular role they need the time requirement with.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<PlayTimeTrackerPrototype> Role = default!;
+
+    /// <inheritdoc cref="DepartmentTimeRequirement.Time"/>
+    [DataField(required: true)]
+    public TimeSpan Time;
+
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason)
+    {
+        reason = new FormattedMessage();
+
+        string proto = Role;
+
+        playTimes.TryGetValue(proto, out var roleTime);
+        var roleDiff = Time.TotalMinutes - roleTime.TotalMinutes;
+        var departmentColor = Color.Yellow;
+
+        if (entManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
+        {
+            var jobProto = jobSystem.GetJobPrototype(proto);
+
+            if (jobSystem.TryGetDepartment(jobProto, out var departmentProto))
+                departmentColor = departmentProto.Color;
+        }
+
+        if (!Inverted)
+        {
+            if (roleDiff <= 0)
+                return true;
+
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
+                "role-timer-role-insufficient",
+                ("time", Math.Ceiling(roleDiff)),
+                ("job", Loc.GetString(proto)),
+                ("departmentColor", departmentColor.ToHex())));
+            return false;
+        }
+
+        if (roleDiff <= 0)
+        {
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
+                "role-timer-role-too-high",
+                ("time", -roleDiff),
+                ("job", Loc.GetString(proto)),
+                ("departmentColor", departmentColor.ToHex())));
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Roles/JobRequirement/SpeciesRequirement.cs b/Content.Shared/Roles/JobRequirement/SpeciesRequirement.cs
new file mode 100644
index 00000000000..68c069931f3
--- /dev/null
+++ b/Content.Shared/Roles/JobRequirement/SpeciesRequirement.cs
@@ -0,0 +1,59 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Text;
+using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Preferences;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+/// <summary>
+/// Requires the character to be or not be on the list of specified species
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class SpeciesRequirement : JobRequirement
+{
+    [DataField(required: true)]
+    public HashSet<ProtoId<SpeciesPrototype>> Species = new();
+
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason)
+    {
+        reason = new FormattedMessage();
+
+        if (profile is null) //the profile could be null if the player is a ghost. In this case we don't need to block the role selection for ghostrole
+            return true;
+
+        var sb = new StringBuilder();
+        sb.Append("[color=yellow]");
+        foreach (var s in Species)
+        {
+            sb.Append(Loc.GetString(protoManager.Index(s).Name) + " ");
+        }
+
+        sb.Append("[/color]");
+
+        if (!Inverted)
+        {
+            reason = FormattedMessage.FromMarkupPermissive($"{Loc.GetString("role-timer-whitelisted-species")}\n{sb}");
+
+            if (!Species.Contains(profile.Species))
+                return false;
+        }
+        else
+        {
+            reason = FormattedMessage.FromMarkupPermissive($"{Loc.GetString("role-timer-blacklisted-species")}\n{sb}");
+
+            if (Species.Contains(profile.Species))
+                return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Roles/JobRequirements.cs b/Content.Shared/Roles/JobRequirements.cs
index 6cb2a58c237..17f5f7bd6a2 100644
--- a/Content.Shared/Roles/JobRequirements.cs
+++ b/Content.Shared/Roles/JobRequirements.cs
@@ -1,232 +1,51 @@
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared._Sunrise.Roles;
-using Content.Shared.Players.PlayTimeTracking;
-using Content.Shared.Roles.Jobs;
-using JetBrains.Annotations;
+using Content.Shared.Preferences;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Roles
-{
-    /// <summary>
-    /// Abstract class for playtime and other requirements for role gates.
-    /// </summary>
-    [ImplicitDataDefinitionForInheritors]
-    [Serializable, NetSerializable]
-    public abstract partial class JobRequirement{}
-
-    [UsedImplicitly]
-    [Serializable, NetSerializable]
-    public sealed partial class DepartmentTimeRequirement : JobRequirement
-    {
-        /// <summary>
-        /// Which department needs the required amount of time.
-        /// </summary>
-        [DataField("department", customTypeSerializer: typeof(PrototypeIdSerializer<DepartmentPrototype>))]
-        public string Department = default!;
-
-        /// <summary>
-        /// How long (in seconds) this requirement is.
-        /// </summary>
-        [DataField("time")] public TimeSpan Time;
-
-        /// <summary>
-        /// If true, requirement will return false if playtime above the specified time.
-        /// </summary>
-        /// <value>
-        /// <c>False</c> by default.<br />
-        /// <c>True</c> for invert general requirement
-        /// </value>
-        [DataField("inverted")] public bool Inverted;
-    }
-
-    [UsedImplicitly]
-    [Serializable, NetSerializable]
-    public sealed partial class RoleTimeRequirement : JobRequirement
-    {
-        /// <summary>
-        /// What particular role they need the time requirement with.
-        /// </summary>
-        [DataField("role", customTypeSerializer: typeof(PrototypeIdSerializer<PlayTimeTrackerPrototype>))]
-        public string Role = default!;
-
-        /// <inheritdoc cref="DepartmentTimeRequirement.Time"/>
-        [DataField("time")] public TimeSpan Time;
-
-        /// <inheritdoc cref="DepartmentTimeRequirement.Inverted"/>
-        [DataField("inverted")] public bool Inverted;
-    }
+namespace Content.Shared.Roles;
 
-    [UsedImplicitly]
-    [Serializable, NetSerializable]
-    public sealed partial class OverallPlaytimeRequirement : JobRequirement
-    {
-        /// <inheritdoc cref="DepartmentTimeRequirement.Time"/>
-        [DataField("time")] public TimeSpan Time;
-
-        /// <inheritdoc cref="DepartmentTimeRequirement.Inverted"/>
-        [DataField("inverted")] public bool Inverted;
-    }
-
-    public static class JobRequirements
+public static class JobRequirements
+{
+    public static bool TryRequirementsMet(
+        JobPrototype job,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile)
     {
-        public static bool TryRequirementsMet(
-            JobPrototype job,
-            IReadOnlyDictionary<string, TimeSpan> playTimes,
-            [NotNullWhen(false)] out FormattedMessage? reason,
-            IEntityManager entManager,
-            IPrototypeManager prototypes)
-        {
-            var sys = entManager.System<SharedRoleSystem>();
-            var requirements = sys.GetJobRequirement(job);
-            reason = null;
-            if (requirements == null)
-                return true;
-
-            foreach (var requirement in requirements)
-            {
-                if (!TryRequirementMet(requirement, playTimes, out reason, entManager, prototypes))
-                    return false;
-            }
-
+        var sys = entManager.System<SharedRoleSystem>();
+        var requirements = sys.GetJobRequirement(job);
+        reason = null;
+        if (requirements == null)
             return true;
-        }
 
-        /// <summary>
-        /// Returns a string with the reason why a particular requirement may not be met.
-        /// </summary>
-        public static bool TryRequirementMet(
-            JobRequirement requirement,
-            IReadOnlyDictionary<string, TimeSpan> playTimes,
-            [NotNullWhen(false)] out FormattedMessage? reason,
-            IEntityManager entManager,
-            IPrototypeManager prototypes)
+        foreach (var requirement in requirements)
         {
-            reason = null;
-
-            switch (requirement)
-            {
-                case DepartmentTimeRequirement deptRequirement:
-                    var playtime = TimeSpan.Zero;
-
-                    // Check all jobs' departments
-                    var department = prototypes.Index<DepartmentPrototype>(deptRequirement.Department);
-                    var jobs = department.Roles;
-                    string proto;
-
-                    // Check all jobs' playtime
-                    foreach (var other in jobs)
-                    {
-                        // The schema is stored on the Job role but we want to explode if the timer isn't found anyway.
-                        proto = prototypes.Index<JobPrototype>(other).PlayTimeTracker;
-
-                        playTimes.TryGetValue(proto, out var otherTime);
-                        playtime += otherTime;
-                    }
-
-                    var deptDiff = deptRequirement.Time.TotalMinutes - playtime.TotalMinutes;
-
-                    if (!deptRequirement.Inverted)
-                    {
-                        if (deptDiff <= 0)
-                            return true;
-
-                        reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
-                            "role-timer-department-insufficient",
-                            ("time", Math.Ceiling(deptDiff)),
-                            ("department", Loc.GetString(deptRequirement.Department)),
-                            ("departmentColor", department.Color.ToHex())));
-                        return false;
-                    }
-                    else
-                    {
-                        if (deptDiff <= 0)
-                        {
-                            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
-                                "role-timer-department-too-high",
-                                ("time", -deptDiff),
-                                ("department", Loc.GetString(deptRequirement.Department)),
-                                ("departmentColor", department.Color.ToHex())));
-                            return false;
-                        }
-
-                        return true;
-                    }
-
-                case OverallPlaytimeRequirement overallRequirement:
-                    var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
-                    var overallDiff = overallRequirement.Time.TotalMinutes - overallTime.TotalMinutes;
-
-                    if (!overallRequirement.Inverted)
-                    {
-                        if (overallDiff <= 0 || overallTime >= overallRequirement.Time)
-                            return true;
-
-                        reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
-                              "role-timer-overall-insufficient",
-                              ("time", Math.Ceiling(overallDiff))));
-                        return false;
-                    }
-                    else
-                    {
-                        if (overallDiff <= 0 || overallTime >= overallRequirement.Time)
-                        {
-                            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-overall-too-high", ("time", -overallDiff)));
-                            return false;
-                        }
-
-                        return true;
-                    }
-
-                case RoleTimeRequirement roleRequirement:
-                    proto = roleRequirement.Role;
-
-                    playTimes.TryGetValue(proto, out var roleTime);
-                    var roleDiff = roleRequirement.Time.TotalMinutes - roleTime.TotalMinutes;
-                    var departmentColor = Color.Yellow;
-
-                    if (entManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
-                    {
-                        var jobProto = jobSystem.GetJobPrototype(proto);
-
-                        if (jobSystem.TryGetDepartment(jobProto, out var departmentProto))
-                            departmentColor = departmentProto.Color;
-                    }
-
-                    if (!roleRequirement.Inverted)
-                    {
-                        if (roleDiff <= 0)
-                            return true;
-
-                        reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
-                            "role-timer-role-insufficient",
-                            ("time", Math.Ceiling(roleDiff)),
-                            ("job", Loc.GetString(proto)),
-                            ("departmentColor", departmentColor.ToHex())));
-                        return false;
-                    }
-                    else
-                    {
-                        if (roleDiff <= 0)
-                        {
-                            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
-                                "role-timer-role-too-high",
-                                ("time", -roleDiff),
-                                ("job", Loc.GetString(proto)),
-                                ("departmentColor", departmentColor.ToHex())));
-                            return false;
-                        }
-
-                        return true;
-                    }
-                case DiscordRoleRequirement _: // Sunrise-Edit
-                    reason = FormattedMessage.FromMarkup("Для игры на этой роли вы должны получить роль в дискорде.");
-                    return false;
-                default:
-                    throw new NotImplementedException();
-            }
+            if (!requirement.Check(entManager, protoManager, profile, playTimes, out reason))
+                return false;
         }
+
+        return true;
     }
 }
+
+/// <summary>
+/// Abstract class for playtime and other requirements for role gates.
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+[Serializable, NetSerializable]
+public abstract partial class JobRequirement
+{
+    [DataField]
+    public bool Inverted;
+
+    public abstract bool Check(
+        IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason);
+}
diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs
index d96d014f88d..b0a4b94e550 100644
--- a/Content.Shared/Roles/StartingGearPrototype.cs
+++ b/Content.Shared/Roles/StartingGearPrototype.cs
@@ -4,7 +4,7 @@
 namespace Content.Shared.Roles;
 
 [Prototype]
-public sealed partial class StartingGearPrototype : IPrototype, IInheritingPrototype
+public sealed partial class StartingGearPrototype : IPrototype, IInheritingPrototype, IEquipmentLoadout
 {
     /// <inheritdoc/>
     [ViewVariables]
@@ -19,26 +19,41 @@ public sealed partial class StartingGearPrototype : IPrototype, IInheritingProto
     [AbstractDataField]
     public bool Abstract { get; }
 
+    /// <inheritdoc />
+    [DataField]
+    [AlwaysPushInheritance]
+    public Dictionary<string, EntProtoId> Equipment { get; set; } = new();
+
+    /// <inheritdoc />
+    [DataField]
+    [AlwaysPushInheritance]
+    public List<EntProtoId> Inhand { get; set; } = new();
+
+    /// <inheritdoc />
+    [DataField]
+    [AlwaysPushInheritance]
+    public Dictionary<string, List<EntProtoId>> Storage { get; set; } = new();
+}
+
+/// <summary>
+/// Specifies the starting entity prototypes and where to equip them for the specified class.
+/// </summary>
+public interface IEquipmentLoadout
+{
     /// <summary>
     /// The slot and entity prototype ID of the equipment that is to be spawned and equipped onto the entity.
     /// </summary>
-    [DataField]
-    [AlwaysPushInheritance]
-    public Dictionary<string, EntProtoId> Equipment = new();
+    public Dictionary<string, EntProtoId> Equipment { get; set; }
 
     /// <summary>
     /// The inhand items that are equipped when this starting gear is equipped onto an entity.
     /// </summary>
-    [DataField]
-    [AlwaysPushInheritance]
-    public List<EntProtoId> Inhand = new(0);
+    public List<EntProtoId> Inhand { get; set; }
 
     /// <summary>
     /// Inserts entities into the specified slot's storage (if it does have storage).
     /// </summary>
-    [DataField]
-    [AlwaysPushInheritance]
-    public Dictionary<string, List<EntProtoId>> Storage = new();
+    public Dictionary<string, List<EntProtoId>> Storage { get; set; }
 
     /// <summary>
     /// Gets the entity prototype ID of a slot in this starting gear.
diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs
index ca53998115b..fb8b64454c5 100644
--- a/Content.Shared/Station/SharedStationSpawningSystem.cs
+++ b/Content.Shared/Station/SharedStationSpawningSystem.cs
@@ -49,25 +49,32 @@ public void EquipRoleLoadout(EntityUid entity, RoleLoadout loadout, RoleLoadoutP
                     continue;
                 }
 
-                if (!PrototypeManager.TryIndex(loadoutProto.Equipment, out var startingGear))
-                {
-                    Log.Error($"Unable to find starting gear {loadoutProto.Equipment} for loadout {loadoutProto}");
-                    continue;
-                }
-
-                // Handle any extra data here.
-                EquipStartingGear(entity, startingGear, raiseEvent: false);
+                EquipStartingGear(entity, loadoutProto, raiseEvent: false);
             }
         }
     }
 
+    public void EquipStartingGear(EntityUid entity, LoadoutPrototype loadout, bool raiseEvent = true)
+    {
+        EquipStartingGear(entity, loadout.StartingGear, raiseEvent);
+        EquipStartingGear(entity, (IEquipmentLoadout) loadout, raiseEvent);
+    }
+
     /// <summary>
     /// <see cref="EquipStartingGear(Robust.Shared.GameObjects.EntityUid,System.Nullable{Robust.Shared.Prototypes.ProtoId{Content.Shared.Roles.StartingGearPrototype}},bool)"/>
     /// </summary>
     public void EquipStartingGear(EntityUid entity, ProtoId<StartingGearPrototype>? startingGear, bool raiseEvent = true)
     {
         PrototypeManager.TryIndex(startingGear, out var gearProto);
-        EquipStartingGear(entity, gearProto);
+        EquipStartingGear(entity, gearProto, raiseEvent);
+    }
+
+    /// <summary>
+    /// <see cref="EquipStartingGear(Robust.Shared.GameObjects.EntityUid,System.Nullable{Robust.Shared.Prototypes.ProtoId{Content.Shared.Roles.StartingGearPrototype}},bool)"/>
+    /// </summary>
+    public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingGear, bool raiseEvent = true)
+    {
+        EquipStartingGear(entity, (IEquipmentLoadout?) startingGear, raiseEvent);
     }
 
     /// <summary>
@@ -76,7 +83,7 @@ public void EquipStartingGear(EntityUid entity, ProtoId<StartingGearPrototype>?
     /// <param name="entity">Entity to load out.</param>
     /// <param name="startingGear">Starting gear to use.</param>
     /// <param name="raiseEvent">Should we raise the event for equipped. Set to false if you will call this manually</param>
-    public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingGear, bool raiseEvent = true)
+    public void EquipStartingGear(EntityUid entity, IEquipmentLoadout? startingGear, bool raiseEvent = true)
     {
         if (startingGear == null)
             return;
@@ -145,4 +152,4 @@ public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingG
             RaiseLocalEvent(entity, ref ev);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 7a207fb47cf..cac3b86ad60 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -1431,7 +1431,7 @@ private void OnLockToggled(EntityUid uid, StorageComponent component, ref LockTo
 
     private void OnStackCountChanged(EntityUid uid, MetaDataComponent component, StackCountChangedEvent args)
     {
-        if (_containerSystem.TryGetContainingContainer(uid, out var container, component) &&
+        if (_containerSystem.TryGetContainingContainer((uid, null, component), out var container) &&
             container.ID == StorageComponent.ContainerId)
         {
             UpdateAppearance(container.Owner);
diff --git a/Content.Shared/Temperature/Components/TemperatureSpeedComponent.cs b/Content.Shared/Temperature/Components/TemperatureSpeedComponent.cs
new file mode 100644
index 00000000000..74ba2a02749
--- /dev/null
+++ b/Content.Shared/Temperature/Components/TemperatureSpeedComponent.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Temperature.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Temperature.Components;
+
+/// <summary>
+/// This is used for an entity that varies in speed based on current temperature.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedTemperatureSystem)), AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class TemperatureSpeedComponent : Component
+{
+    /// <summary>
+    /// Pairs of temperature thresholds to applied slowdown values.
+    /// </summary>
+    [DataField]
+    public Dictionary<float, float> Thresholds = new();
+
+    /// <summary>
+    /// The current speed modifier from <see cref="Thresholds"/> we reached.
+    /// Stored and networked so that the client doesn't mispredict temperature
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float? CurrentSpeedModifier;
+
+    /// <summary>
+    /// The time at which the temperature slowdown is updated.
+    /// </summary>
+    [DataField, AutoNetworkedField, AutoPausedField]
+    public TimeSpan? NextSlowdownUpdate;
+}
diff --git a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
new file mode 100644
index 00000000000..efea2df5aff
--- /dev/null
+++ b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
@@ -0,0 +1,80 @@
+using System.Linq;
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Temperature.Components;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Temperature.Systems;
+
+/// <summary>
+/// This handles predicting temperature based speedup.
+/// </summary>
+public sealed class SharedTemperatureSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
+
+    /// <summary>
+    /// Band-aid for unpredicted atmos. Delays the application for a short period so that laggy clients can get the replicated temperature.
+    /// </summary>
+    private static readonly TimeSpan SlowdownApplicationDelay = TimeSpan.FromSeconds(1f);
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TemperatureSpeedComponent, OnTemperatureChangeEvent>(OnTemperatureChanged);
+        SubscribeLocalEvent<TemperatureSpeedComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeedModifiers);
+    }
+
+    private void OnTemperatureChanged(Entity<TemperatureSpeedComponent> ent, ref OnTemperatureChangeEvent args)
+    {
+        foreach (var (threshold, modifier) in ent.Comp.Thresholds)
+        {
+            if (args.CurrentTemperature < threshold && args.LastTemperature > threshold ||
+                args.CurrentTemperature > threshold && args.LastTemperature < threshold)
+            {
+                ent.Comp.NextSlowdownUpdate = _timing.CurTime + SlowdownApplicationDelay;
+                ent.Comp.CurrentSpeedModifier = modifier;
+                Dirty(ent);
+                break;
+            }
+        }
+
+        var maxThreshold = ent.Comp.Thresholds.Max(p => p.Key);
+        if (args.CurrentTemperature > maxThreshold && args.LastTemperature < maxThreshold)
+        {
+            ent.Comp.NextSlowdownUpdate = _timing.CurTime + SlowdownApplicationDelay;
+            ent.Comp.CurrentSpeedModifier = null;
+            Dirty(ent);
+        }
+    }
+
+    private void OnRefreshMovementSpeedModifiers(Entity<TemperatureSpeedComponent> ent, ref RefreshMovementSpeedModifiersEvent args)
+    {
+        // Don't update speed and mispredict while we're compensating for lag.
+        if (ent.Comp.NextSlowdownUpdate != null || ent.Comp.CurrentSpeedModifier == null)
+            return;
+
+        args.ModifySpeed(ent.Comp.CurrentSpeedModifier.Value, ent.Comp.CurrentSpeedModifier.Value);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<TemperatureSpeedComponent, MovementSpeedModifierComponent>();
+        while (query.MoveNext(out var uid, out var temp, out var movement))
+        {
+            if (temp.NextSlowdownUpdate == null)
+                continue;
+
+            if (_timing.CurTime < temp.NextSlowdownUpdate)
+                continue;
+
+            temp.NextSlowdownUpdate = null;
+            _movementSpeedModifier.RefreshMovementSpeedModifiers(uid, movement);
+            Dirty(uid, temp);
+        }
+    }
+}
diff --git a/Content.Shared/Temperature/TemperatureEvents.cs b/Content.Shared/Temperature/TemperatureEvents.cs
index ac12224868f..7a26d07e306 100644
--- a/Content.Shared/Temperature/TemperatureEvents.cs
+++ b/Content.Shared/Temperature/TemperatureEvents.cs
@@ -13,3 +13,18 @@ public ModifyChangedTemperatureEvent(float temperature)
         TemperatureDelta = temperature;
     }
 }
+
+public sealed class OnTemperatureChangeEvent : EntityEventArgs
+{
+    public readonly float CurrentTemperature;
+    public readonly float LastTemperature;
+    public readonly float TemperatureDelta;
+
+    public OnTemperatureChangeEvent(float current, float last, float delta)
+    {
+        CurrentTemperature = current;
+        LastTemperature = last;
+        TemperatureDelta = delta;
+    }
+}
+
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 72cf4ec550a..ae0ebfe74ca 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -625,14 +625,18 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
 
         var appliedDamage = new DamageSpecifier();
 
-        foreach (var entity in targets)
+        for (var i = targets.Count - 1; i >= 0; i--)
         {
+            var entity = targets[i];
             // We raise an attack attempt here as well,
             // primarily because this was an untargeted wideswing: if a subscriber to that event cared about
             // the potential target (such as for pacifism), they need to be made aware of the target here.
             // In that case, just continue.
             if (!Blocker.CanAttack(user, entity, (weapon, component)))
+            {
+                targets.RemoveAt(i);
                 continue;
+            }
 
             var attackedEvent = new AttackedEvent(meleeUid, user, GetCoordinates(ev.Coordinates));
             RaiseLocalEvent(entity, attackedEvent);
diff --git a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
index 62af124252b..3e1111a97d1 100644
--- a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
@@ -30,18 +30,6 @@ public sealed partial class CartridgeAmmoComponent : AmmoComponent
     [AutoNetworkedField]
     public bool Spent = false;
 
-    /// <summary>
-    /// How much the ammo spreads when shot, in degrees. Does nothing if count is 0.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("spread")]
-    public Angle Spread = Angle.FromDegrees(5);
-
-    /// <summary>
-    /// How many prototypes are spawned when shot.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("count")]
-    public int Count = 1;
-
     /// <summary>
     /// Caseless ammunition.
     /// </summary>
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
index d4aa024f4c8..7ef57df5391 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
@@ -33,7 +33,7 @@ private bool TryGetClothingSlotEntity(EntityUid uid, ClothingSlotAmmoProviderCom
     {
         slotEntity = null;
 
-        if (!Containers.TryGetContainingContainer(uid, out var container))
+        if (!Containers.TryGetContainingContainer((uid, null, null), out var container))
             return false;
         var user = container.Owner;
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
index 14aaff5bf70..2c0204d9463 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
@@ -9,6 +9,8 @@
 using System;
 using System.Linq;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Wieldable;
+using Content.Shared.Wieldable.Components;
 using JetBrains.Annotations;
 
 namespace Content.Shared.Weapons.Ranged.Systems;
@@ -31,9 +33,14 @@ protected virtual void InitializeRevolver()
 
     private void OnRevolverUse(EntityUid uid, RevolverAmmoProviderComponent component, UseInHandEvent args)
     {
+        if (args.Handled)
+            return;
+
         if (!_useDelay.TryResetDelay(uid))
             return;
 
+        args.Handled = true;
+
         Cycle(component);
         UpdateAmmoCount(uid, prediction: false);
         Dirty(uid, component);
@@ -393,10 +400,14 @@ private void OnRevolverTakeAmmo(EntityUid uid, RevolverAmmoProviderComponent com
                 args.Ammo.Add((spawned, EnsureComp<AmmoComponent>(spawned)));
 
                 if (cartridge.DeleteOnSpawn)
+                {
+                    component.AmmoSlots[index] = null;
                     component.Chambers[index] = null;
+                }
             }
             else
             {
+                component.AmmoSlots[index] = null;
                 component.Chambers[index] = null;
                 args.Ammo.Add((ent.Value, EnsureComp<AmmoComponent>(ent.Value)));
             }
diff --git a/Content.Shared/_Sunrise/Roles/DiscordRoleRequirement.cs b/Content.Shared/_Sunrise/Roles/DiscordRoleRequirement.cs
new file mode 100644
index 00000000000..2292ce01570
--- /dev/null
+++ b/Content.Shared/_Sunrise/Roles/DiscordRoleRequirement.cs
@@ -0,0 +1,29 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared._Sunrise.Roles;
+
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class DiscordRoleRequirement : JobRequirement
+{
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason)
+    {
+        reason = new FormattedMessage();
+
+        if (profile is null)
+            return true;
+
+        reason = FormattedMessage.FromMarkupPermissive("Для игры на данной роли вам необходимо получить роль в дискорде.");
+        return false;
+    }
+}
diff --git a/Content.Shared/_Sunrise/Roles/JobRequirements.DiscordRole.cs b/Content.Shared/_Sunrise/Roles/JobRequirements.DiscordRole.cs
deleted file mode 100644
index 797804eb696..00000000000
--- a/Content.Shared/_Sunrise/Roles/JobRequirements.DiscordRole.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Content.Shared.Roles;
-using JetBrains.Annotations;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._Sunrise.Roles
-{
-    [UsedImplicitly]
-    [Serializable, NetSerializable]
-    public sealed partial class DiscordRoleRequirement : JobRequirement
-    {
-    }
-}
diff --git a/Resources/Audio/Machines/attributions.yml b/Resources/Audio/Machines/attributions.yml
index 79d8009608b..9096766978a 100644
--- a/Resources/Audio/Machines/attributions.yml
+++ b/Resources/Audio/Machines/attributions.yml
@@ -166,3 +166,8 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from TG station."
   source: "https://github.com/tgstation/tgstation/tree/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0"
+
+- files: ["cutter.ogg"]
+  license: "CC0-1.0"
+  copyright: "by Ko4erga"
+  source: "https://github.com/space-wizards/space-station-14/pull/30431"
diff --git a/Resources/Audio/Machines/cutter.ogg b/Resources/Audio/Machines/cutter.ogg
new file mode 100644
index 00000000000..60f6df04f32
Binary files /dev/null and b/Resources/Audio/Machines/cutter.ogg differ
diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 6788f631b7a..9885d530790 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -385,5 +385,27 @@ Entries:
   id: 47
   time: '2024-07-31T01:58:31.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/30518
+- author: Mervill
+  changes:
+  - message: added a debug command to make you thirsty
+    type: Add
+  id: 48
+  time: '2024-08-02T15:49:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30562
+- author: Repo
+  changes:
+  - message: Players that aHelped in Current round stay at top of bwoink list.
+    type: Fix
+  id: 49
+  time: '2024-08-02T18:58:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30580
+- author: Mervill
+  changes:
+  - message: added a debug command to set either your hunger or thirst value to a
+      given threshold
+    type: Add
+  id: 50
+  time: '2024-08-05T07:36:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30563
 Name: Admin
 Order: 1
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a59b3971bcf..c6d82d45a97 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,215 +1,4 @@
 Entries:
-- author: Hanzdegloker
-  changes:
-  - message: Added 6 new energy drink based mixed drinks.
-    type: Add
-  - message: Added Red Bool energy drink back to the soda dispenser and gave it a
-      new canned sprite.
-    type: Add
-  id: 6521
-  time: '2024-05-03T06:57:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27597
-- author: DuskyJay
-  changes:
-  - message: Allowed EMP implants to be used while stunned or cuffed.
-    type: Tweak
-  id: 6522
-  time: '2024-05-03T07:51:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27644
-- author: Just-a-Unity-Dev
-  changes:
-  - message: Fixed Geras not having their speed buff.
-    type: Fix
-  - message: Geras are no longer immune to other AI mobs.
-    type: Fix
-  - message: Slimes can no longer morph into a Geras when zombified.
-    type: Fix
-  - message: Lowered the Geras death threshold.
-    type: Tweak
-  id: 6523
-  time: '2024-05-03T17:26:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27308
-- author: nikthechampiongr
-  changes:
-  - message: Ninjas will no longer be pointed to random wreckage in space.
-    type: Fix
-  id: 6524
-  time: '2024-05-03T20:23:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27552
-- author: Dutch-VanDerLinde
-  changes:
-  - message: Fixed nuclear operatives, zombies, and head revolutionary round end summaries
-      not showing.
-    type: Fix
-  id: 6525
-  time: '2024-05-04T00:03:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27654
-- author: TheShuEd
-  changes:
-  - message: Added Train station!
-    type: Add
-  id: 6526
-  time: '2024-05-04T11:10:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27534
-- author: TheShuEd
-  changes:
-  - message: "Added Pathological Liar trait accent. The accent has a 15% chance of\
-      \ inverting your message to the opposite. Replacing \u201CYes\u201D with \u201C\
-      No\u201D, \u201CCan\u201D with \u201Ccan't\u201D and so on."
-    type: Add
-  id: 6527
-  time: '2024-05-04T11:11:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27618
-- author: Tyzemol
-  changes:
-  - message: Fixed NPCs being able to see and attack you hiding in closed lockers
-      and crates
-    type: Fix
-  id: 6528
-  time: '2024-05-04T19:57:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27677
-- author: Blackern5000
-  changes:
-  - message: Security belts can now hold more items that security commonly uses.
-    type: Tweak
-  id: 6529
-  time: '2024-05-04T20:00:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27674
-- author: Blackern5000
-  changes:
-  - message: Floodlights now use medium power cells instead of small ones.
-    type: Tweak
-  id: 6530
-  time: '2024-05-04T20:06:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27672
-- author: lzk228
-  changes:
-  - message: Grey whistle added to arcade machine prizes.
-    type: Add
-  id: 6531
-  time: '2024-05-05T14:42:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27676
-- author: Killerqu00
-  changes:
-  - message: Welding masks can now be put on utility belts.
-    type: Tweak
-  id: 6532
-  time: '2024-05-05T23:30:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27694
-- author: Dutch-VanDerLinde
-  changes:
-  - message: Chemical analysis goggles now show the scanned solution's temperature.
-    type: Tweak
-  id: 6533
-  time: '2024-05-05T23:32:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27693
-- author: Allen
-  changes:
-  - message: Added new icons for the emote wheel
-    type: Add
-  id: 6534
-  time: '2024-05-06T01:12:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27541
-- author: DogZeroX
-  changes:
-  - message: 'Added a new salvage song: Deadline by Bolgarich'
-    type: Add
-  id: 6535
-  time: '2024-05-06T03:51:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27707
-- author: '0x6273'
-  changes:
-  - message: Shuttle docks now have a "dock status" device link port
-    type: Add
-  id: 6536
-  time: '2024-05-06T03:59:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27646
-- author: DogZeroX
-  changes:
-  - message: 'Added new lobby art: Just a week away by Fern'
-    type: Add
-  id: 6537
-  time: '2024-05-06T08:17:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27717
-- author: mirrorcult
-  changes:
-  - message: Event weights have been tweaked across the board, and some events removed
-      (such as false alarm) to hopefully allow for a more interesting and varied slate
-      of random occurrences per round.
-    type: Add
-  id: 6538
-  time: '2024-05-06T10:10:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27721
-- author: mirrorcult
-  changes:
-  - message: Tile weighting for many events and variation rules (messes, dragons,
-      revenants, kudzu, gasleak, rods, etc) has been fixed. They will now no longer
-      spawn disproportionately often on smaller grids.
-    type: Add
-  id: 6539
-  time: '2024-05-06T11:25:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27724
-- author: Blackern5000
-  changes:
-  - message: Burn damage is now half as effective at cauterizing wounds as it was
-      previously
-    type: Tweak
-  id: 6540
-  time: '2024-05-06T20:19:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27726
-- author: Blackern5000
-  changes:
-  - message: Active lights now deal significantly less burn damage when touched.
-    type: Tweak
-  id: 6541
-  time: '2024-05-06T20:20:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27728
-- author: pissdemon
-  changes:
-  - message: Special ghost roles are now raffled, instead of being given out to the
-      first player requesting them.
-    type: Add
-  id: 6542
-  time: '2024-05-07T01:48:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26629
-- author: mirrorcult
-  changes:
-  - message: Less ratkings should spawn during the mouse migration event now
-    type: Tweak
-  id: 6543
-  time: '2024-05-07T03:23:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27760
-- author: PJB3005
-  changes:
-  - message: Fixed preferences not loading sometimes if you had a loadout item with
-      playtime requirement selected in a character profile.
-    type: Fix
-  id: 6544
-  time: '2024-05-07T04:21:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27742
-- author: lzk228
-  changes:
-  - message: Morgue now can be anchored and unanchored.
-    type: Tweak
-  - message: Changed morgue's collision layer, so items now can go through it.
-    type: Tweak
-  id: 6545
-  time: '2024-05-07T07:26:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27750
-- author: mirrorcult
-  changes:
-  - message: Events that run now get logged to admin alert chat
-    type: Tweak
-  id: 6546
-  time: '2024-05-07T15:13:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27761
-- author: cooldolphin
-  changes:
-  - message: Cigarettes in the loadout menu.
-    type: Add
-  id: 6547
-  time: '2024-05-07T15:55:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27292
 - author: FairlySadPanda
   changes:
   - message: Weapons that deflect shots, like the e-sword, now are most effective
@@ -3781,3 +3570,217 @@
   id: 7020
   time: '2024-07-31T17:57:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/30531
+- author: Plykiya
+  changes:
+  - message: Meteors now leave behind asteroid rocks on impact.
+    type: Add
+  id: 7021
+  time: '2024-08-01T02:55:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30419
+- author: PixelTheAertist
+  changes:
+  - message: The Social Anxiety trait is now renamed to "Stutter"
+    type: Tweak
+  id: 7022
+  time: '2024-08-01T02:58:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29898
+- author: Plykiya
+  changes:
+  - message: Adds hand labelers to the PTech, ChemDrobe, and LawDrobe.
+    type: Add
+  id: 7023
+  time: '2024-08-01T02:59:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29958
+- author: Ko4erga
+  changes:
+  - message: Added a cutter machine for crafting patterned steel tiles, concrete and
+      wooden tiles.
+    type: Add
+  - message: After rip off patterned tiles you get current pattern, not just steel
+      tile.
+    type: Tweak
+  id: 7024
+  time: '2024-08-01T10:26:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30431
+- author: NakataRin
+  changes:
+  - message: Added paramedic to the train station.
+    type: Add
+  id: 7025
+  time: '2024-08-01T19:59:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30556
+- author: marbow
+  changes:
+  - message: Rejoice, detectives! Hand labeler has been added to your closet!
+    type: Add
+  id: 7026
+  time: '2024-08-01T20:01:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30501
+- author: metalgearsloth
+  changes:
+  - message: Fix some popups playing twice.
+    type: Fix
+  id: 7027
+  time: '2024-08-02T01:33:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30452
+- author: WarMechanic
+  changes:
+  - message: Adjusted meteors to have less lethal blast fragments.
+    type: Tweak
+  id: 7028
+  time: '2024-08-02T05:43:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29199
+- author: slarticodefast
+  changes:
+  - message: Fixed borgs not being able to state laws or open other UIs without an
+      active module.
+    type: Fix
+  id: 7029
+  time: '2024-08-02T05:44:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30299
+- author: TropicalHibi
+  changes:
+  - message: Now fs (for sure) and wru (where are you) are changed to their full version
+      in text
+    type: Add
+  id: 7030
+  time: '2024-08-02T05:57:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30508
+- author: Plykiya
+  changes:
+  - message: Rechargers now show the percent charged of the item it is charging.
+    type: Add
+  id: 7031
+  time: '2024-08-02T06:05:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28500
+- author: ShadowCommander
+  changes:
+  - message: Rollerbeds now deploy when holding them in hand and clicking on the ground.
+    type: Add
+  id: 7032
+  time: '2024-08-02T07:05:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30000
+- author: slarticodefast
+  changes:
+  - message: The digital audio workstation can now be rotated.
+    type: Tweak
+  id: 7033
+  time: '2024-08-02T10:02:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30571
+- author: slarticodefast
+  changes:
+  - message: Added potassium iodide. It gives you short term radiation protection
+      and can be found in radiation treatment kits.
+    type: Add
+  - message: Added haloperidol. It removes most stimulating/hallucinogenic drugs from
+      the body and makes you drowsy.
+    type: Add
+  - message: Added the drowsiness status effect. It blurs your vision and makes you
+      randomly fall asleep. Drink some coffee or cola to remove it.
+    type: Add
+  - message: Chloral hydrate now makes you drowsy instead of forcing you to sleep
+      instantly.
+    type: Tweak
+  id: 7034
+  time: '2024-08-02T17:12:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27454
+- author: Blackern5000
+  changes:
+  - message: Winter boots no longer have ugly outlines
+    type: Tweak
+  id: 7035
+  time: '2024-08-02T23:05:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30350
+- author: lzk228
+  changes:
+  - message: Figurines will say phrases on activation.
+    type: Add
+  id: 7036
+  time: '2024-08-03T14:06:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30455
+- author: JoelZimmerman
+  changes:
+  - message: Dank pizza is now cooked with cannabis leaves instead of ambrosia vulgaris.
+    type: Tweak
+  id: 7037
+  time: '2024-08-03T14:07:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30430
+- author: Ian321
+  changes:
+  - message: Help menus now include the linked guides.
+    type: Fix
+  id: 7038
+  time: '2024-08-04T03:32:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30462
+- author: DrSmugleaf
+  changes:
+  - message: The Toggle Internals verb no longer shows up in the context menu if no
+      breathing tool is equipped and internals are off.
+    type: Tweak
+  id: 7039
+  time: '2024-08-04T03:34:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30622
+- author: Mervill
+  changes:
+  - message: Rotten Meat can be collected in trash bags and deleted by the recycler
+    type: Tweak
+  id: 7040
+  time: '2024-08-04T10:13:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30594
+- author: DrSmugleaf
+  changes:
+  - message: Fixed the client sometimes falsely showing the red color flash effect
+      when attacking something that they can't, like allied xenonids.
+    type: Fix
+  id: 7041
+  time: '2024-08-05T03:14:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30661
+- author: Killerqu00
+  changes:
+  - message: Sleeper agents event no longer occurs when evacuation is called.
+    type: Tweak
+  id: 7042
+  time: '2024-08-05T03:17:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30646
+- author: Cojoke-dot
+  changes:
+  - message: Mice can now use combat mode with a 0 damage attack
+    type: Tweak
+  id: 7043
+  time: '2024-08-05T03:26:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30487
+- author: TheShuEd
+  changes:
+  - message: Nanotrasen has introduced recruitment rules. Characters under the age
+      of 20 are no longer allowed to take on the role of head.
+    type: Tweak
+  id: 7044
+  time: '2024-08-05T04:25:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30347
+- author: foboscheshir
+  changes:
+  - message: added missing mime mask sprites for Vox - scared and sad.
+    type: Add
+  id: 7045
+  time: '2024-08-05T06:09:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30607
+- author: SlamBamActionman, PolarTundra
+  changes:
+  - message: Thief's Syndie Kit now comes with a Radio Jammer, a lighter and a Syndicate
+      codeword.
+    type: Add
+  - message: Thief's Agent ID has been moved from the Syndie Kit to the Chameleon
+      Kit.
+    type: Tweak
+  - message: The Syndicate pAI has been removed from the Thief's Syndie Kit.
+    type: Remove
+  id: 7046
+  time: '2024-08-05T08:03:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30446
+- author: EmoGarbage404
+  changes:
+  - message: Being cold now slows down your character.
+    type: Add
+  id: 7047
+  time: '2024-08-05T08:07:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29692
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
index 4f1b616fb25..96656c911bb 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
@@ -39,5 +39,9 @@ deadmin_on_join = true
 new_player_threshold = 600
 alert.min_players_sharing_connection = 2
 
+[ahelp]
+admin_prefix = false
+admin_prefix_webhook = false
+
 [worldgen]
 enabled = true
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 6f5e023184b..c3b51ce7770 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aeshus, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, ArkiveDev, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, BombasterDS, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, chavonadelal, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, dffdff2423, diraven, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JIPDawg, JoeHammad1844, joelsgp, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Keer-Sar, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, laok233, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, Winkarst-cpu, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aeshus, Aexxie, Afrokada, Agoichi, Ahion, Aidenkrz, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, ArkiveDev, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, BombasterDS, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, chavonadelal, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, dffdff2423, diraven, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JIPDawg, JoeHammad1844, joelsgp, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Keer-Sar, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, laok233, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, marboww, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, NakataRin, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, stalengd, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, Winkarst-cpu, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem
diff --git a/Resources/Locale/en-US/administration/admin-verbs.ftl b/Resources/Locale/en-US/administration/admin-verbs.ftl
index 24294f05298..a89397bd65d 100644
--- a/Resources/Locale/en-US/administration/admin-verbs.ftl
+++ b/Resources/Locale/en-US/administration/admin-verbs.ftl
@@ -13,6 +13,6 @@ admin-verbs-erase-description = Removes the player from the round and crew manif
     Their items are dropped on the ground.
     Players are shown a popup indicating them to play as if they never existed.
 toolshed-verb-mark = Mark
-toolshed-verb-mark-description = Places this entity into the $marked variable, a list of entities, replacing it's prior value.
+toolshed-verb-mark-description = Places this entity into the $marked variable, a list of entities, replacing its prior value.
 
 export-entity-verb-get-data-text = Export sprite
diff --git a/Resources/Locale/en-US/administration/smites.ftl b/Resources/Locale/en-US/administration/smites.ftl
index 51c86dfb44f..e77725765be 100644
--- a/Resources/Locale/en-US/administration/smites.ftl
+++ b/Resources/Locale/en-US/administration/smites.ftl
@@ -126,7 +126,7 @@ admin-trick-rename-and-redescribe-description = Convenient bundle of both rename
 admin-trick-bar-job-slots-description = Closes all job slots on the station, such that nobody can join it.
 admin-trick-locate-cargo-shuttle-description = Teleports you directly to the station's cargo shuttle, if it exists.
 admin-trick-infinite-battery-description = Reconfigures the SMESes and substations on the grid/station/map to self-recharge rapidly.
-admin-trick-infinite-battery-object-description = Reconfigures the item so that it's battery rapidly refills.
+admin-trick-infinite-battery-object-description = Reconfigures the item so that its battery rapidly refills.
 admin-trick-halt-movement-description = Halts the movement of the target object, at least until something moves it again.
 admin-trick-unpause-map-description = Unpause the selected map. NOTE THIS CAN CAUSE BAD BEHAVIOR WITH STORAGE MAPS!
 admin-trick-pause-map-description = Pause the selected map. Note this doesn't entirely stop player movement!
diff --git a/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl
index d91ca5e3dfe..5473f162da2 100644
--- a/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl
@@ -9,5 +9,5 @@ advertisement-lawdrobe-8 = You or a loved one hurt by Nanotrasen? Too bad!
 thankyou-lawdrobe-1 = You can win any case in that outfit!
 thankyou-lawdrobe-2 = Get one for your client as well!
 thankyou-lawdrobe-3 = Win or lose, you get paid either way!
-thankyou-lawdrobe-4 = Remember: Its only illegal if you get caught!
+thankyou-lawdrobe-4 = Remember: It's only illegal if you get caught!
 thankyou-lawdrobe-5 = OBJECTION! That outfit is too cool for court!
diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl
index 09424e49097..b5eeafb0b36 100644
--- a/Resources/Locale/en-US/cargo/bounties.ftl
+++ b/Resources/Locale/en-US/cargo/bounties.ftl
@@ -65,6 +65,7 @@ bounty-item-cardboard-box = Cardboard box
 bounty-item-wine = Wine bottle
 bounty-item-cotton-boll = Cotton boll
 bounty-item-microwave-machine-board = Microwave machine board
+bounty-item-flash = Flash
 
 bounty-description-artifact = NanoTrasen is in some hot water for stealing artifacts from non-spacefaring planets. Return one and we'll compensate you for it.
 bounty-description-baseball-bat = Baseball fever is going on at CentCom! Be a dear and ship them some baseball bats, so that management can live out their childhood dream.
@@ -132,3 +133,4 @@ bounty-description-cardobard-box = "The Cardborgs Cometh" is a new play premieri
 bounty-description-wine = The new librarian and the Quartermaster are falling head over heels for each other after she caught him disassembling the bookshelves for wood. Send a couple bottles of wine (Or cans, if you must) to help make the date go well.
 bounty-description-cotton-boll = A massive swarm of mothroaches ate all the paper and cloth on the station. Send us some cotton to help keep our winged crewmembers fed.
 bounty-description-microwave-machine-board = Mr. Giggles thought it'd be funny to stick forks in all the kitchen microwaves. Help us replace them before the chefs start making clown burgers.
+bounty-description-flashes = GREETINGS \[Station] WE REQUIRE 6 FLASHES DUE TO A NORMAL \[TrainingExercise] WITH SECURITY. EVERYTHING IS \[Normal].
diff --git a/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl b/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
index 601392069b0..b966a9cc61d 100644
--- a/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
@@ -15,3 +15,6 @@ comp-solution-transfer-verb-toggle = Toggle to {$amount}u
 
 ## Displayed after you successfully change a solution's amount using the BUI
 comp-solution-transfer-set-amount = Transfer amount set to {$amount}u.
+comp-solution-transfer-set-amount-max = Max: {$amount}u
+comp-solution-transfer-set-amount-min = Min: {$amount}u
+
diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl
new file mode 100644
index 00000000000..0de2d9131b4
--- /dev/null
+++ b/Resources/Locale/en-US/datasets/figurines.ftl
@@ -0,0 +1,166 @@
+figurines-hop-1 = Papers, please.
+figurines-hop-2 = You are fired.
+
+figurines-passenger-1 = How to change hands?
+figurines-passenger-2 = Call evac.
+
+figurines-greytider-1 = Man, this party stinks. I fucking hate these people.
+figurines-greytider-2 = Uh-oh, who's lost their stunbaton?
+figurines-greytider-3 = Robust.
+figurines-greytider-4 = I'm not me without a toolbox.
+figurines-greytider-5 = Grey tide station wide!
+
+figurines-clown-1 = Honk!
+figurines-clown-2 = Banana!
+figurines-clown-3 = Soap!
+figurines-clown-4 = HoP has one clown, HoS has the whole department.
+figurines-clown-5 = Do I annoy you?
+
+figurines-holoclown-1 = I'm helping my older brother.
+
+figurines-mime-1 = ...
+figurines-mime-2 = ...
+figurines-mime-3 = ....
+figurines-mime-4 = .......
+figurines-mime-5 = ................
+
+figurines-musician-1 = Never gonna give you up!
+figurines-musician-2 = Never gonna let you down!
+
+# figurines-boxer-
+
+figurines-captain-1 = Crew, the Nuke Disk is safely up my ass.
+figurines-captain-2 = Glory to NT!
+
+figurines-hos-1 = Space law? What?
+figurines-hos-2 = Shot the clown.
+
+figurines-warden-1 = Execute him for breaking in!
+
+figurines-detective-1 = The butler did it.
+
+figurines-security-1 = I am the law!
+figurines-security-2 = You have violated article 1984.
+
+figurines-lawyer-1 = Better Call Saul!
+figurines-lawyer-2 = Objection!
+
+figurines-cargotech-1 = DRAGON ON ATS!
+figurines-cargotech-2 = I sold the station!
+figurines-cargotech-3 = Brain bounty? I don't have a brain.
+
+figurines-salvage-1 = Megafauna? It was mega easy.
+
+figurines-qm-1 = Who stole the shuttle?
+figurines-qm-2 = I won't approve the guns.
+figurines-qm-3 = I didn't buy those guns!
+figurines-qm-4 = One toys crate for ma fellow clown!
+figurines-qm-5 = Time to spent all money on gambling.
+figurines-qm-6 = Viva La Cargonia!
+figurines-qm-7 = Fill the form.
+
+figurines-ce-1 = Everyone to the briefing!
+figurines-ce-2 = Wire the solars!
+figurines-ce-3 = How to setup the TEG?
+figurines-ce-4 = SINGULOOSE!
+figurines-ce-5 = TESLOOSE!
+
+figurines-engineer-1 = SINGULOOSE!
+figurines-engineer-2 = TESLOOSE!
+figurines-engineer-3 = What is AME?
+
+figurines-atmostech-1 = I put plasma in distro.
+figurines-atmostech-2 = I will burn you in a burn chamber.
+figurines-atmostech-3 = Frezon...
+figurines-atmostech-4 = Tritium...
+figurines-atmostech-5 = Glory to Atmosia!
+
+figurines-rd-1 = Blowing all of the borgs!
+figurines-rd-2 = Tier 3 arsenal? No way.
+
+figurines-scientist-1 = Someone else must have made those bombs!
+figurines-scientist-2 = He asked to be borged!
+figurines-scientist-3 = Carp at sci!
+figurines-scientist-4 = Explosion at sci.
+figurines-scientist-5 = The anomaly has exploded.
+
+figurines-cmo-1 = Suit sensors!
+figurines-cmo-2 = Why do we have meth?
+
+figurines-chemist-1 = Get your pills!
+
+figurines-paramedic-1 = Insuls and tools!
+figurines-paramedic-2 = I need AA for saving people!
+
+figurines-doctor-1 = The patient is already dead!
+figurines-doctor-2 = CLEAR!
+figurines-doctor-3 = Saw makes BRRR.
+
+figurines-librarian-1 = One day while...
+figurines-librarian-2 = Silence!
+
+figurines-chaplain-1 = Would you like to join my cul- I mean religion.
+figurines-chaplain-2 = Gods make me a killing machine please!
+figurines-chaplain-3 = God exists!
+
+figurines-chef-1 = I swear it's not human meat.
+
+figurines-bartender-1 = Where's my monkey?
+figurines-bartender-2 = Sec won't drink.
+
+figurines-botanist-1 = I don't have any weed, officer!
+figurines-botanist-2 = Dude, I see colors...
+
+figurines-janitor-1 = Clown stole my soap. Again.
+figurines-janitor-2 = Look at the signs, you idiot.
+
+figurines-nukie-1 = I got the disk!
+figurines-nukie-2 = Whiskey, Echo, Whiskey.
+figurines-nukie-3 = The nuke makes boom.
+figurines-nukie-4 = What's the code?
+
+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-commander-1 = GET DAT FUKKEN DISK!
+
+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-wizard-1 = Ei Nath!
+figurines-wizard-2 = Wehgardium Leviosa!
+figurines-wizard-3 = Skidaddle skadoodle!
+figurines-wizard-4 = FIREBALL!
+
+figurines-space-dragon-1 = Fish will consume the station.
+
+# figurines-queen
+
+figurines-rat-king-1 = Gimme some food, capiche?
+figurines-rat-king-2 = Fugeddaboutit.
+figurines-rat-king-3 = Whack 'em!
+
+figurines-rat-servant-1 = Capiche!
+figurines-rat-servant-2 = Boss says!
+
+figurines-mouse-1 = Piep!
+figurines-mouse-2 = Squeak!
+figurines-mouse-3 = Chuu!
+figurines-mouse-4 = Eeee!
+figurines-mouse-5 = Pip!
+figurines-mouse-6 = Fwiep!
+figurines-mouse-7 = Heep!
+
+figurines-slime-1 = Blyump.
+figurines-slime-2 = Blimpuf?
+figurines-slime-3 = Blump!
+
+figurines-hamlet-1 = Piep!
+figurines-hamlet-2 = Squeak!
+figurines-hamlet-3 = Chuu!
+figurines-hamlet-4 = Eeee!
+figurines-hamlet-5 = Pip!
+figurines-hamlet-6 = Fwiep!
+figurines-hamlet-7 = Heep!
+figurines-hamlet-8 = NOT THE MICROWAVE!
diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl
index e92676a2160..fd3e6b82aa7 100644
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl
@@ -24,17 +24,17 @@ traitor-death-match-end-round-description-entry = {$originalName}'s PDA, with {$
 
 # TraitorRole
 traitor-role-greeting =
-    You are an agent sent by {$corporation} on behalf of The Syndicate.
+    You are an agent sent by {$corporation} on behalf of [color = darkred]The Syndicate.[/color]
     Your objectives and codewords are listed in the character menu.
     Use the uplink loaded into your PDA to buy the tools you'll need for this mission.
     Death to Nanotrasen!
 traitor-role-codewords =
-    The codewords are:
-    {$codewords}.
+    The codewords are: [color = lightgray]
+    {$codewords}.[/color]
     Codewords can be used in regular conversation to identify yourself discretely to other syndicate agents.
     Listen for them, and keep them secret.
 traitor-role-uplink-code =
-    Set your ringtone to the notes {$code} to lock or unlock your uplink.
+    Set your ringtone to the notes [color = lightgray]{$code}[/color] to lock or unlock your uplink.
     Remember to lock it after, or the stations crew will easily open it too!
 
 # don't need all the flavour text for character menu
diff --git a/Resources/Locale/en-US/game-ticking/game-ticker.ftl b/Resources/Locale/en-US/game-ticking/game-ticker.ftl
index 9527ecb57d9..9c2d7bcf306 100644
--- a/Resources/Locale/en-US/game-ticking/game-ticker.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-ticker.ftl
@@ -37,6 +37,8 @@ latejoin-arrival-announcement = {$character} ({$job}) has arrived at the station
 latejoin-arrival-sender = Station
 latejoin-arrivals-direction = A shuttle transferring you to your station will arrive shortly.
 latejoin-arrivals-direction-time = A shuttle transferring you to your station will arrive in {$time}.
+latejoin-arrivals-dumped-from-shuttle = A mysterious force prevents you from leaving with the arrivals shuttle.
+latejoin-arrivals-teleport-to-spawn = A mysterious force teleports you off the arrivals shuttle. Have a safe shift!
 
 preset-not-enough-ready-players = Can't start {$presetName}. Requires {$minimumPlayers} players but we have {$readyPlayersCount}.
 preset-no-one-ready = Can't start {$presetName}. No players are ready.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl b/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
index 3db8a3c5b0e..9a8f2f6c8a3 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
@@ -11,3 +11,5 @@ reagent-effect-status-effect-PressureImmunity = pressure immunity
 reagent-effect-status-effect-Pacified = combat pacification
 reagent-effect-status-effect-RatvarianLanguage = ratvarian language patterns
 reagent-effect-status-effect-StaminaModifier = modified stamina
+reagent-effect-status-effect-RadiationProtection = radiation protection
+reagent-effect-status-effect-Drowsiness = drowsiness
diff --git a/Resources/Locale/en-US/job/role-timers.ftl b/Resources/Locale/en-US/job/role-requirements.ftl
similarity index 71%
rename from Resources/Locale/en-US/job/role-timers.ftl
rename to Resources/Locale/en-US/job/role-requirements.ftl
index 1981f5e7957..906a0470af0 100644
--- a/Resources/Locale/en-US/job/role-timers.ftl
+++ b/Resources/Locale/en-US/job/role-requirements.ftl
@@ -4,7 +4,13 @@ role-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0"
 role-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime to play this role. (Are you trying to play a trainee role?)
 role-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color] to play this role.
 role-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color] to play this role. (Are you trying to play a trainee role?)
+role-timer-age-to-old = Your character must be under the age of [color=yellow]{$age}[/color] to play this role.
+role-timer-age-to-young = Your character must be over the age of [color=yellow]{$age}[/color] to play this role.
+role-timer-whitelisted-species = Your character must be one of the following species to play this role:
+role-timer-blacklisted-species = Your character must not be one of the following species to play this role:
 
 role-timer-locked = Locked (hover for details)
 
+role-timer-department-unknown = Unknown Department
+
 role-ban = You have been banned from this role.
diff --git a/Resources/Locale/en-US/lathe/recipes.ftl b/Resources/Locale/en-US/lathe/recipes.ftl
new file mode 100644
index 00000000000..99186c5b659
--- /dev/null
+++ b/Resources/Locale/en-US/lathe/recipes.ftl
@@ -0,0 +1,8 @@
+lathe-recipe-Medkit-name = first aid kit (empty)
+lathe-recipe-MedkitBurn-name = burn treatment kit (empty)
+lathe-recipe-MedkitToxin-name = toxin treatment kit (empty)
+lathe-recipe-MedkitO2-name = oxygen deprivation treatment kit (empty)
+lathe-recipe-MedkitBrute-name = brute trauma treatment kit (empty)
+lathe-recipe-MedkitAdvanced-name = advanced first aid kit (empty)
+lathe-recipe-MedkitRadiation-name = radiation treatment kit (empty)
+lathe-recipe-MedkitCombat-name = combat medical kit (empty)
diff --git a/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl b/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
index 71dd50d4091..16b67022ad5 100644
--- a/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
+++ b/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
@@ -6,6 +6,9 @@ lathe-menu-search-designs = Search designs
 lathe-menu-category-all = All
 lathe-menu-search-filter = Filter:
 lathe-menu-amount = Amount:
+lathe-menu-reagent-slot-examine = It has a slot for a beaker on the side.
+lathe-reagent-dispense-no-container = Liquid pours out of {THE($name)} onto the floor!
+lathe-menu-result-reagent-display = {$reagent} ({$amount}u)
 lathe-menu-material-display = {$material} ({$amount})
 lathe-menu-tooltip-display = {$amount} of {$material}
 lathe-menu-description-display = [italic]{$description}[/italic]
diff --git a/Resources/Locale/en-US/mapping/editor.ftl b/Resources/Locale/en-US/mapping/editor.ftl
new file mode 100644
index 00000000000..153df531e25
--- /dev/null
+++ b/Resources/Locale/en-US/mapping/editor.ftl
@@ -0,0 +1,7 @@
+mapping-entities = Entities
+mapping-tiles = Tiles
+mapping-decals = Decals
+
+mapping-replace = Replace
+mapping-erase-entity = Erase Entity
+mapping-erase-decal = Erase Decal
\ No newline at end of file
diff --git a/Resources/Locale/en-US/nutrition/nutrition-commands.ftl b/Resources/Locale/en-US/nutrition/nutrition-commands.ftl
new file mode 100644
index 00000000000..2b1259e9b2e
--- /dev/null
+++ b/Resources/Locale/en-US/nutrition/nutrition-commands.ftl
@@ -0,0 +1,12 @@
+cmd-nutrition-error-player = You cannot use this command unless you are a player.
+cmd-nutrition-error-entity = You cannot use this command without an entity.
+cmd-nutrition-error-component = Your entity does not have a {$comp} component.
+
+cmd-hungry-desc = makes you hungry
+cmd-hungry-help = sets your hungry level to starving
+cmd-setnutrit-desc = modify hunger and thirst
+cmd-setnutrit-help = set your hunger or thirst to one of the built-in thresholds
+cmd-setnutrit-error-invalid-threshold = invalid {$thresholdType} `{$thresholdString}`
+
+cmd-thirsty-desc = makes you thirsty
+cmd-thirsty-help = sets your thirst level to partched
diff --git a/Resources/Locale/en-US/power/components/charger.ftl b/Resources/Locale/en-US/power/components/charger.ftl
index 1a6e72f43e9..9ac16a2d46e 100644
--- a/Resources/Locale/en-US/power/components/charger.ftl
+++ b/Resources/Locale/en-US/power/components/charger.ftl
@@ -1,2 +1,4 @@
 charger-examine = Charges at [color={$color}]{$chargeRate}W[/color].
 charger-component-charge-rate = Charge rate
+charger-content = Current charge is at [color=#5E7C16]{$chargePercentage}[/color]%.
+charger-empty = There is nothing in the charger.
diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl
index a84e8315fda..a0c27d52912 100644
--- a/Resources/Locale/en-US/reagents/meta/medicine.ftl
+++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl
@@ -83,7 +83,7 @@ reagent-name-lipozine = lipozine
 reagent-desc-lipozine = A chemical that accelerates metabolism, causing the user to hunger faster.
 
 reagent-name-omnizine = omnizine
-reagent-desc-omnizine = A soothing milky liquid with an iridescent gleam. A well known conspiracy theory says that it's origins remain a mystery because revealing the secrets of its production would render most commercial pharmaceuticals obsolete.
+reagent-desc-omnizine = A soothing milky liquid with an iridescent gleam. A well known conspiracy theory says that its origins remain a mystery because revealing the secrets of its production would render most commercial pharmaceuticals obsolete.
 
 reagent-name-ultravasculine = ultravasculine
 reagent-desc-ultravasculine = A complicated anti-toxin solution that quickly flushes out toxin while causing minor stress on the body. Reacts with histamine, duplicating itself while flushing it out. Overdose causes extreme pain.
@@ -141,3 +141,9 @@ reagent-desc-mannitol = Efficiently restores brain damage.
 
 reagent-name-psicodine = psicodine
 reagent-desc-psicodine = Suppresses anxiety and other various forms of mental distress. Overdose causes hallucinations and minor toxin damage.
+
+reagent-name-potassium-iodide = potassium iodide
+reagent-desc-potassium-iodide = Will reduce the damaging effects of radiation by 90%. Prophylactic use only.
+
+reagent-name-haloperidol = haloperidol
+reagent-desc-haloperidol = Removes most stimulating and hallucinogenic drugs. Reduces druggy effects and jitteriness. Causes drowsiness.
diff --git a/Resources/Locale/en-US/reagents/meta/toxins.ftl b/Resources/Locale/en-US/reagents/meta/toxins.ftl
index 85dd9a3b6fb..6d92d81079b 100644
--- a/Resources/Locale/en-US/reagents/meta/toxins.ftl
+++ b/Resources/Locale/en-US/reagents/meta/toxins.ftl
@@ -44,7 +44,7 @@ reagent-name-theobromine = theobromine
 reagent-desc-theobromine = A bitter alkaloid of the cacao plant, commonly found in chocolate. Do not feed to animals.
 
 reagent-name-amatoxin = amatoxin
-reagent-desc-amatoxin = A deadly toxin found in some mushrooms, primarily fly amanita. Small dosages can be lethal.
+reagent-desc-amatoxin = A deadly toxin found in some mushrooms, primarily fly amanita. Small doses can be lethal.
 
 reagent-name-vent-crud = vent crud
 reagent-desc-vent-crud = A jet black substance found in poorly maintained ventilation systems. Can cause vent cough.
@@ -65,13 +65,13 @@ reagent-name-honk = honk
 reagent-desc-honk = A toxin found in bananium. Causes severe honking and internal bleeding, may also cause the patient to mutate.
 
 reagent-name-lead = lead
-reagent-desc-lead = A slow-acting but incredibly lethal toxin found in steel, albiet in trace amounts. Tasteless.
+reagent-desc-lead = A slow-acting but incredibly lethal toxin found in steel, albeit in trace amounts. Tasteless.
 
 reagent-name-bungotoxin = bungotoxin
 reagent-desc-bungotoxin = A moderately slow-acting poison found within the pit of the bungo fruit.
 
 reagent-name-vestine = vestine
-reagent-desc-vestine = Has an adverse reaction within the body causing major jittering. While not particularly useful on it's own, it can be used to produce a small variety of chemicals.
+reagent-desc-vestine = Has an adverse reaction within the body causing major jittering. While not particularly useful on its own, it can be used to produce a small variety of chemicals.
 
 reagent-name-tazinide = tazinide
 reagent-desc-tazinide = A highly dangerous metallic mixture which can interfere with most movement through an electrifying current.
diff --git a/Resources/Locale/en-US/speech/speech-chatsan.ftl b/Resources/Locale/en-US/speech/speech-chatsan.ftl
index 9f3cc9d42d5..08edd6c204a 100644
--- a/Resources/Locale/en-US/speech/speech-chatsan.ftl
+++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl
@@ -144,3 +144,15 @@ chatsan-replacement-51 = real quick
 
 chatsan-word-52 = dw
 chatsan-replacement-52 = don't worry
+
+chatsan-word-53 = wru
+chatsan-replacement-53 = where are you
+
+chatsan-word-54 = fs
+chatsan-replacement-54 = for sure
+
+chatsan-word-55 = ngl
+chatsan-replacement-55 = not gonna lie
+
+chatsan-word-56 = fml
+chatsan-replacement-56 = fuck my life
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/general.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/general.ftl
index 1e4b064985e..26345596856 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/general.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/general.ftl
@@ -58,3 +58,5 @@ ent-BoxCandleSmall = small candle box
     .desc = { ent-BoxCandle.desc }
 ent-BoxDarts = darts box
     .desc = A box filled with colorful darts.
+ent-BoxEnvelope = envelope box
+    .desc = A box filled with envelopes.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/permaescape.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/permaescape.ftl
new file mode 100644
index 00000000000..0d8a90d4c78
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/permaescape.ftl
@@ -0,0 +1,32 @@
+ent-CratePermaEscapeSpawner = Perma Escape Crate Spawner
+    .desc = { ent-CrateEmptySpawner.desc }
+ent-CratePermaEscapeDigging = { ent-CrateGenericSteel }
+    .suffix = Digging
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeEVA = { ent-CrateGenericSteel }
+    .suffix = EVAs
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeGun = { ent-CrateGenericSteel }
+    .suffix = Gun
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeBureaucracy = { ent-CrateGenericSteel }
+    .suffix = Writing
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeLights = { ent-CrateGenericSteel }
+    .suffix = Glowsticks
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeMats = { ent-CrateGenericSteel }
+    .suffix = Mats
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeGiftsFromSyndicate = { ent-CrateGenericSteel }
+    .suffix = Syndi Gifts
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeMerc = { ent-CrateGenericSteel }
+    .suffix = Merc
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeComs = { ent-CrateGenericSteel }
+    .suffix = Coms
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeTowercap = { ent-CrateGenericSteel }
+    .suffix = Towercap
+    .desc = { ent-CrateGenericSteel.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/service.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/service.ftl
index eaec74ea99a..8010fb9977e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/service.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/service.ftl
@@ -29,5 +29,7 @@ ent-CrateJanitorBiosuit = janitor bio suit crate
 ent-CrateTrashCartFilled = { ent-CrateTrashCart }
     .suffix = Filled
     .desc = { ent-CrateTrashCart.desc }
+ent-CrateCandles = candles crate
+    .desc = Contains 4 boxes of candles, 2 large and 2 small. For atmosphere or something.
 ent-CrateJanitorExplosive = janitorial bomb suit crate
     .desc = Supplies a bomb suit for cleaning up any explosive compounds, buy one today!
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/misc.ftl
index e7e3f33a99b..cd1fa91cb43 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/misc.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/misc.ftl
@@ -4,3 +4,6 @@ ent-ClothingShoesBootsCombatFilled = { ent-ClothingShoesBootsCombat }
 ent-ClothingShoesBootsMercFilled = { ent-ClothingShoesBootsMerc }
     .suffix = Filled
     .desc = { ent-ClothingShoesBootsMerc.desc }
+ent-ClothingShoesBootsSyndieFilled = { ent-ClothingShoesBootsCombat }
+    .suffix = Filled, Throwing Knife
+    .desc = { ent-ClothingShoesBootsCombat.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl
index a52b400be1b..45536b20229 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl
@@ -2,7 +2,7 @@ ent-ClothingHeadHatBeaverHat = beaver hat
     .desc = Gentlemen?
 ent-ClothingHeadHatBeret = beret
     .desc = A beret, an artists favorite headwear.
-ent-ClothingHeadHatBeretFrench = French beret
+ent-ClothingHeadHatBeretFrench = french beret
     .desc = A French beret, "vive la France".
 ent-ClothingHeadHatBeretSecurity = security beret
     .desc = A stylish clothing option for security officers.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl
index 441cc2fab4a..241114af781 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl
@@ -24,6 +24,8 @@ ent-ClothingMaskClown = { ent-ClothingMaskClownBase }
     .desc = { ent-ClothingMaskClownBase.desc }
 ent-ClothingMaskClownBanana = banana clown wig and mask
     .desc = { ent-ClothingMaskClown.desc }
+ent-ClothingMaskClownSecurity = security clown wig and mask
+    .desc = A debatably oxymoronic but protective mask and wig.
 ent-ClothingMaskJoy = joy mask
     .desc = Express your happiness or hide your sorrows with this laughing face with crying tears of joy cutout.
 ent-ClothingMaskMime = mime mask
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/magboots.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/magboots.ftl
index 1602c9b85aa..3cd4b66f5b6 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/magboots.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/magboots.ftl
@@ -7,6 +7,6 @@ ent-ClothingShoesBootsMagSci = { ent-ClothingShoesBootsMag }
 ent-ClothingShoesBootsMagBlinding = magboots of blinding speed
     .desc = These would look fetching on a fetcher like you.
 ent-ClothingShoesBootsMagSyndie = blood-red magboots
-    .desc = Reverse-engineered magnetic boots that have a heavy magnetic pull and integrated thrusters.
+    .desc = Reverse-engineered magnetic boots that have a heavy magnetic pull and integrated thrusters. It can hold 0.75 L of gas.
 ent-ActionToggleMagboots = Toggle Magboots
     .desc = Toggles the magboots on and off.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/foldable.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/foldable.ftl
index 5527068eeb7..a08a63b68e6 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/foldable.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/foldable.ftl
@@ -1,2 +1,4 @@
 ent-BaseFoldable = foldable
     .desc = { "" }
+ent-BaseDeployFoldable = deploy foldable
+    .desc = { ent-BaseFoldable.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/temp.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/temp.ftl
new file mode 100644
index 00000000000..0fddc4a73ca
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/temp.ftl
@@ -0,0 +1,2 @@
+ent-TemporaryEntityForTimedDespawnSpawners = { "" }
+    .desc = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/elemental.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/elemental.ftl
index 9f848b2e731..52f9254698e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/elemental.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/elemental.ftl
@@ -10,7 +10,7 @@ ent-MobUraniumCrab = { ent-MobOreCrab }
     .desc = An ore crab made from uranium.
 ent-MobSilverCrab = ore crab
     .desc = An ore crab made from silver.
-ent-ReagentSlime = Reagent slime
+ent-ReagentSlime = reagent slime
     .desc = It consists of a liquid, and it wants to dissolve you in itself.
     .suffix = Water
 ent-ReagentSlimeSpawner = Reagent Slime Spawner
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/mimic.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/mimic.ftl
index 5d5dd3887f6..e53e6badbb7 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/mimic.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/mimic.ftl
@@ -1,2 +1,2 @@
-ent-MobMimic = Mimic
+ent-MobMimic = mimic
     .desc = Surprise.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/regalrat.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/regalrat.ftl
index e7de8e62c40..e5f34ba1311 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/regalrat.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/regalrat.ftl
@@ -1,9 +1,9 @@
-ent-MobRatKing = Rat King
+ent-MobRatKing = rat king
     .desc = He's da rat. He make da roolz.
 ent-MobRatKingBuff = { ent-MobRatKing }
     .suffix = Buff
     .desc = { ent-MobRatKing.desc }
-ent-MobRatServant = Rat Servant
+ent-MobRatServant = rat servant
     .desc = He's da mini rat. He don't make da roolz.
 ent-ActionRatKingRaiseArmy = Raise Army
     .desc = Spend some hunger to summon an allied rat to help defend you.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl
index d54c283ada4..0c01e06a6dc 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl
@@ -1,18 +1,18 @@
-ent-MobXeno = Burrower
+ent-MobXeno = burrower
     .desc = They mostly come at night. Mostly.
-ent-MobXenoPraetorian = Praetorian
+ent-MobXenoPraetorian = praetorian
     .desc = { ent-MobXeno.desc }
-ent-MobXenoDrone = Drone
+ent-MobXenoDrone = drone
     .desc = { ent-MobXeno.desc }
-ent-MobXenoQueen = Queen
+ent-MobXenoQueen = queen
     .desc = { ent-MobXeno.desc }
-ent-MobXenoRavager = Ravager
+ent-MobXenoRavager = ravager
     .desc = { ent-MobXeno.desc }
-ent-MobXenoRunner = Runner
+ent-MobXenoRunner = runner
     .desc = { ent-MobXeno.desc }
-ent-MobXenoRouny = Rouny
+ent-MobXenoRouny = rouny
     .desc = { ent-MobXenoRunner.desc }
-ent-MobXenoSpitter = Spitter
+ent-MobXenoSpitter = spitter
     .desc = { ent-MobXeno.desc }
 ent-MobPurpleSnake = space adder
     .desc = A menacing purple snake from Kepler-283c.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/human.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/human.ftl
index d3051c9ac44..e2f9129a769 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/human.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/human.ftl
@@ -6,6 +6,12 @@ ent-MobHumanSyndicateAgentBase = syndicate agent
 ent-MobHumanSyndicateAgent = syndicate agent
     .suffix = Human, Traitor
     .desc = { ent-MobHumanSyndicateAgentBase.desc }
+ent-MobHumanSyndicateAgentMedic = syndicate medic
+    .desc = { ent-MobHumanSyndicateAgent.desc }
+ent-MobHumanSyndicateAgentSpy = syndicate spy
+    .desc = { ent-MobHumanSyndicateAgent.desc }
+ent-MobHumanSyndicateAgentThief = syndicate thief
+    .desc = { ent-MobHumanSyndicateAgent.desc }
 ent-MobHumanSyndicateAgentNukeops = { ent-MobHumanSyndicateAgentBase }
     .suffix = Human, NukeOps
     .desc = { ent-MobHumanSyndicateAgentBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl
index f3fc14bce12..3c822e38f66 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl
@@ -69,7 +69,7 @@ ent-DrinkJuiceLimeCartonXL = lime juice XL
     .desc = Sweet-sour goodness.
 ent-DrinkJuiceOrangeCartonXL = orange juice XL
     .desc = Full of vitamins and deliciousness!
-ent-DrinkCreamCartonXL = Milk Cream XL
+ent-DrinkCreamCartonXL = milk cream XL
     .desc = It's cream. Made from milk. What else did you think you'd find in there?
 ent-DrinkSugarJug = sugar jug
     .desc = some people put this in their coffee...
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cups.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cups.ftl
index 8ec8b8eb74a..b581dab89bb 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cups.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cups.ftl
@@ -36,7 +36,7 @@ ent-DrinkTeacup = teacup
     .desc = A plain white porcelain teacup.
 ent-DrinkGreenTea = green tea
     .desc = A plain white porcelain teacup.
-ent-DrinkLean = grape Juice
+ent-DrinkLean = grape juice
     .desc = Damn, no fun allowed.
 ent-DrinkWaterCup = water cup
     .desc = A paper water cup.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl
index 87f0af7105d..7adda7453e2 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl
@@ -40,3 +40,7 @@ ent-FoodPizzaArnoldSlice = slice of Arnold's pizza
     .desc = I come over, maybe I give you a pizza, maybe I break off your arm.
 ent-FoodPizzaMoldySlice = slice of moldy pizza
     .desc = Once a perfectly good slice of pizza pie, but now it lies here, rancid and bursting with spores.
+ent-FoodPizzaUranium = spicy rock pizza
+    .desc = Spicy pizza covered in peppers and uranium.
+ent-FoodPizzaUraniumSlice = slice of spicy rock pizza
+    .desc = A glowing slice of spicy rock pizza.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl
index dcb46286634..b4e2e5f295c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl
@@ -8,6 +8,8 @@ ent-OatBushel = oat bushel
     .desc = Eat oats, do squats.
 ent-Sugarcane = sugarcane
     .desc = Sickly sweet.
+ent-Papercane = papercane roll
+    .desc = Why do we even need to grow paper?
 ent-FoodLaughinPeaPod = laughin' pea pod
     .desc = The clown's favorite plant.
 ent-Log = tower-cap log
@@ -58,6 +60,8 @@ ent-FoodEggplant = eggplant
     .desc = Maybe there's a chicken inside?
 ent-FoodApple = apple
     .desc = It's a little piece of Eden.
+ent-FoodGoldenApple = golden apple
+    .desc = It should be shaped like a cube, shouldn't it?
 ent-FoodCocoaPod = cocoa pod
     .desc = You can never have too much chocolate!
 ent-FoodCorn = ear of corn
@@ -96,6 +100,8 @@ ent-FoodAmbrosiaDeus = ambrosia deus
     .desc = An extremely sought-after medicinal plant. May have some funky side effects.
 ent-FoodGalaxythistle = galaxythistle
     .desc = A medicinal plant used for its antitoxin.
+ent-FoodGlasstle = glasstle
+    .desc = A fragile crystal plant with lot of spiky thorns.
 ent-FoodFlyAmanita = fly amanita
     .desc = A delicious-looking mushroom like you see in those cartoons.
 ent-FoodGatfruit = gatfruit
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
index 981ce4ecd68..0157b8afef1 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
@@ -162,3 +162,5 @@ ent-ReagentGrinderIndustrialMachineCircuitboard = industrial reagent grinder mac
     .desc = { ent-BaseMachineCircuitboard.desc }
 ent-JukeboxCircuitBoard = jukebox machine board
     .desc = A machine printed circuit board for a jukebox.
+ent-CutterMachineCircuitboard = cutter machine board
+    .desc = { ent-BaseMachineCircuitboard.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl
index 6e7edc53a23..5468b9ed53b 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl
@@ -1,8 +1,10 @@
-ent-ReinforcementRadioSyndicate = syndicate reinforcement radio
+ent-ReinforcementRadio = syndicate reinforcement radio
     .desc = Call in a syndicate agent of questionable quality, instantly! Only basic equipment provided.
-ent-ReinforcementRadioSyndicateNukeops = { ent-ReinforcementRadioSyndicate }
+ent-ReinforcementRadioSyndicate = syndicate reinforcement radio
+    .desc = Call in a syndicate agent of questionable quality, instantly!
+ent-ReinforcementRadioSyndicateNukeops = nuclear operative radio
+    .desc = Call in a nuclear operative of questionable quality, instantly! Basic nukeop equipment provided.
     .suffix = NukeOps
-    .desc = { ent-ReinforcementRadioSyndicate.desc }
 ent-ReinforcementRadioSyndicateAncestor = syndicate genetic ancestor reinforcement radio
     .desc = Calls in a specially trained ancestor of your choosing to assist you.
 ent-ReinforcementRadioSyndicateAncestorNukeops = { ent-ReinforcementRadioSyndicateAncestor }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/authorbooks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/authorbooks.ftl
index dbd557ac5be..83255d03cac 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/authorbooks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/authorbooks.ftl
@@ -28,7 +28,7 @@ ent-BookIanRanch = the adventures of ian and renault - ranch expedition
     .desc = The book appears to be new, with crisp pages and an unblemished cover. The cover features a colorful illustration of Ian and Renault, surrounded by various animals they encountered on the ranch, including horses, cows, and chickens. The title, "The Adventures of Ian and Renault - Ranch Expedition," is written in bold letters above the image, with the subtitle, "Helping Animals in Need," written below.
 ent-BookIanOcean = the adventures of ian and renault - an ocean adventure
     .desc = The book is new and in excellent condition. The cover shows Ian and Renault running and playing on the beach, with the blue ocean and golden sand in the background. The title is written in bold, playful letters, and the subtitle reads "An Ocean Adventure."
-ent-BookIanMountain = the adventures of ian and renault - A mountain expedition
+ent-BookIanMountain = the adventures of ian and renault - a mountain expedition
     .desc = The book is in new condition. The cover is a stunning mountain landscape with Ian and Renault in the foreground, looking out over the vista of the surrounding peaks and valleys. The title is written in bold, block letters at the top, with the subtitle, "A Mountain Expedition," written underneath.
 ent-BookIanCity = the adventures of ian and renault - exploring the city
     .desc = The book is in new condition, with crisp pages and a glossy cover. The cover features a colorful illustration of Ian and Renault exploring the city, with tall buildings and bustling streets in the background. Ian is leading the way, with his tail wagging excitedly, while Renault follows close behind, her ears perked up and her eyes wide with wonder. The title, "The Adventures of Ian and Renault," is written in bold, playful letters, with the subtitle, "Exploring the City," written below in smaller font.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl
index 29857dfa943..03ff459499f 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl
@@ -67,3 +67,5 @@ ent-BoxFolderCentComClipboard = CentCom clipboard
     .desc = A luxurious clipboard upholstered with green velvet. Often seen carried by CentCom officials, seldom seen actually used.
 ent-BoxFolderQmClipboard = requisition digi-board
     .desc = A bulky electric clipboard, filled with shipping orders and financing details. With so many compromising documents, you ought to keep this safe.
+ent-Envelope = envelope
+    .desc = A small envelope for keeping prying eyes off of your sensitive documents.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl
index 1872afee3ae..fcad61524c0 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl
@@ -1,18 +1,66 @@
 ent-FloorTileItemBase = { ent-BaseItem }
     .desc = These could work as a pretty decent throwing weapon.
-ent-FloorTileItemSteel = steel tile
-    .desc = { ent-FloorTileItemBase.desc }
 ent-FloorTileItemSteelCheckerDark = steel dark checker tile
     .desc = { ent-FloorTileItemSteel.desc }
 ent-FloorTileItemSteelCheckerLight = steel light checker tile
     .desc = { ent-FloorTileItemSteel.desc }
-ent-FloorTileItemMetalDiamond = steel tile
+ent-FloorTileItemDark = dark tile
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWood = wood floor
+ent-FloorTileItemDarkDiagonalMini = dark steel diagonal mini tile
+    .desc = { ent-FloorTileItemDark.desc }
+ent-FloorTileItemDarkDiagonal = dark steel diagonal tile
+    .desc = { ent-FloorTileItemDark.desc }
+ent-FloorTileItemDarkHerringbone = dark steel herringbone
+    .desc = { ent-FloorTileItemDark.desc }
+ent-FloorTileItemDarkMini = dark steel mini tile
+    .desc = { ent-FloorTileItemDark.desc }
+ent-FloorTileItemDarkMono = dark steel mono tile
+    .desc = { ent-FloorTileItemDark.desc }
+ent-FloorTileItemDarkPavement = dark steel pavement
+    .desc = { ent-FloorTileItemDark.desc }
+ent-FloorTileItemDarkPavementVertical = dark steel vertical pavement
+    .desc = { ent-FloorTileItemDark.desc }
+ent-FloorTileItemDarkOffset = offset dark steel tile
+    .desc = { ent-FloorTileItemDark.desc }
+ent-FloorTileItemSteel = steel tile
     .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemSteelOffset = offset steel tile
+    .desc = { ent-FloorTileItemSteel.desc }
+ent-FloorTileItemSteelDiagonalMini = steel diagonal mini tile
+    .desc = { ent-FloorTileItemSteel.desc }
+ent-FloorTileItemSteelDiagonal = steel diagonal tile
+    .desc = { ent-FloorTileItemSteel.desc }
+ent-FloorTileItemSteelHerringbone = steel herringbone
+    .desc = { ent-FloorTileItemSteel.desc }
+ent-FloorTileItemSteelMini = steel mini tile
+    .desc = { ent-FloorTileItemSteel.desc }
+ent-FloorTileItemSteelMono = steel mono tile
+    .desc = { ent-FloorTileItemSteel.desc }
+ent-FloorTileItemSteelPavement = steel pavement
+    .desc = { ent-FloorTileItemSteel.desc }
+ent-FloorTileItemSteelPavementVertical = steel vertical pavement
+    .desc = { ent-FloorTileItemSteel.desc }
 ent-FloorTileItemWhite = white tile
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemDark = dark tile
+ent-FloorTileItemWhiteOffset = offset white steel tile
+    .desc = { ent-FloorTileItemWhite.desc }
+ent-FloorTileItemWhiteDiagonalMini = white steel diagonal mini tile
+    .desc = { ent-FloorTileItemWhite.desc }
+ent-FloorTileItemWhiteDiagonal = white steel diagonal tile
+    .desc = { ent-FloorTileItemWhite.desc }
+ent-FloorTileItemWhiteHerringbone = white steel herringbone
+    .desc = { ent-FloorTileItemWhite.desc }
+ent-FloorTileItemWhiteMini = white steel mini tile
+    .desc = { ent-FloorTileItemWhite.desc }
+ent-FloorTileItemWhiteMono = white steel mono tile
+    .desc = { ent-FloorTileItemWhite.desc }
+ent-FloorTileItemWhitePavement = white steel pavement
+    .desc = { ent-FloorTileItemWhite.desc }
+ent-FloorTileItemWhitePavementVertical = white steel vertical pavement
+    .desc = { ent-FloorTileItemWhite.desc }
+ent-FloorTileItemMetalDiamond = steel tile
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWood = wood floor
     .desc = { ent-FloorTileItemBase.desc }
 ent-FloorTileItemTechmaint = techmaint floor
     .desc = { ent-FloorTileItemBase.desc }
@@ -58,10 +106,22 @@ ent-FloorTileItemLaundry = laundry tile
     .desc = { ent-FloorTileItemBase.desc }
 ent-FloorTileItemConcrete = concrete tile
     .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemConcreteMono = concrete mono tile
+    .desc = { ent-FloorTileItemConcrete.desc }
+ent-FloorTileItemConcreteSmooth = concrete smooth
+    .desc = { ent-FloorTileItemConcrete.desc }
 ent-FloorTileItemGrayConcrete = gray concrete tile
     .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemGrayConcreteMono = gray concrete mono tile
+    .desc = { ent-FloorTileItemGrayConcrete.desc }
+ent-FloorTileItemGrayConcreteSmooth = gray concrete smooth
+    .desc = { ent-FloorTileItemGrayConcrete.desc }
 ent-FloorTileItemOldConcrete = old concrete tile
     .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemOldConcreteMono = old concrete mono tile
+    .desc = { ent-FloorTileItemOldConcrete.desc }
+ent-FloorTileItemOldConcreteSmooth = old concrete smooth
+    .desc = { ent-FloorTileItemOldConcrete.desc }
 ent-FloorTileItemArcadeBlue = blue arcade floor
     .desc = { ent-FloorTileItemBase.desc }
 ent-FloorTileItemArcadeBlue2 = blue arcade floor
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl
index 1cf9147ad36..f55d06c11f1 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl
@@ -30,6 +30,8 @@ ent-PotatoSeeds = packet of potato seeds
     .desc = { ent-SeedBase.desc }
 ent-SugarcaneSeeds = packet of sugarcane seeds
     .desc = { ent-SeedBase.desc }
+ent-PapercaneSeeds = packet of papercane seeds
+    .desc = { ent-SeedBase.desc }
 ent-TowercapSeeds = packet of tower cap spores
     .desc = { ent-SeedBase.desc }
 ent-SteelcapSeeds = packet of steel cap spores
@@ -46,6 +48,8 @@ ent-EggplantSeeds = packet of eggplant seeds
     .desc = { ent-SeedBase.desc }
 ent-AppleSeeds = packet of apple seeds
     .desc = { ent-SeedBase.desc }
+ent-GoldenAppleSeeds = packet of golden apple seeds
+    .desc = { ent-SeedBase.desc }
 ent-CornSeeds = packet of corn seeds
     .desc = { ent-SeedBase.desc }
 ent-ChanterelleSeeds = packet of chanterelle spores
@@ -80,6 +84,8 @@ ent-AmbrosiaDeusSeeds = packet of ambrosia deus seeds
     .desc = A medicinal plant for the gods themselves.
 ent-GalaxythistleSeeds = packet of galaxythistle seeds
     .desc = Brushes of starry nights.
+ent-GlasstleSeeds = packet of glasstle seeds
+    .desc = Scars of gloomy nights.
 ent-FlyAmanitaSeeds = packet of fly amanita spores
     .desc = The iconic, extremely deadly mushroom to be used for purely ornamental purposes.
 ent-GatfruitSeeds = packet of gatfruit seeds
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/kitchen/foodcarts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/kitchen/foodcarts.ftl
index 52a78d57613..17890cd9a83 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/kitchen/foodcarts.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/kitchen/foodcarts.ftl
@@ -1,4 +1,4 @@
-ent-FoodCartBase = Food Cart
+ent-FoodCartBase = food cart
     .desc = A cart for food.
 ent-FoodCartHot = hot food cart
     .desc = Get out there and slang some dogs.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/gas_tanks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/gas_tanks.ftl
index eab846759ad..9fcd19d4792 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/gas_tanks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/gas_tanks.ftl
@@ -3,26 +3,26 @@ ent-GasTankBase = { ent-BaseItem }
 ent-GasTankRoundBase = { ent-GasTankBase }
     .desc = { ent-GasTankBase.desc }
 ent-OxygenTank = oxygen tank
-    .desc = A standard cylindrical gas tank for oxygen.
+    .desc = A standard cylindrical gas tank for oxygen. It can hold 5 L of gas.
 ent-NitrogenTank = nitrogen tank
-    .desc = A standard cylindrical gas tank for nitrogen.
+    .desc = A standard cylindrical gas tank for nitrogen. It can hold 5 L of gas.
 ent-EmergencyOxygenTank = emergency oxygen tank
-    .desc = An easily portable tank for emergencies. Contains very little oxygen, rated for survival use only.
+    .desc = An easily portable tank for emergencies. Contains very little oxygen, rated for survival use only. It can hold 0.66 L of gas.
 ent-EmergencyNitrogenTank = emergency nitrogen tank
-    .desc = An easily portable tank for emergencies. Contains very little nitrogen, rated for survival use only.
+    .desc = An easily portable tank for emergencies. Contains very little nitrogen, rated for survival use only. It can hold 0.66 L of gas.
 ent-ExtendedEmergencyOxygenTank = extended-capacity emergency oxygen tank
-    .desc = An emergency tank with extended capacity. Technically rated for prolonged use.
+    .desc = An emergency tank with extended capacity. Technically rated for prolonged use. It can hold 1.5 L of gas.
 ent-ExtendedEmergencyNitrogenTank = extended-capacity emergency nitrogen tank
-    .desc = An emergency tank with extended capacity. Technically rated for prolonged use.
+    .desc = An emergency tank with extended capacity. Technically rated for prolonged use. It can hold 1.5 L of gas.
 ent-DoubleEmergencyOxygenTank = double emergency oxygen tank
-    .desc = A high-grade dual-tank emergency life support container. It holds a decent amount of oxygen for it's small size.
+    .desc = A high-grade dual-tank emergency life support container. It holds a decent amount of oxygen for it's small size. It can hold 2.5 L of gas.
 ent-DoubleEmergencyNitrogenTank = double emergency nitrogen tank
-    .desc = A high-grade dual-tank emergency life support container. It holds a decent amount of nitrogen for its small size.
+    .desc = A high-grade dual-tank emergency life support container. It holds a decent amount of nitrogen for its small size. It can hold 2.5 L of gas.
 ent-EmergencyFunnyOxygenTank = funny emergency oxygen tank
-    .desc = An easily portable tank for emergencies. Contains very little oxygen with an extra of funny gas, rated for survival use only.
+    .desc = An easily portable tank for emergencies. Contains very little oxygen with an extra of funny gas, rated for survival use only. It can hold 0.66 L of gas.
 ent-AirTank = air tank
-    .desc = Mixed anyone?
+    .desc = Mixed anyone? It can hold 5 L of gas.
 ent-NitrousOxideTank = nitrous oxide tank
-    .desc = Contains a mixture of air and nitrous oxide. Make sure you don't refill it with pure N2O.
+    .desc = Contains a mixture of air and nitrous oxide. Make sure you don't refill it with pure N2O. It can hold 5 L of gas.
 ent-PlasmaTank = plasma tank
-    .desc = Contains dangerous plasma. Do not inhale. Extremely flammable.
+    .desc = Contains dangerous plasma. Do not inhale. Extremely flammable. It can hold 5 L of gas.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/jetpacks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/jetpacks.ftl
index 6aef938783e..08a15f721e6 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/jetpacks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/jetpacks.ftl
@@ -1,7 +1,7 @@
 ent-JetpackEffect = { "" }
     .desc = { "" }
-ent-BaseJetpack = Jetpack
-    .desc = It's a jetpack.
+ent-BaseJetpack = jetpack
+    .desc = It's a jetpack. It can hold 5 L of gas.
 ent-ActionToggleJetpack = Toggle jetpack
     .desc = Toggles the jetpack, giving you movement outside the station.
 ent-JetpackBlue = jetpack
@@ -23,8 +23,8 @@ ent-JetpackCaptainFilled = captain's jetpack
     .suffix = Filled
     .desc = { ent-JetpackCaptain.desc }
 ent-JetpackMini = mini jetpack
+    .desc = It's a jetpack. It can hold 1.5 L of gas.
     .suffix = Empty
-    .desc = { ent-BaseJetpack.desc }
 ent-JetpackMiniFilled = mini jetpack
     .suffix = Filled
     .desc = { ent-JetpackMini.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/grenade.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/grenade.ftl
index b8e0a127c16..b0d6fb42c69 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/grenade.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/grenade.ftl
@@ -1,6 +1,6 @@
-ent-PelletClusterRubber = pellet (ball, Rubber)
+ent-PelletClusterRubber = pellet (ball, rubber)
     .desc = { ent-BaseBullet.desc }
-ent-PelletClusterLethal = pellet (ball, Lethal)
+ent-PelletClusterLethal = pellet (ball, lethal)
     .desc = { ent-BaseBullet.desc }
 ent-PelletClusterIncendiary = pellet (ball, incendiary)
     .desc = { ent-BaseBulletIncendiary.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/magic.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/magic.ftl
index 655b5662ab6..0d44bb604dd 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/magic.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/magic.ftl
@@ -18,7 +18,7 @@ ent-BulletInstakillMagic = magical lead cylinder
     .desc = This looks familiar.
 ent-ProjectilePolyboltCluwne = cluwne polybolt
     .desc = knoH KnoH!
-ent-ProjectileIcicle = Icicle
+ent-ProjectileIcicle = icicle
     .desc = Brrrrr.
 ent-ProjectilePolyboltBread = bread polybolt
     .desc = Nooo, I don't wanna be bread!
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl
index 607cc1a518b..8927803c389 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl
@@ -8,8 +8,8 @@ ent-WeaponRevolverMateba = Mateba
     .desc = The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo.
 ent-WeaponRevolverPython = Python
     .desc = A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo.
-ent-WeaponRevolverPythonAP = Python
-    .desc = A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo.
+ent-WeaponRevolverPythonAP = { ent-WeaponRevolverPython }
     .suffix = armor-piercing
+    .desc = { ent-WeaponRevolverPython.desc }
 ent-WeaponRevolverPirate = pirate revolver
     .desc = An odd, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl
index 7d258f4fd8e..c4dab3484cd 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl
@@ -12,3 +12,6 @@ ent-EnergyCutlass = energy cutlass
     .desc = An exotic energy weapon.
 ent-EnergySwordDouble = double-bladed energy sword
     .desc = Syndicate Command Interns thought that having one blade on the energy sword was not enough. This can be stored in pockets.
+ent-CyborgEnergySwordDouble = { ent-EnergySwordDouble }
+    .desc = Syndicate Command Interns thought that having one blade on the energy sword was not enough. Specially designed for syndicate cyborgs.
+    .suffix = One-Handed, For Borgs
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/clusterbang.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/clusterbang.ftl
index c636824940e..7750b622f2c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/clusterbang.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/clusterbang.ftl
@@ -1,6 +1,6 @@
 ent-ClusterBang = clusterbang
     .desc = Can be used only with flashbangs. Explodes several times.
-ent-ClusterBangFull = ClusterBang
+ent-ClusterBangFull = clusterbang
     .desc = Launches three flashbangs after the timer runs out.
     .suffix = Full
 ent-ClusterGrenade = clustergrenade
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/grenades.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/grenades.ftl
index 1728d49c93b..2174175d21e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/grenades.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/grenades.ftl
@@ -8,7 +8,7 @@ ent-GrenadeFlashEffect = { "" }
     .desc = { "" }
 ent-SyndieMiniBomb = syndicate minibomb
     .desc = A syndicate-manufactured explosive used to stow destruction and cause chaos.
-ent-SelfDestructSeq = Self Destruct
+ent-SelfDestructSeq = self destruct
     .desc = Go out on your own terms!
 ent-SupermatterGrenade = supermatter grenade
     .desc = Grenade that simulates delamination of the supermatter engine, pulling things in a heap and exploding after some time.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl
index 32688b7b8b0..f076dd0bae3 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl
@@ -4,11 +4,11 @@ ent-WindoorAssemblySecure = secure windoor assembly
     .desc = It opens, it closes, and you can see through it! This one looks tough.
 ent-WindoorAssemblyClockwork = clockwork windoor assembly
     .desc = It opens, it closes, and you can see through it! This one looks tough.
-ent-WindoorAssemblyPlasma = Plasma windoor assembly
+ent-WindoorAssemblyPlasma = plasma windoor assembly
     .desc = It opens, it closes, and you can see through it! This one looks purp-, no, pink. Wait...
-ent-WindoorAssemblySecurePlasma = Secure Plasma windoor assembly
+ent-WindoorAssemblySecurePlasma = secure plasma windoor assembly
     .desc = It opens, it closes, and you can see through it! This one looks strong and pin-, no, purple. Hold on...
-ent-WindoorAssemblyUranium = Uranium windoor assembly
+ent-WindoorAssemblyUranium = uranium windoor assembly
     .desc = It opens, it closes, and you can see through it! This one looks sickly green...
-ent-WindoorAssemblySecureUranium = Secure Uranium windoor assembly
+ent-WindoorAssemblySecureUranium = secure uranium windoor assembly
     .desc = It opens, it closes, and you can see through it! This one looks strong and radioactive-lime-green!
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl
index a16f26c8acb..0279e945710 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl
@@ -1,16 +1,16 @@
-ent-Windoor = Windoor
+ent-Windoor = windoor
     .desc = It's a window and a sliding door. Wow!
-ent-WindoorSecure = Secure Windoor
+ent-WindoorSecure = secure windoor
     .desc = It's a sturdy window and a sliding door. Wow!
 ent-WindoorClockwork = clockwork windoor
     .desc = It's a sturdy window and a sliding door. Wow!
-ent-WindoorPlasma = Plasma Windoor
+ent-WindoorPlasma = plasma windoor
     .desc = It's a pink window *and* a sliding door. Amazing!
-ent-WindoorSecurePlasma = Secure Plasma Windoor
+ent-WindoorSecurePlasma = secure plasma windoor
     .desc = It's a sturdy purple window *and* a sliding door. Spectacular!
-ent-WindoorUranium = Uranium Windoor
+ent-WindoorUranium = uranium windoor
     .desc = It's a window and a sliding door. Huh? Oh, and it's green!
-ent-WindoorSecureUranium = Secure Uranium Windoor
+ent-WindoorSecureUranium = secure uranium windoor
     .desc = It's a sturdy window and a sliding door. It's so neon green, it might even taste like limes!
 ent-WindoorBarLocked = { ent-Windoor }
     .suffix = Bar, Locked
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/memorial.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/memorial.ftl
index f477b6615b5..36a6f940d5c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/memorial.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/memorial.ftl
@@ -1,6 +1,6 @@
 ent-Memorial = memorial
     .desc = Commemorating something.
-ent-SS13Memorial = Tomb of the Unknown Employee
+ent-SS13Memorial = tomb of the unknown employee
     .desc =
         Here rests an unknown employee
         Unknown by name or rank
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/gates.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/gates.ftl
index 9d6c35846ed..5c19a39caeb 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/gates.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/gates.ftl
@@ -1,7 +1,23 @@
 ent-BaseLogicItem = { ent-BaseItem }
     .desc = { ent-BaseItem.desc }
-ent-LogicGate = logic gate
+ent-LogicGateOr = logic gate
     .desc = A logic gate with two inputs and one output. Technicians can change its mode of operation using a screwdriver.
+    .suffix = Or
+ent-LogicGateAnd = { ent-LogicGateOr }
+    .suffix = And
+    .desc = { ent-LogicGateOr.desc }
+ent-LogicGateXor = { ent-LogicGateOr }
+    .suffix = Xor
+    .desc = { ent-LogicGateOr.desc }
+ent-LogicGateNor = { ent-LogicGateOr }
+    .suffix = Nor
+    .desc = { ent-LogicGateOr.desc }
+ent-LogicGateNand = { ent-LogicGateOr }
+    .suffix = Nand
+    .desc = { ent-LogicGateOr.desc }
+ent-LogicGateXnor = { ent-LogicGateOr }
+    .suffix = Xnor
+    .desc = { ent-LogicGateOr.desc }
 ent-EdgeDetector = edge detector
     .desc = Splits rising and falling edges into unique pulses and detects how edgy you are.
 ent-PowerSensor = power sensor
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/xeno.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/xeno.ftl
index 4fda86c7202..02df8743c89 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/xeno.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/xeno.ftl
@@ -1,4 +1,4 @@
-ent-XenoWardingTower = Xeno warding tower
+ent-XenoWardingTower = xeno warding tower
     .desc = { "" }
 ent-CarpStatue = carp statue
     .desc = A statue of one of the brave carp that got us where we are today. Made with real teeth!
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/shelfs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/shelfs.ftl
new file mode 100644
index 00000000000..1d91d3b4474
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/shelfs.ftl
@@ -0,0 +1,25 @@
+ent-ShelfBase = shelf
+    .desc = a strange place to place, well, anything really. You feel like you shouldn't be seeing this.'
+ent-ShelfBaseReinforced = reinforced shelf
+    .desc = It looks as strong as reality itself.
+ent-ShelfWood = wooden shelf
+    .desc = A convenient place to place, well, anything really.
+ent-ShelfMetal = metal shelf
+    .desc = A sturdy place to place, well, anything really.
+ent-ShelfGlass = glass shelf
+    .desc = A fragile place to place, well, anything really.
+ent-ShelfRWood = sturdy wood shelf
+    .desc = A safe place to put your favorite bottle of whiskey
+ent-ShelfRMetal = sturdy metal shelf
+    .desc = A strong & shiny place to keep all your vials safe
+ent-ShelfRGlass = sturdy glass shelf
+    .desc = Crystal clear reinforced glass doors to show off all your fancy bottles you definitely didn't sell a co-worker's favorite mothroach for.
+ent-ShelfBar = bar shelf
+    .desc = Made out of the finest synthetic wood for all alcohol holding needs.
+ent-ShelfKitchen = cooking shelf
+    .desc = Holds knifes, spice, and everything nice!
+ent-ShelfChemistry = chemical shelf
+    .desc = Keeps all your chemicals safe and out of the clow- er, public hands!
+ent-ShelfChemistryChemistrySecure = { ent-ShelfChemistry }
+    .suffix = Chemistry, Secure
+    .desc = { ent-ShelfChemistry.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/metamap.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/metamap.ftl
index 3908f2f1652..269eff7a62b 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/metamap.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/metamap.ftl
@@ -1,2 +1,2 @@
-ent-PosterMapMetaRight = Meta Station Map
+ent-PosterMapMetaRight = Meta Station map
     .desc = A map of Meta Station. This looks really old.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl
index 35c14a88174..f118af446b2 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl
@@ -142,7 +142,7 @@ ent-SignMorgue = morgue sign
     .desc = A sign indicating the morgue.
 ent-SignNews = news sign
     .desc = A sign indicating where the Reporter works.
-ent-SignNosmoking = nosmoking sign
+ent-SignNosmoking = no smoking sign
     .desc = A sign indicating that smoking is not allowed in the vicinity.
 ent-SignPrison = prison sign
     .desc = A sign indicating the prison.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl
index 03f3313a783..415d025325c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl
@@ -81,7 +81,7 @@ ent-WallVaultRock = rock vault wall
     .desc = { ent-WallVaultAlien.desc }
 ent-WallVaultSandstone = sandstone vault wall
     .desc = { ent-WallVaultAlien.desc }
-ent-WallInvisible = Invisible Wall
+ent-WallInvisible = invisible wall
     .desc = { "" }
 ent-WallForce = force wall
     .desc = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/virtual/stripping_hidden.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/virtual/stripping_hidden.ftl
index d0fbad3be3f..aa9f99269c5 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/virtual/stripping_hidden.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/virtual/stripping_hidden.ftl
@@ -1,2 +1,2 @@
-ent-StrippingHiddenEntity = Hidden Entity
+ent-StrippingHiddenEntity = hidden entity
     .desc = There is something in this pocket.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/chunk.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/chunk.ftl
index 0658ff7c8b4..04379c88a05 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/chunk.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/chunk.ftl
@@ -1,4 +1,4 @@
-ent-WorldChunk = World Chunk
+ent-WorldChunk = world chunk
     .desc =
         It's rude to stare.
         It's also a bit odd you're looking at the abstract representation of the grid of reality.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/asteroids.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/asteroids.ftl
index 220c81bb004..0d4df4ba402 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/asteroids.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/asteroids.ftl
@@ -1,18 +1,18 @@
-ent-BaseAsteroidDebris = Asteroid Debris
+ent-BaseAsteroidDebris = asteroid debris
     .desc = { ent-BaseDebris.desc }
-ent-AsteroidDebrisSmall = Asteroid Debris Small
+ent-AsteroidDebrisSmall = asteroid debris small
     .desc = { ent-BaseAsteroidDebris.desc }
-ent-AsteroidDebrisMedium = Asteroid Debris Medium
+ent-AsteroidDebrisMedium = asteroid debris medium
     .desc = { ent-BaseAsteroidDebris.desc }
-ent-AsteroidDebrisLarge = Asteroid Debris Large
+ent-AsteroidDebrisLarge = asteroid debris large
     .desc = { ent-BaseAsteroidDebris.desc }
-ent-AsteroidDebrisLarger = Asteroid Debris Larger
+ent-AsteroidDebrisLarger = asteroid debris larger
     .desc = { ent-BaseAsteroidDebris.desc }
-ent-AsteroidSalvageSmall = Salvage Asteroid Small
+ent-AsteroidSalvageSmall = salvage asteroid small
     .desc = { ent-BaseAsteroidDebris.desc }
-ent-AsteroidSalvageMedium = Salvage Asteroid Medium
+ent-AsteroidSalvageMedium = salvage asteroid medium
     .desc = { ent-BaseAsteroidDebris.desc }
-ent-AsteroidSalvageLarge = Salvage Asteroid Large
+ent-AsteroidSalvageLarge = salvage asteroid large
     .desc = { ent-BaseAsteroidDebris.desc }
-ent-AsteroidSalvageHuge = Salvage Asteroid Huge
+ent-AsteroidSalvageHuge = salvage asteroid huge
     .desc = { ent-BaseAsteroidDebris.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/wrecks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/wrecks.ftl
index 3350a6cf87b..3a03e73b5fa 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/wrecks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/wrecks.ftl
@@ -1,8 +1,8 @@
-ent-BaseScrapDebris = Scrap Debris
+ent-BaseScrapDebris = scrap debris
     .desc = { ent-BaseDebris.desc }
-ent-ScrapDebrisSmall = Scrap Debris Small
+ent-ScrapDebrisSmall = scrap debris small
     .desc = { ent-BaseScrapDebris.desc }
-ent-ScrapDebrisMedium = Scrap Debris Medium
+ent-ScrapDebrisMedium = scrap debris medium
     .desc = { ent-BaseScrapDebris.desc }
-ent-ScrapDebrisLarge = Scrap Debris Large
+ent-ScrapDebrisLarge = scrap debris large
     .desc = { ent-BaseScrapDebris.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/magic/forcewall_spells.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/magic/forcewall_spells.ftl
index 64e7a225011..c92d650f225 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/magic/forcewall_spells.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/magic/forcewall_spells.ftl
@@ -1,2 +1,2 @@
-ent-ActionForceWall = Forcewall
+ent-ActionForceWall = forcewall
     .desc = Creates a magical barrier.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl
index 676094d0e52..405db525133 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl
@@ -1,2 +1,2 @@
-ent-SalvageShuttleMarker = Salvage shuttle marker
+ent-SalvageShuttleMarker = salvage shuttle marker
     .desc = { ent-FTLPoint.desc }
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 07edd8f0075..47eb6716193 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -245,7 +245,7 @@ uplink-super-surplus-bundle-desc = Contains 125 telecrystals worth of completely
 
 # Tools
 uplink-toolbox-name = Toolbox
-uplink-toolbox-desc = A full compliment of tools for the mechanically inclined traitor. Includes a pair of insulated combat gloves, syndicate gas mask and a utility belt.
+uplink-toolbox-desc = A full compliment of tools for the mechanically inclined traitor. Includes a pair of insulated combat gloves and a syndicate gas mask as well.
 
 uplink-syndicate-jaws-of-life-name = Jaws Of Life
 uplink-syndicate-jaws-of-life-desc = A combined prying and cutting tool. Useful for entering the station or its departments.
diff --git a/Resources/Locale/en-US/thief/backpack.ftl b/Resources/Locale/en-US/thief/backpack.ftl
index 0911bc042b6..6a69ab8bc6f 100644
--- a/Resources/Locale/en-US/thief/backpack.ftl
+++ b/Resources/Locale/en-US/thief/backpack.ftl
@@ -18,7 +18,8 @@ thief-backpack-button-deselect = Select [X]
 thief-backpack-category-chameleon-name = chameleon kit
 thief-backpack-category-chameleon-description =
     You are everyone and no one; you are a master of disguise.
-    Includes: Set of chameleon clothing, a chameleon projector.
+    Includes: A full set of chameleon clothing,
+    a chameleon projector, and an Agent ID.
     Disguise as anyone and anything.
 
 thief-backpack-category-tools-name = breacher kit
@@ -38,8 +39,8 @@ thief-backpack-category-syndie-name = syndie kit
 thief-backpack-category-syndie-description =
     Trinkets from a disavowed past, or stolen from a careless agent?
     You've made some connections. Whiskey, echo...
-    Includes: Agent ID card, Emag, syndicate pAI, Interdyne cigs,
-    and some strange red crystals.
+    Includes: An Emag, Interdyne cigs, a Syndicate codeword,
+    a Radio Jammer, a lighter and some strange red crystals.
 
 thief-backpack-category-sleeper-name = sleeper kit
 thief-backpack-category-sleeper-description =
diff --git a/Resources/Locale/en-US/traitor/traitor-codes-component.ftl b/Resources/Locale/en-US/traitor/traitor-codes-component.ftl
new file mode 100644
index 00000000000..35246037f6a
--- /dev/null
+++ b/Resources/Locale/en-US/traitor/traitor-codes-component.ftl
@@ -0,0 +1,3 @@
+traitor-codes-message-singular = syndicate codeword:
+traitor-codes-message-plural = syndicate codewords:
+traitor-codes-none = no known codewords
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 6dd834e8a1b..d9f09cc68aa 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -5,7 +5,7 @@ trait-poor-vision-name = Short-sighted
 trait-poor-vision-desc = Your eyes are not what they once were, you have difficulty seeing things far away without corrective glasses.
 
 trait-narcolepsy-name = Narcolepsy
-trait-narcolepsy-desc = You fall asleep randomly
+trait-narcolepsy-desc = You fall asleep randomly.
 
 trait-pacifist-name = Pacifist
 trait-pacifist-desc = You cannot attack or hurt any living beings.
@@ -13,13 +13,13 @@ trait-pacifist-desc = You cannot attack or hurt any living beings.
 permanent-blindness-trait-examined = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are glassy and unfocused. It doesn't seem like {SUBJECT($target)} can see you well, if at all.[/color]
 
 trait-lightweight-name = Lightweight drunk
-trait-lightweight-desc = Alcohol has a stronger effect on you
+trait-lightweight-desc = Alcohol has a stronger effect on you.
 
 trait-muted-name = Muted
-trait-muted-desc = You can't speak
+trait-muted-desc = You can't speak.
 
 trait-paracusia-name = Paracusia
-trait-paracusia-desc = You hear sounds that aren't really there
+trait-paracusia-desc = You hear sounds that aren't really there.
 
 trait-unrevivable-name = Unrevivable
 trait-unrevivable-desc = You are unable to be revived by defibrillators.
@@ -31,10 +31,10 @@ trait-accentless-name = Accentless
 trait-accentless-desc = You don't have the accent that your species would usually have
 
 trait-frontal-lisp-name = Frontal lisp
-trait-frontal-lisp-desc = You thpeak with a lithp
+trait-frontal-lisp-desc = You thpeak with a lithp.
 
-trait-socialanxiety-name = Social anxiety
-trait-socialanxiety-desc = You are anxious when you speak and stutter.
+trait-socialanxiety-name = Stutter
+trait-socialanxiety-desc = You speak with a stutter.
 
 trait-southern-name = Southern drawl
 trait-southern-desc = You have a different way of speakin'.
diff --git a/Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl b/Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl
index 8d6bc086bc5..4c4301c458f 100644
--- a/Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl
+++ b/Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl
@@ -2,3 +2,4 @@ department-Law-description = Защищяйте, судите или накаж
 department-CentralCommand-description = Большие шишки.
 department-PlanetPrison-description = Не дайте нарушителям закона сбежать.
 department-Silicon-description = Раскажите всем о своих законах.
+department-Blueshield-description = Ваша задача дефать самоубийц на главах. Довольно бесполезно...
diff --git a/Resources/Locale/ru-RU/actions/actions/polymorph.ftl b/Resources/Locale/ru-RU/actions/actions/polymorph.ftl
new file mode 100644
index 00000000000..00ede96dcbb
--- /dev/null
+++ b/Resources/Locale/ru-RU/actions/actions/polymorph.ftl
@@ -0,0 +1 @@
+gera-transformation-popup = Это действие трансформирует вас. Для подтверждения выполните его ещё раз.
diff --git a/Resources/Locale/ru-RU/administration/admin-verbs.ftl b/Resources/Locale/ru-RU/administration/admin-verbs.ftl
index 6ecbbb4cc57..86994815c69 100644
--- a/Resources/Locale/ru-RU/administration/admin-verbs.ftl
+++ b/Resources/Locale/ru-RU/administration/admin-verbs.ftl
@@ -15,3 +15,4 @@ admin-verbs-erase-description =
     Игроки увидят всплывающее окно, указывающее им играть как будто исчезнувшего никогда не существовало.
 toolshed-verb-mark = Отметить
 toolshed-verb-mark-description = Помещает данную сущность в переменную $marked, заменяя её предыдущее значение.
+export-entity-verb-get-data-text = Экспорт спрайта
diff --git a/Resources/Locale/ru-RU/administration/bwoink.ftl b/Resources/Locale/ru-RU/administration/bwoink.ftl
index 81ce332ba9a..2dc06ddda0e 100644
--- a/Resources/Locale/ru-RU/administration/bwoink.ftl
+++ b/Resources/Locale/ru-RU/administration/bwoink.ftl
@@ -9,3 +9,6 @@ bwoink-system-typing-indicator =
 admin-bwoink-play-sound = Бвоинк?
 bwoink-title-none-selected = Ничего не выбрано
 bwoink-system-rate-limited = Система: вы отправляете сообщения слишком быстро.
+bwoink-system-player-disconnecting = отключился.
+bwoink-system-player-reconnecting = переподключился.
+bwoink-system-player-banned = был забанен за: { $banReason }
diff --git a/Resources/Locale/ru-RU/bloodstream/bloodstream.ftl b/Resources/Locale/ru-RU/bloodstream/bloodstream.ftl
index cd8f442bde9..af184c63d46 100644
--- a/Resources/Locale/ru-RU/bloodstream/bloodstream.ftl
+++ b/Resources/Locale/ru-RU/bloodstream/bloodstream.ftl
@@ -1,5 +1,4 @@
-bloodstream-component-looks-pale = [color=bisque]{CAPITALIZE(SUBJECT($target))} {CONJUGATE-BASIC($target, "выглядят", "выглядит")} бледно.[/color]
-bloodstream-component-bleeding = [color=red]{CAPITALIZE(SUBJECT($target))} {CONJUGATE-BASIC($target, "истекают", "истекает")} кровью.[/color]
-bloodstream-component-profusely-bleeding = [color=crimson]{CAPITALIZE(SUBJECT($target))} обильно {CONJUGATE-BASIC($target, "истекают", "истекает")} кровью![/color]
-
+bloodstream-component-looks-pale = [color=bisque]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-BASIC($target, "выглядят", "выглядит") } бледно.[/color]
+bloodstream-component-bleeding = [color=red]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-BASIC($target, "истекают", "истекает") } кровью.[/color]
+bloodstream-component-profusely-bleeding = [color=crimson]{ CAPITALIZE(SUBJECT($target)) } обильно { CONJUGATE-BASIC($target, "истекают", "истекает") } кровью![/color]
 bloodstream-component-wounds-cauterized = С болью вы ощущаете, как ваши раны прижигаются!
diff --git a/Resources/Locale/ru-RU/cargo/bounties.ftl b/Resources/Locale/ru-RU/cargo/bounties.ftl
index 0c9cba3eeaf..86c1c6ecfbf 100644
--- a/Resources/Locale/ru-RU/cargo/bounties.ftl
+++ b/Resources/Locale/ru-RU/cargo/bounties.ftl
@@ -65,6 +65,7 @@ bounty-item-cardboard-box = Картонная коробка
 bounty-item-wine = Бутылка вина
 bounty-item-cotton-boll = Хлопковый шарик
 bounty-item-microwave-machine-board = Машинная плата микроволновки
+bounty-item-flash = Вспышка
 bounty-description-artifact = Nanotrasen находится в затруднительном положении из-за кражи артефактов с некосмических планет. Верните один, и мы выплатим за него компенсацию.
 bounty-description-baseball-bat = В Центкоме началась бейсбольная лихорадка! Будьте добры отправить им несколько бейсбольных бит, чтобы руководство могло исполнить свою детскую мечту.
 bounty-description-box-hugs = Несколько главных чиновников получили серьёзные ушибы. Для их выздоровления срочно требуется коробка обнимашек
@@ -131,3 +132,4 @@ bounty-description-cotton-boll = Огромный рой таракамолей
 bounty-description-microwave-machine-board = Мистер Хихстер решил, что будет забавно позасовывать металлические вилки во все кухонные микроволновки. Помогите нам отремонтировать их, пока повара не принялись готовить клоунбургеры.
 bounty-description-lasergun = Караван утилизаторов запрашивает большую партию лазерного оружия для уничтожения улья ксеноморфов.
 bounty-description-food = После нашествия крысиного короля соседняя станция унатхов осталась без еды. Необходима большая партия мясных блюд.
+bounty-description-flashes = ПРИВЕТСТВИЕ \[Станция] НАМ НЕОБХОДИМЫ 6 ВСПЫШЕК ДЛЯ ОБЫЧНЫХ \[ТренировкаУпражнение] С СОТРУДНИКАМИ СЛУЖБЫ БЕЗОПАСНОСТИ. ВСЁ \[Нормально].
diff --git a/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl b/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl
index 8f10a9e8482..e651472214b 100644
--- a/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl
+++ b/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl
@@ -30,7 +30,7 @@ cargo-console-snip-snip = Заказ урезан до вместимости
 cargo-console-insufficient-funds = Недостаточно средств (требуется { $cost })
 cargo-console-unfulfilled = Нет места для выполнения заказа
 cargo-console-trade-station = Отправить на { $destination }
-cargo-console-unlock-approved-order-broadcast = [bold]Заказ на { $productName } x{ $orderAmount }[/bold], стоимостью [bold]{ $cost }[/bold], был одобрен [bold]{ $approverName }, { $approverJob }[/bold]
+cargo-console-unlock-approved-order-broadcast = [bold]Заказ на { $productName } x{ $orderAmount }[/bold], стоимостью [bold]{ $cost }[/bold], был одобрен [bold]{ $approver }[/bold]
 cargo-console-paper-print-name = Заказ #{ $orderNumber }
 cargo-console-paper-print-text =
     Заказ #{ $orderNumber }
diff --git a/Resources/Locale/ru-RU/character-appearance/components/magic-mirror-component.ftl b/Resources/Locale/ru-RU/character-appearance/components/magic-mirror-component.ftl
index 2d7f74afe7b..9b756c15576 100644
--- a/Resources/Locale/ru-RU/character-appearance/components/magic-mirror-component.ftl
+++ b/Resources/Locale/ru-RU/character-appearance/components/magic-mirror-component.ftl
@@ -1,2 +1,12 @@
 magic-mirror-component-activate-user-has-no-hair = У вас не может быть волос!
 magic-mirror-window-title = Волшебное зеркало
+magic-mirror-add-slot-self = Вы добавляете себе волосы.
+magic-mirror-remove-slot-self = Вы удаляете часть волос.
+magic-mirror-change-slot-self = Вы меняете свою причёску.
+magic-mirror-change-color-self = Вы меняете свой цвет волос.
+magic-mirror-add-slot-target = { $user } добавляет вам волос.
+magic-mirror-remove-slot-target = { $user } удаляет часть ваших волос.
+magic-mirror-change-slot-target = { $user } меняет вашу причёску.
+magic-mirror-change-color-target = { $user } меняет цвет ваших волос.
+magic-mirror-blocked-by-hat-self = Прежде чем менять причёску, вам необходимо снять шляпу.
+magic-mirror-blocked-by-hat-self-target = Вы пытаетесь изменить причёску, но одежда цели вам мешает.
diff --git a/Resources/Locale/ru-RU/character-info/components/character-info-component.ftl b/Resources/Locale/ru-RU/character-info/components/character-info-component.ftl
index dc5f8d6c19a..2ce99632871 100644
--- a/Resources/Locale/ru-RU/character-info/components/character-info-component.ftl
+++ b/Resources/Locale/ru-RU/character-info/components/character-info-component.ftl
@@ -1,4 +1,4 @@
 character-info-title = Персонаж
 character-info-roles-antagonist-text = Роли антагонистов
 character-info-objectives-label = Цели
-character-info-no-profession = Нет профессии
+character-info-no-profession = Нет должности
diff --git a/Resources/Locale/ru-RU/chemistry/components/solution-transfer-component.ftl b/Resources/Locale/ru-RU/chemistry/components/solution-transfer-component.ftl
index 36ffc602199..efa053437d6 100644
--- a/Resources/Locale/ru-RU/chemistry/components/solution-transfer-component.ftl
+++ b/Resources/Locale/ru-RU/chemistry/components/solution-transfer-component.ftl
@@ -18,3 +18,5 @@ comp-solution-transfer-verb-toggle = Переключить на { $amount } е
 ## Displayed after you successfully change a solution's amount using the BUI
 
 comp-solution-transfer-set-amount = Перемещаемое количество установлено на { $amount } ед.
+comp-solution-transfer-set-amount-max = Макс.: { $amount } ед.
+comp-solution-transfer-set-amount-min = Мин.: { $amount } ед.
diff --git a/Resources/Locale/ru-RU/examine/examine-system.ftl b/Resources/Locale/ru-RU/examine/examine-system.ftl
index 40d5249272e..86e10ceadc8 100644
--- a/Resources/Locale/ru-RU/examine/examine-system.ftl
+++ b/Resources/Locale/ru-RU/examine/examine-system.ftl
@@ -3,5 +3,5 @@
 examine-system-entity-does-not-exist = Этой сущности не существует
 examine-system-cant-see-entity = Вам не удаётся это рассмотреть.
 examine-verb-name = Осмотреть
-examinable-anchored = Это [color=darkgreen]закреплено[/color] на полу
-examinable-unanchored = Это [color=darkred]не закреплено[/color] на полу
+examinable-anchored = Это [color=darkgreen]закреплено[/color] на полу.
+examinable-unanchored = Это [color=darkred]не закреплено[/color] на полу.
diff --git a/Resources/Locale/ru-RU/game-ticking/game-presets/preset-revolutionary.ftl b/Resources/Locale/ru-RU/game-ticking/game-presets/preset-revolutionary.ftl
index 216c9b0c376..14e00b4667d 100644
--- a/Resources/Locale/ru-RU/game-ticking/game-presets/preset-revolutionary.ftl
+++ b/Resources/Locale/ru-RU/game-ticking/game-presets/preset-revolutionary.ftl
@@ -17,7 +17,7 @@ head-rev-break-mindshield = Щит разума был уничтожен!
 
 roles-antag-rev-name = Революционер
 roles-antag-rev-objective = Ваша задача - защищать и выполнять приказы глав революции, а также избавиться от всего командного состава станции.
-rev-break-control = { $name } { $gender ->
+rev-break-control = { $name } { GENDER($name) ->
         [male] вспомнил, кому он верен
         [female] вспомнила, кому она верна
         [epicene] вспомнили, кому они верни
@@ -46,10 +46,12 @@ rev-lost = Члены командного состава станции выж
 rev-stalemate = Главы революции и командный состав станции погибли. Это ничья.
 rev-headrev-name-user = [color=#5e9cff]{ $name }[/color] ([color=gray]{ $username }[/color]) конвертировал { $count } { $count ->
         [one] члена
+        [few] члена
        *[other] членов
     } экипажа
 rev-headrev-name = [color=#5e9cff]{ $name }[/color] конвертировал { $count } { $count ->
         [one] члена
+        [few] члена
        *[other] членов
     } экипажа
 rev-reverse-stalemate = Главы революции и командный состав станции выжили.
diff --git a/Resources/Locale/ru-RU/game-ticking/game-ticker.ftl b/Resources/Locale/ru-RU/game-ticking/game-ticker.ftl
index 48e8762400b..8ed2f3af6dc 100644
--- a/Resources/Locale/ru-RU/game-ticking/game-ticker.ftl
+++ b/Resources/Locale/ru-RU/game-ticking/game-ticker.ftl
@@ -40,5 +40,7 @@ latejoin-arrival-announcement =
 latejoin-arrival-sender = Станции
 latejoin-arrivals-direction = Вскоре прибудет шаттл, который доставит вас на станцию.
 latejoin-arrivals-direction-time = Шаттл, который доставит вас на станцию, прибудет через { $time }.
+latejoin-arrivals-dumped-from-shuttle = Таинственная сила не позволяет вам улететь на шаттле прибытия.
+latejoin-arrivals-teleport-to-spawn = Таинственная сила телепортирует вас с шаттла прибытия. Удачной смены!
 preset-not-enough-ready-players = Не удалось запустить пресет { $presetName }. Требуется { $minimumPlayers } игроков, но готовы только { $readyPlayersCount }.
 preset-no-one-ready = Не удалось запустить режим { $presetName }. Нет готовых игроков.
diff --git a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl
index a8e378ec308..62e585f5d4e 100644
--- a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl
@@ -146,6 +146,15 @@ ghost-role-information-space-ninja-description = Используйте хитр
 ghost-role-information-syndicate-reinforcement-name = Агент Синдиката
 ghost-role-information-syndicate-reinforcement-description = Кому-то нужно подкрепление. Вы первый, кого Синдикат смог найти и послать на помощь.
 ghost-role-information-syndicate-reinforcement-rules = Вы [color=red][bold]Командный антагонист[/bold][/color], в команде с агентом, который вас призвал.
+ghost-role-information-syndicate-reinforcement-medic-name = Медик Синдиката
+ghost-role-information-syndicate-reinforcement-medic-description = Кому-то нужно подкрепление. Ваша задача - сохранить жизнь вызвавшему вас агенту.
+ghost-role-information-syndicate-reinforcement-spy-name = Шпион Синдиката
+ghost-role-information-syndicate-reinforcement-spy-description = Кому-то нужно подкрепление. Ваша специализация - шпионаж, постарайтесь не быть обнаруженными.
+ghost-role-information-syndicate-reinforcement-thief-name = Вор Синдиката
+ghost-role-information-syndicate-reinforcement-thief-description = Кому-то нужно подкрепление. Ваша задача - проникнуть и забрать что-то ценное для своего агента.
+ghost-role-information-nukeop-reinforcement-name = Ядерный оперативник
+ghost-role-information-nukeop-reinforcement-description = Ядерному оперативнику нужно подкрепление. Вы, резервный агент, поможете им.
+ghost-role-information-nukeop-reinforcement-rules = Вы [color=red][bold]Командный антагонист[/bold][/color], в команде с ядерным оперативником, который вас призвал.
 ghost-role-information-syndicate-monkey-reinforcement-name = Агент Синдиката-обезьяна
 ghost-role-information-syndicate-monkey-reinforcement-description = Кому-то нужно подкрепление. Вы, специально обученная обезьяна, поможете им.
 ghost-role-information-syndicate-monkey-reinforcement-rules = Вы [color=red][bold]Командный антагонист[/bold][/color], в команде с агентом, который вас призвал.
diff --git a/Resources/Locale/ru-RU/health-examinable/health-examinable-carbon.ftl b/Resources/Locale/ru-RU/health-examinable/health-examinable-carbon.ftl
index 527d6cb3ab2..581615693e8 100644
--- a/Resources/Locale/ru-RU/health-examinable/health-examinable-carbon.ftl
+++ b/Resources/Locale/ru-RU/health-examinable/health-examinable-carbon.ftl
@@ -1,26 +1,19 @@
 health-examinable-carbon-none = Видимые повреждения тела отсутствуют.
-
 health-examinable-carbon-Blunt-25 = [color=red]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } небольшие ушибы на теле.[/color]
 health-examinable-carbon-Blunt-50 = [color=crimson]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } серьёзные ушибы на теле![/color]
 health-examinable-carbon-Blunt-75 = [color=crimson]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } сильные ушибы по всему телу![/color]
-
 health-examinable-carbon-Slash-10 = [color=red]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } несколько лёгких порезов.[/color]
 health-examinable-carbon-Slash-25 = [color=red]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } серьёзные порезы на теле.[/color]
 health-examinable-carbon-Slash-50 = [color=crimson]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } множество сильных порезов![/color]
 health-examinable-carbon-Slash-75 = [color=crimson]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } множество глубоких порезов на теле![/color]
-
 health-examinable-carbon-Piercing-50 = [color=crimson]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } проникающие ранения на теле![/color]
-
 health-examinable-carbon-Heat-25 = [color=orange]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } лёгкие ожоги на теле.[/color]
 health-examinable-carbon-Heat-50 = [color=orange]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } сильные ожоги на теле.[/color]
 health-examinable-carbon-Heat-75 = [color=orange]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } ожоги третьей степени на теле![/color]
-
 health-examinable-carbon-Shock-50 = [color=lightgoldenrodyellow]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } следы поражения током по всему телу![/color]
-
 health-examinable-carbon-Cold-25 = [color=lightblue]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } лёгкие обморожения на теле.[/color]
 health-examinable-carbon-Cold-50 = [color=lightblue]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } сильные обморожения на теле.[/color]
 health-examinable-carbon-Cold-75 = [color=lightblue]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } обморожения третьей степени на теле![/color]
-
 health-examinable-carbon-Caustic-25 = [color=yellowgreen]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } лёгкие химические ожоги.[/color]
 health-examinable-carbon-Caustic-50 = [color=yellowgreen]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } химические ожоги на теле.[/color]
 health-examinable-carbon-Caustic-75 = [color=yellowgreen]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } сильные химические ожоги по всей поверхности тела![/color]
diff --git a/Resources/Locale/ru-RU/health-examinable/health-examinable-silicon.ftl b/Resources/Locale/ru-RU/health-examinable/health-examinable-silicon.ftl
index f21b28f2005..4fb19eef3f2 100644
--- a/Resources/Locale/ru-RU/health-examinable/health-examinable-silicon.ftl
+++ b/Resources/Locale/ru-RU/health-examinable/health-examinable-silicon.ftl
@@ -1,18 +1,13 @@
 health-examinable-silicon-none = Видимые повреждения корпуса отсутствуют.
-
 health-examinable-silicon-Blunt-25 = [color=red]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } небольшие вмятины на шасси.[/color]
 health-examinable-silicon-Blunt-50 = [color=crimson]{ CAPITALIZE(POSS-ADJ($target)) } шасси имеет серьёзные вмятины![/color]
 health-examinable-silicon-Blunt-75 = [color=crimson]{ CAPITALIZE(POSS-ADJ($target)) } шасси почти разваливается![/color]
-
 health-examinable-silicon-Slash-10 = [color=red]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } несколько царапин.[/color]
 health-examinable-silicon-Slash-25 = [color=red]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } серьёзные царапины![/color]
 health-examinable-silicon-Slash-50 = [color=crimson]{ CAPITALIZE(POSS-ADJ($target)) } покрытие шасси усыпано глубокими цапапинами![/color]
 health-examinable-silicon-Slash-75 = [color=crimson]{ CAPITALIZE(POSS-ADJ($target)) } шасси полностю разодрано![/color]
-
 health-examinable-silicon-Piercing-50 = [color=crimson]{ CAPITALIZE(POSS-ADJ($target)) } шасси усеяно глубокими отверстиями![/color]
-
 health-examinable-silicon-Heat-25 = [color=orange]{ CAPITALIZE(POSS-ADJ($target)) } шасси слегка закоптилось.[/color]
 health-examinable-silicon-Heat-50 = [color=orange]{ CAPITALIZE(POSS-ADJ($target)) } шасси немного оплавилось.[/color]
 health-examinable-silicon-Heat-75 = [color=orange]{ CAPITALIZE(POSS-ADJ($target)) } шасси частично расплавилось![/color]
-
 health-examinable-silicon-Shock-50 = [color=lightgoldenrodyellow]{ CAPITALIZE(POSS-ADJ($target)) } микросхемы, похоже, неплохо поджарились![/color]
diff --git a/Resources/Locale/ru-RU/lathe/recipes.ftl b/Resources/Locale/ru-RU/lathe/recipes.ftl
new file mode 100644
index 00000000000..efd13329ed0
--- /dev/null
+++ b/Resources/Locale/ru-RU/lathe/recipes.ftl
@@ -0,0 +1,8 @@
+lathe-recipe-Medkit-name = аптечка первой помощи (пусто)
+lathe-recipe-MedkitBurn-name = набор для лечения физических травм (пусто)
+lathe-recipe-MedkitToxin-name = набор для лечения токсинов (пусто)
+lathe-recipe-MedkitO2-name = набор для лечения кислородного голодания (пусто)
+lathe-recipe-MedkitBrute-name = набор для лечения механических травм (пусто)
+lathe-recipe-MedkitAdvanced-name = продвинутая аптечка первой помощи (пусто)
+lathe-recipe-MedkitRadiation-name = набор для выведения радиации (пусто)
+lathe-recipe-MedkitCombat-name = боевая аптечка (пусто)
diff --git a/Resources/Locale/ru-RU/lathe/ui/lathe-menu.ftl b/Resources/Locale/ru-RU/lathe/ui/lathe-menu.ftl
index e9547c0b047..cd9d3cc7b04 100644
--- a/Resources/Locale/ru-RU/lathe/ui/lathe-menu.ftl
+++ b/Resources/Locale/ru-RU/lathe/ui/lathe-menu.ftl
@@ -6,6 +6,9 @@ lathe-menu-search-designs = Поиск проектов
 lathe-menu-category-all = Всё
 lathe-menu-search-filter = Фильтр
 lathe-menu-amount = Кол-во:
+lathe-menu-reagent-slot-examine = Сбоку имеется отверстие для мензурки.
+lathe-reagent-dispense-no-container = Жидкость выливается из { $name } на пол!
+lathe-menu-result-reagent-display = { $reagent } ({ $amount }ед.)
 lathe-menu-material-display = { $material } { $amount }
 lathe-menu-tooltip-display = { $amount } { $material }
 lathe-menu-description-display = [italic]{ $description }[/italic]
diff --git a/Resources/Locale/ru-RU/lock/locking-whitelist-component.ftl b/Resources/Locale/ru-RU/lock/locking-whitelist-component.ftl
new file mode 100644
index 00000000000..e02e1c16fb3
--- /dev/null
+++ b/Resources/Locale/ru-RU/lock/locking-whitelist-component.ftl
@@ -0,0 +1 @@
+locking-whitelist-component-lock-toggle-deny = Вы не можете переключить замок.
diff --git a/Resources/Locale/ru-RU/mass-media/news-ui.ftl b/Resources/Locale/ru-RU/mass-media/news-ui.ftl
index 3e86a3f4f42..b94b4540527 100644
--- a/Resources/Locale/ru-RU/mass-media/news-ui.ftl
+++ b/Resources/Locale/ru-RU/mass-media/news-ui.ftl
@@ -39,4 +39,4 @@ news-write-ui-richtext-tooltip =
     { "[bullet/]color" }
     { "[bullet/]bullet[/color]" }
 news-pda-notification-header = Новая новостная статья
-news-publish-admin-announcement = { $actor } опубликовал(а) новостную статью { $title } за авторством { $author }"
+news-publish-admin-announcement = { $actor } опубликовал(а) новостную статью { $title } за авторством { $author }
diff --git a/Resources/Locale/ru-RU/paper/envelope.ftl b/Resources/Locale/ru-RU/paper/envelope.ftl
new file mode 100644
index 00000000000..f5f9f266e25
--- /dev/null
+++ b/Resources/Locale/ru-RU/paper/envelope.ftl
@@ -0,0 +1,9 @@
+envelope-verb-seal = Запечатать
+envelope-verb-tear = Вскрыть
+envelope-letter-slot = Письмо
+envelope-sealed-examine = [color=gray]{ CAPITALIZE($envelope) } запечатан[/color]
+envelope-torn-examine = [color=yellow]{ CAPITALIZE($envelope) } порван и непригоден для использования![/color]
+envelope-default-message =
+    ОТ: 
+    
+    КОМУ:
diff --git a/Resources/Locale/ru-RU/particle-accelerator/components/ui/particle-accelerator-control-menu.ftl b/Resources/Locale/ru-RU/particle-accelerator/components/ui/particle-accelerator-control-menu.ftl
index df5b925e496..750eb91749e 100644
--- a/Resources/Locale/ru-RU/particle-accelerator/components/ui/particle-accelerator-control-menu.ftl
+++ b/Resources/Locale/ru-RU/particle-accelerator/components/ui/particle-accelerator-control-menu.ftl
@@ -9,13 +9,13 @@ particle-accelerator-control-menu-alarm-control-2 = [bold][color=red]СБОЙ О
 particle-accelerator-control-menu-scan-parts-button = Сканировать части
 particle-accelerator-control-menu-check-containment-field-warning = Убедитесь, что сдерживающее поле активно!
 particle-accelerator-control-menu-foo-bar-baz = FOO-BAR-BAZ
+particle-accelerator-control-menu-status-label = [bold]Статус:[/bold]
 particle-accelerator-control-menu-status-unknown = [font="Monospace"][color=red]Нет данных[/color][/bold]
-particle-accelerator-control-menu-status-label = Статус: { $status }
-particle-accelerator-control-menu-status-operational = Работает
-particle-accelerator-control-menu-status-incomplete = Не завершено
+particle-accelerator-control-menu-status-operational = [font="Monospace"][color=green]Работоспособно[/color][/bold]
+particle-accelerator-control-menu-status-incomplete = [font="Monospace"][color=red]Не завершено[/color][/bold]
+particle-accelerator-control-menu-draw = [bold]Мощность:[/bold]
 particle-accelerator-control-menu-draw-value = [font="Monospace"]{ $watts }/{ $lastReceive }[/font]
-particle-accelerator-control-menu-draw-not-available = Мощность: Н/Д
+particle-accelerator-control-menu-draw-not-available = [font="Monospace"][color=gray]Н/Д[/color][/font]
 particle-accelerator-radio-message-on = Питание УЧ было включено.
 particle-accelerator-radio-message-off = Питание УЧ было выключено.
 particle-accelerator-radio-message-num = Мощность УЧ установлена на уровень { $level }.
-particle-accelerator-control-menu-draw = Мощность: { $watts }/{ $lastReceive }
diff --git a/Resources/Locale/ru-RU/power/components/charger.ftl b/Resources/Locale/ru-RU/power/components/charger.ftl
index eaff900edbc..182607356e1 100644
--- a/Resources/Locale/ru-RU/power/components/charger.ftl
+++ b/Resources/Locale/ru-RU/power/components/charger.ftl
@@ -1,2 +1,4 @@
 charger-examine = Заряжает [color={ $color }]{ $chargeRate }Вт[/color] в секунду.
 charger-component-charge-rate = скорость зарядки
+charger-content = Текущий заряд: [color=#5E7C16]{ $chargePercentage }[/color]%.
+charger-empty = В зарядном устройстве ничего нет.
diff --git a/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl
index 89c2f0373c6..77f2f665a1e 100644
--- a/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl
@@ -18,6 +18,8 @@ humanoid-profile-editor-pronouns-epicene-text = Они / Их
 humanoid-profile-editor-pronouns-neuter-text = Оно / Его
 humanoid-profile-editor-import-button = Импорт
 humanoid-profile-editor-export-button = Экспорт
+humanoid-profile-editor-export-image-button = Экспорт изображения
+humanoid-profile-editor-open-image-button = Открыть изображения
 humanoid-profile-editor-save-button = Сохранить
 humanoid-profile-editor-reset-button = Сбросить
 humanoid-profile-editor-spawn-priority-label = Приоритет спавна:
@@ -52,3 +54,4 @@ humanoid-profile-editor-no-traits = Нет доступных черт
 humanoid-profile-editor-trait-count-hint = Доступно очков: [{ $current }/{ $max }]
 trait-category-disabilities = Ограничения
 trait-category-speech = Черты речи
+trait-category-quirks = Причуды
diff --git a/Resources/Locale/ru-RU/procedural/expeditions.ftl b/Resources/Locale/ru-RU/procedural/expeditions.ftl
index 4205731365c..2506ec2cde7 100644
--- a/Resources/Locale/ru-RU/procedural/expeditions.ftl
+++ b/Resources/Locale/ru-RU/procedural/expeditions.ftl
@@ -40,3 +40,29 @@ salvage-expedition-announcement-countdown-seconds =
 salvage-expedition-reward-description = Награда за завершение миссии
 salvage-expedition-announcement-dungeon = Подземелье расположено от вас на { $direction }.
 salvage-expedition-completed = Экспедиция окончена.
+# Salvage biome mod
+salvage-biome-mod-caves = Пещеры
+salvage-biome-mod-grasslands = Луга
+salvage-biome-mod-snow = Снега
+salvage-biome-mod-lava = Лава
+# Salvage mods
+salvage-light-mod-daylight = День
+salvage-light-mod-evening = Вечер
+salvage-light-mod-night = Ночь
+salvage-temperature-mod-room-temperature = Комнатная температура
+salvage-temperature-mod-hot = Жара
+salvage-temperature-mod-high-temperature = Высокая температура
+salvage-temperature-mod-extreme-heat = Экстремальная жара
+salvage-temperature-mod-cold = Холод
+salvage-temperature-mod-low-temperature = Низкая температура
+salvage-temperature-mod-extreme-cold = Экстремальный холод
+salvage-air-mod-no-atmosphere = Отсутствие атмосферы
+salvage-air-mod-breathable-atmosphere = Пригодная атмосфера
+salvage-air-mod-dangerous-atmosphere = Опасная атмосфера
+salvage-air-mod-toxic-atmosphere = Токсичная атмосфера
+salvage-air-mod-volatile-atmosphere = Изменчивая атмосфера
+salvage-dungeon-mod-lava-brig = Лавовый бриг
+salvage-dungeon-mod-snowy-labs = Снежная лаборатория
+salvage-dungeon-mod-experiment = Эксперимент
+salvage-dungeon-mod-haunted = Призраки
+salvage-dungeon-mod-mineshaft = Шахта
diff --git a/Resources/Locale/ru-RU/procedural/salvage-faction.ftl b/Resources/Locale/ru-RU/procedural/salvage-faction.ftl
new file mode 100644
index 00000000000..550e99a9729
--- /dev/null
+++ b/Resources/Locale/ru-RU/procedural/salvage-faction.ftl
@@ -0,0 +1,2 @@
+salvage-faction-xenos = Ксено
+salvage-faction-carps = Карпы
diff --git a/Resources/Locale/ru-RU/reagents/meta/pyrotechnic.ftl b/Resources/Locale/ru-RU/reagents/meta/pyrotechnic.ftl
index 5a4aa1a5985..2106f0ab833 100644
--- a/Resources/Locale/ru-RU/reagents/meta/pyrotechnic.ftl
+++ b/Resources/Locale/ru-RU/reagents/meta/pyrotechnic.ftl
@@ -4,8 +4,8 @@ reagent-name-napalm = напалм
 reagent-desc-napalm = Немножко огнеопасен.
 reagent-name-phlogiston = флогистон
 reagent-desc-phlogiston = Подожжёт и заставит вас гореть.
-reagent-name-chlorine-trifluoride = CLF3
-reagent-desc-chlorine-trifluoride = Он же трифторид хлора. Вы очень, ОЧЕНЬ не хотите, чтобы эта дрянь оказалась рядом с вами.
+reagent-name-chlorine-trifluoride = трифторид хлора
+reagent-desc-chlorine-trifluoride = Вы очень, ОЧЕНЬ не хотите, чтобы эта дрянь оказалась рядом с вами.
 reagent-name-foaming-agent = пенообразующий агент
 reagent-desc-foaming-agent = Делает пену, подобную той, что требуется для гранат с металлической пеной.
 reagent-name-welding-fuel = сварочное топливо
diff --git a/Resources/Locale/ru-RU/seeds/seeds.ftl b/Resources/Locale/ru-RU/seeds/seeds.ftl
index d18d9fa1a78..c363fe194c1 100644
--- a/Resources/Locale/ru-RU/seeds/seeds.ftl
+++ b/Resources/Locale/ru-RU/seeds/seeds.ftl
@@ -30,6 +30,8 @@ seeds-potato-name = картофель
 seeds-potato-display-name = картофель
 seeds-sugarcane-name = сахарный тростник
 seeds-sugarcane-display-name = сахарный тростник
+seeds-papercane-name = бумажный тростник
+seeds-papercane-display-name = бумажный тростник
 seeds-towercap-name = грибошляпник
 seeds-towercap-display-name = грибошляпник
 seeds-steelcap-name = сталешляпник
@@ -46,6 +48,8 @@ seeds-eggplant-name = баклажан
 seeds-eggplant-display-name = баклажан
 seeds-apple-name = яблоко
 seeds-apple-display-name = яблоня
+seeds-goldenapple-name = золотое яблоко
+seeds-goldenapple-display-name = золотая яблоня
 seeds-corn-name = кукуруза
 seeds-corn-display-name = початок кукурузы
 seeds-onion-name = лук
@@ -86,6 +90,8 @@ seeds-ambrosiadeus-name = амброзия деус
 seeds-ambrosiadeus-display-name = амброзия деус
 seeds-galaxythistle-name = галакточертополох
 seeds-galaxythistle-display-name = галакточертополох
+seeds-glasstle-name = стеклополох
+seeds-glasstle-display-name = стеклополох
 seeds-flyamanita-name = мухоморы
 seeds-flyamanita-display-name = мухоморы
 seeds-gatfruit-name = гатфрукт
diff --git a/Resources/Locale/ru-RU/speech/speech-chatsan.ftl b/Resources/Locale/ru-RU/speech/speech-chatsan.ftl
index a8951de976b..2cbe7cfbfbd 100644
--- a/Resources/Locale/ru-RU/speech/speech-chatsan.ftl
+++ b/Resources/Locale/ru-RU/speech/speech-chatsan.ftl
@@ -81,3 +81,23 @@ chatsan-word-43 = ig
 chatsan-replacement-43 = i guess
 chatsan-word-44 = tbf
 chatsan-replacement-44 = to be fair
+chatsan-word-45 = tysm
+chatsan-replacement-45 = thank you so much
+chatsan-word-46 = tyvm
+chatsan-replacement-46 = thank you very much
+chatsan-word-47 = cya
+chatsan-replacement-47 = see ya
+chatsan-word-48 = rn
+chatsan-replacement-48 = right now
+chatsan-word-49 = atm
+chatsan-replacement-49 = at the moment
+chatsan-word-50 = istg
+chatsan-replacement-50 = I swear to god
+chatsan-word-51 = rq
+chatsan-replacement-51 = real quick
+chatsan-word-52 = dw
+chatsan-replacement-52 = don't worry
+chatsan-word-53 = wru
+chatsan-replacement-53 = where are you
+chatsan-word-54 = fs
+chatsan-replacement-54 = for sure
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl
index f6f0f1d90a7..235de06e0c5 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl
@@ -58,3 +58,5 @@ ent-BoxCandleSmall = коробка маленьких свечей
     .desc = { ent-BoxCardboard.desc }
 ent-BoxDarts = коробка дротиков
     .desc = Коробка, наполненная разноцветными дротиками.
+ent-BoxEnvelope = коробка конвертов
+    .desc = Коробка, наполненная конвертами.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/permaescape.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/permaescape.ftl
new file mode 100644
index 00000000000..faf48d38e66
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/permaescape.ftl
@@ -0,0 +1,32 @@
+ent-CratePermaEscapeSpawner = Perma Escape Crate Spawner
+    .desc = { ent-CrateEmptySpawner.desc }
+ent-CratePermaEscapeDigging = { ent-CrateGenericSteel }
+    .suffix = Копание
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeEVA = { ent-CrateGenericSteel }
+    .suffix = EVA
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeGun = { ent-CrateGenericSteel }
+    .suffix = Огнестрел
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeBureaucracy = { ent-CrateGenericSteel }
+    .suffix = Написание
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeLights = { ent-CrateGenericSteel }
+    .suffix = Химсвет
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeMats = { ent-CrateGenericSteel }
+    .suffix = Материалы
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeGiftsFromSyndicate = { ent-CrateGenericSteel }
+    .suffix = Подарки Синдиката
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeMerc = { ent-CrateGenericSteel }
+    .suffix = Наёмническое
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeComs = { ent-CrateGenericSteel }
+    .suffix = Коммуникация
+    .desc = { ent-CrateGenericSteel.desc }
+ent-CratePermaEscapeTowercap = { ent-CrateGenericSteel }
+    .suffix = Грибошляпник
+    .desc = { ent-CrateGenericSteel.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/service.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/service.ftl
index d6bebd61e95..b3754d21a3a 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/service.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/service.ftl
@@ -31,5 +31,7 @@ ent-CrateJanitorBiosuit = ящик биозащитных костюмов уб
 ent-CrateTrashCartFilled = { ent-CrateTrashCart }
     .suffix = Заполнен
     .desc = { ent-CrateTrashCart.desc }
+ent-CrateCandles = ящик свечей
+    .desc = Содержит 4 коробки свечей, 2 больших и 2 маленьких. Для создания атмосферы или ещё чего-нибудь.
 ent-CrateJanitorExplosive = { ent-ClosetJanitorBomb }
     .desc = { ent-ClosetJanitorBomb.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/misc.ftl
index 2dc2a1e9f7e..3e7f37f897f 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/misc.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/misc.ftl
@@ -4,3 +4,6 @@ ent-ClothingShoesBootsCombatFilled = { ent-ClothingShoesBootsCombat }
 ent-ClothingShoesBootsMercFilled = { ent-ClothingShoesBootsMerc }
     .suffix = Заполненный
     .desc = { ent-ClothingShoesBootsMerc.desc }
+ent-ClothingShoesBootsSyndieFilled = { ent-ClothingShoesBootsCombat }
+    .suffix = Заполненный, Метательный нож
+    .desc = { ent-ClothingShoesBootsCombat.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/misc.ftl
index 293cf825e97..42987ea0c13 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/misc.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/misc.ftl
@@ -26,8 +26,8 @@ ent-ClothingHeadHatCatEars = кошачьи ушки
     .desc = НЯ!
     .suffix = НЕ МАППИТЬ!
 ent-ClothingHeadHatCatEarsValid = { ent-ClothingHeadHatCatEars }
-  .suffix = Valid, НЕ МАППИТЬ!
-  .desc = { ent-ClothingHeadHatCatEars.desc }
+    .suffix = Valid, НЕ МАППИТЬ!
+    .desc = { ent-ClothingHeadHatCatEars.desc }
 ent-ActionBecomeValid = Become Valid
     .desc = *замечает ваш знак смерти* owo whats this
 ent-ClothingHeadHatDogEars = собачьи ушки
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/masks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/masks.ftl
index eba7e2e194d..8084c5845ba 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/masks.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/masks.ftl
@@ -24,6 +24,8 @@ ent-ClothingMaskClown = { ent-ClothingMaskClownBase }
     .desc = { ent-ClothingMaskClownBase.desc }
 ent-ClothingMaskClownBanana = банановые маска и парик клоуна
     .desc = { ent-ClothingMaskClown.desc }
+ent-ClothingMaskClownSecurity = маска и парик клоуна безопасности
+    .desc = Спорно оксюморонные защитная маска и парик.
 ent-ClothingMaskJoy = маска радости
     .desc = Выразите свою радость или спрячьте свою печаль с помощью этой хохочущей до слёз маски.
 ent-ClothingMaskMime = маска мима
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/magboots.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/magboots.ftl
index 1cba1671bff..bf7c19dc710 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/magboots.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/magboots.ftl
@@ -7,6 +7,6 @@ ent-ClothingShoesBootsMagSci = { ent-ClothingShoesBootsMag }
 ent-ClothingShoesBootsMagBlinding = магнитные сапоги ослепляющей скорости
     .desc = Они будут отлично смотреться на ловкаче вроде вас.
 ent-ClothingShoesBootsMagSyndie = кроваво-красные магнитные сапоги
-    .desc = Созданные по технологии реверс-инжиниринга магнитные ботинки с встроенными ускорителями.
+    .desc = Созданные по технологии реверс-инжиниринга магнитные ботинки с встроенными ускорителями. Вмещает 0,75 Л газа.
 ent-ActionToggleMagboots = Переключить магнитные ботинки
     .desc = Включает или выключает магнитные ботинки.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/foldable.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/foldable.ftl
index 01143b541c2..468f6b1ef36 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/foldable.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/foldable.ftl
@@ -1,2 +1,4 @@
 ent-BaseFoldable = складной
     .desc = { "" }
+ent-BaseDeployFoldable = deploy foldable
+    .desc = { ent-BaseFoldable.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/temp.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/temp.ftl
new file mode 100644
index 00000000000..0fddc4a73ca
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/temp.ftl
@@ -0,0 +1,2 @@
+ent-TemporaryEntityForTimedDespawnSpawners = { "" }
+    .desc = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/human.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/human.ftl
index 15dc5928ff9..2c752342b63 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/human.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/human.ftl
@@ -1,11 +1,17 @@
 ent-MobHuman = Урист МакЧеловек
     .desc = { ent-BaseMobHuman.desc }
-ent-MobHumanSyndicateAgentBase = Агент Синдиката
+ent-MobHumanSyndicateAgentBase = агент Синдиката
     .suffix = Человек, Базовый
     .desc = { ent-MobHuman.desc }
-ent-MobHumanSyndicateAgent = Агент Синдиката
+ent-MobHumanSyndicateAgent = агент Синдиката
     .suffix = Человек, Предатель
     .desc = { ent-MobHumanSyndicateAgentBase.desc }
+ent-MobHumanSyndicateAgentMedic = медик Синдиката
+    .desc = { ent-MobHumanSyndicateAgent.desc }
+ent-MobHumanSyndicateAgentSpy = шпион Синдиката
+    .desc = { ent-MobHumanSyndicateAgent.desc }
+ent-MobHumanSyndicateAgentThief = вор Синдиката
+    .desc = { ent-MobHumanSyndicateAgent.desc }
 ent-MobHumanSyndicateAgentNukeops = { ent-MobHumanSyndicateAgentBase }
     .suffix = Человек, Ядерный оперативник
     .desc = { ent-MobHumanSyndicateAgentBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl
index 1bc3a90a389..c1c5730ce45 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl
@@ -40,3 +40,7 @@ ent-FoodPizzaArnoldSlice = кусок пиццы Арнольда
     .desc = Я приду и, может быть, угощу тебя пиццей, а может быть, отломаю тебе руку.
 ent-FoodPizzaMoldySlice = кусок заплесневелой пиццы
     .desc = Когда-то это был отличный кусок пиццы, но теперь он лежит здесь, прогорклый и пронизанный спорами.
+ent-FoodPizzaUranium = острокаменная пицца
+    .desc = Острая пицца с перчиками и ураном.
+ent-FoodPizzaUraniumSlice = ломтик острокаменной пиццы
+    .desc = Светящийся кусочек острокаменной пиццы.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl
index 4748cd023d1..ce0ba45bdf4 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl
@@ -8,6 +8,8 @@ ent-OatBushel = сноп овса
     .desc = Ешьте овсянку, делайте зарядку.
 ent-Sugarcane = сахарный тростник
     .desc = Болезненно-сладкий.
+ent-Papercane = бумажный тростник
+    .desc = Зачем мы вообще выращиваем бумагу?
 ent-FoodLaughinPeaPod = стручок смешного горошка
     .desc = Любимое растение клоуна.
 ent-Log = бревно
@@ -58,6 +60,8 @@ ent-FoodEggplant = баклажан
     .desc = Может, внутри сидит баклан?
 ent-FoodApple = яблоко
     .desc = Это маленький кусочек Эдема.
+ent-FoodGoldenApple = золотое яблоко
+    .desc = Разве оно не должно быть в форме куба?
 ent-FoodCocoaPod = стручок какао-боба
     .desc = Шоколада много не бывает!
 ent-FoodCorn = початок кукурузы
@@ -96,6 +100,8 @@ ent-FoodAmbrosiaDeus = амброзия деус
     .desc = Лекарственное растение, пользующееся огромным спросом. Может оказывать побочные эффекты.
 ent-FoodGalaxythistle = галакточертополох
     .desc = Лекарственное растение, используемое для получения антитоксина.
+ent-FoodGlasstle = стеклополох
+    .desc = Хрупкое кристаллическое растение с множеством острых шипов.
 ent-FoodFlyAmanita = мухомор
     .desc = Аппетитно выглядящий гриб, как в мультфильмах.
 ent-FoodGatfruit = гатфрукт
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/base_handheld.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/base_handheld.ftl
index 69c4dc5e28d..a90fc2e3436 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/base_handheld.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/base_handheld.ftl
@@ -1,2 +1,2 @@
 ent-BaseHandheldComputer = { ent-BaseItem }
-  .desc = { ent-BaseItem.desc }
+    .desc = { ent-BaseItem.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
index 388622ab78a..20e7c9ebeaf 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
@@ -164,3 +164,5 @@ ent-JukeboxCircuitBoard = музыкальный автомат (машинна
     .desc = Печатная плата для музыкального автомата.
 ent-ReagentGrinderIndustrialMachineCircuitboard = промышленный измельчитель реагентов (машинная плата)
     .desc = { ent-BaseMachineCircuitboard.desc }
+ent-CutterMachineCircuitboard = плиткорез (машинная плата)
+    .desc = { ent-BaseMachineCircuitboard.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl
index 5a0f8cb9ddf..e07f9b2ee37 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl
@@ -1,3 +1,5 @@
+ent-ReinforcementRadio = радио подкрепления Синдиката
+    .desc = Призовите на помощь агента Синдиката сомнительного качества, мгновенно! Предоставляется только базовое снаряжение.
 ent-ReinforcementRadioSyndicate = радио подкрепления синдиката
     .desc = Призовите на помощь агента Синдиката сомнительного качества, мгновенно! Предоставляется только базовое снаряжение.
 ent-ReinforcementRadioSyndicateNukeops = { ent-ReinforcementRadioSyndicate }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl
index 09703ad2e83..dd2e80253a2 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl
@@ -67,3 +67,5 @@ ent-BoxFolderCentComClipboard = планшет Центком
     .desc = Роскошный планшет, обитый зелёным бархатом. Представители Центком часто носят его с собой, но редко используют.
 ent-BoxFolderQmClipboard = цифровой планшет заявок
     .desc = Громоздкий цифровой планшет, содержащий информацию о поставках и финансовых операциях. При таком количестве компрометирующих документов его следует беречь.
+ent-Envelope = конверт
+    .desc = Небольшой конверт для защиты от посторонних глаз ваших конфиденциальных документов.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/tiles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/tiles.ftl
index 2db38a71bff..3535fe79872 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/tiles.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/tiles.ftl
@@ -6,10 +6,58 @@ ent-FloorTileItemSteelCheckerDark = тёмная стальная плитка 
     .desc = { ent-FloorTileItemSteel.desc }
 ent-FloorTileItemSteelCheckerLight = светлая стальная плитка шашечками
     .desc = { ent-FloorTileItemSteel.desc }
+ent-FloorTileItemDarkDiagonalMini = тёмная стальная диагональная мини плитка
+    .desc = { ent-FloorTileItemDark.desc }
+ent-FloorTileItemDarkDiagonal = тёмная стальная диагональная плитка
+    .desc = { ent-FloorTileItemDark.desc }
+ent-FloorTileItemDarkHerringbone = тёмная стальная плитка ёлочкой
+    .desc = { ent-FloorTileItemDark.desc }
+ent-FloorTileItemDarkMini = тёмная стальная мини плитка
+    .desc = { ent-FloorTileItemDark.desc }
+ent-FloorTileItemDarkMono = тёмная стальная моно плита
+    .desc = { ent-FloorTileItemDark.desc }
+ent-FloorTileItemDarkPavement = тёмная стальная тротуарная плитка
+    .desc = { ent-FloorTileItemDark.desc }
+ent-FloorTileItemDarkPavementVertical = тёмная стальная вертикальная тротуарная плитка
+    .desc = { ent-FloorTileItemDark.desc }
+ent-FloorTileItemDarkOffset = тёмная смещёная стальная плитка
+    .desc = { ent-FloorTileItemDark.desc }
 ent-FloorTileItemMetalDiamond = стальная плитка
     .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemSteelOffset = смещёная стальная плитка
+    .desc = { ent-FloorTileItemSteel.desc }
+ent-FloorTileItemSteelDiagonalMini = стальная диагональная мини плитка
+    .desc = { ent-FloorTileItemSteel.desc }
+ent-FloorTileItemSteelDiagonal = стальная диагональная плитка
+    .desc = { ent-FloorTileItemSteel.desc }
+ent-FloorTileItemSteelHerringbone = стальная плитка ёлочкой
+    .desc = { ent-FloorTileItemSteel.desc }
+ent-FloorTileItemSteelMini = стальная мини плитка
+    .desc = { ent-FloorTileItemSteel.desc }
+ent-FloorTileItemSteelMono = стальная моно плита
+    .desc = { ent-FloorTileItemSteel.desc }
+ent-FloorTileItemSteelPavement = стальная тротуарная плитка
+    .desc = { ent-FloorTileItemSteel.desc }
+ent-FloorTileItemSteelPavementVertical = стальная вертикальная тротуарная плитка
+    .desc = { ent-FloorTileItemSteel.desc }
 ent-FloorTileItemWood = деревянный пол
     .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemWhiteOffset = смещёная белая стальная плитка
+    .desc = { ent-FloorTileItemWhite.desc }
+ent-FloorTileItemWhiteDiagonalMini = белая стальная диагональная мини плитка
+    .desc = { ent-FloorTileItemWhite.desc }
+ent-FloorTileItemWhiteDiagonal = белая стальная диагональная плитка
+    .desc = { ent-FloorTileItemWhite.desc }
+ent-FloorTileItemWhiteHerringbone = белая стальная плитка ёлочкой
+    .desc = { ent-FloorTileItemWhite.desc }
+ent-FloorTileItemWhiteMini = белая стальная мини плитка
+    .desc = { ent-FloorTileItemWhite.desc }
+ent-FloorTileItemWhiteMono = белая стальная моно плита
+    .desc = { ent-FloorTileItemWhite.desc }
+ent-FloorTileItemWhitePavement = белая стальная тротуарная плитка
+    .desc = { ent-FloorTileItemWhite.desc }
+ent-FloorTileItemWhitePavementVertical = белая стальная вертикальная тротуарная плитка
+    .desc = { ent-FloorTileItemWhite.desc }
 ent-FloorTileItemWhite = белая плитка
     .desc = { ent-FloorTileItemBase.desc }
 ent-FloorTileItemDark = тёмная плитка
@@ -58,10 +106,22 @@ ent-FloorTileItemLaundry = плитка прачечной
     .desc = { ent-FloorTileItemBase.desc }
 ent-FloorTileItemConcrete = бетонная плитка
     .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemConcreteMono = бетонная плита
+    .desc = { ent-FloorTileItemConcrete.desc }
+ent-FloorTileItemConcreteSmooth = бетонный пол
+    .desc = { ent-FloorTileItemConcrete.desc }
 ent-FloorTileItemGrayConcrete = серая бетонная плитка
     .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemGrayConcreteMono = серая бетонная плита
+    .desc = { ent-FloorTileItemGrayConcrete.desc }
+ent-FloorTileItemGrayConcreteSmooth = серый бетонный пол
+    .desc = { ent-FloorTileItemGrayConcrete.desc }
 ent-FloorTileItemOldConcrete = старая бетонная плитка
     .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemOldConcreteMono = старая бетонная плита
+    .desc = { ent-FloorTileItemOldConcrete.desc }
+ent-FloorTileItemOldConcreteSmooth = старый бетонный пол
+    .desc = { ent-FloorTileItemOldConcrete.desc }
 ent-FloorTileItemArcadeBlue = синий пол аркады
     .desc = { ent-FloorTileItemBase.desc }
 ent-FloorTileItemArcadeBlue2 = синий пол аркады
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl
index aeda8e2e6a8..0c6b223e68e 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl
@@ -30,6 +30,8 @@ ent-PotatoSeeds = пакет семян (картофель)
     .desc = { ent-SeedBase.desc }
 ent-SugarcaneSeeds = пакет семян (сахарный тростник)
     .desc = { ent-SeedBase.desc }
+ent-PapercaneSeeds = пакет семян (бумажный тростник)
+    .desc = { ent-SeedBase.desc }
 ent-TowercapSeeds = пакет спор (грибошляпник)
     .desc = { ent-SeedBase.desc }
 ent-SteelcapSeeds = пакет спор (сталешляпник)
@@ -40,12 +42,14 @@ ent-BlueTomatoSeeds = пакет семян (синий томат)
     .desc = { ent-SeedBase.desc }
 ent-BloodTomatoSeeds = пакет семян (кровяной томат)
     .desc = { ent-SeedBase.desc }
-ent-KillerTomatoSeeds = packet of killer tomato seeds
+ent-KillerTomatoSeeds = пакет семян (томат-убийца)
     .desc = { ent-SeedBase.desc }
 ent-EggplantSeeds = пакет семян (баклажан)
     .desc = { ent-SeedBase.desc }
 ent-AppleSeeds = пакет семян (яблоко)
     .desc = { ent-SeedBase.desc }
+ent-GoldenAppleSeeds = пакет семян (золотое яблоко)
+    .desc = { ent-SeedBase.desc }
 ent-CornSeeds = пакет семян (кукуруза)
     .desc = { ent-SeedBase.desc }
 ent-ChanterelleSeeds = пакет спор (лисички)
@@ -80,6 +84,8 @@ ent-AmbrosiaDeusSeeds = пакет семян (амброзия деус)
     .desc = Лекарственное растение самих богов.
 ent-GalaxythistleSeeds = пакет семян (галакточертополох)
     .desc = Кисточки ночных звёзд.
+ent-GlasstleSeeds = пакет семян (стеклополох)
+    .desc = Шрамы беспросветных ночей.
 ent-FlyAmanitaSeeds = пакет спор (мухомор)
     .desc = Знаковый, невероятно смертоносный гриб, выращиваемый исключительно в декоративных целях.
 ent-GatfruitSeeds = пакет семян (гатфрукт)
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/gas_tanks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/gas_tanks.ftl
index 5e4a412d929..a735684e913 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/gas_tanks.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/gas_tanks.ftl
@@ -3,26 +3,26 @@ ent-GasTankBase = { ent-BaseItem }
 ent-GasTankRoundBase = { ent-GasTankBase }
     .desc = { ent-GasTankBase.desc }
 ent-OxygenTank = кислородный баллон
-    .desc = Стандартный цилиндрический газовый баллон для кислорода.
+    .desc = Стандартный цилиндрический газовый баллон для кислорода. Вмещает 5 Л газа.
 ent-NitrogenTank = азотный баллон
-    .desc = Стандартный цилиндрический газовый баллон для азота.
+    .desc = Стандартный цилиндрический газовый баллон для азота. Вмещает 5 Л газа.
 ent-EmergencyOxygenTank = аварийный кислородный баллон
-    .desc = Лёгкий переносной баллон для чрезвычайных ситуаций. Содержит очень мало кислорода, предназначен только для выживания.
+    .desc = Лёгкий переносной баллон для чрезвычайных ситуаций. Содержит очень мало кислорода, предназначен только для выживания. Вмещает 0,66 Л газа.
 ent-EmergencyNitrogenTank = аварийный азотный баллон
-    .desc = Лёгкий переносной баллон для чрезвычайных ситуаций. Содержит очень мало азота, предназначен только для выживания.
+    .desc = Лёгкий переносной баллон для чрезвычайных ситуаций. Содержит очень мало азота, предназначен только для выживания. Вмещает 0,66 Л газа.
 ent-ExtendedEmergencyOxygenTank = аварийный кислородный баллон повышенной ёмкости
-    .desc = Аварийный баллон повышенной ёмкости. Технически рассчитан на длительное использование.
+    .desc = Аварийный баллон повышенной ёмкости. Технически рассчитан на длительное использование. Вмещает 1,5 Л газа.
 ent-ExtendedEmergencyNitrogenTank = аварийный азотный баллон повышенной ёмкости
-    .desc = Аварийный баллон повышенной ёмкости. Технически рассчитан на длительное использование.
+    .desc = Аварийный баллон повышенной ёмкости. Технически рассчитан на длительное использование. Вмещает 1,5 Л газа.
 ent-DoubleEmergencyOxygenTank = двойной аварийный кислородный баллон
-    .desc = Высококлассный двухбаллонный резервуар аварийного жизнеобеспечения. Вмещает приличное для своих небольших размеров количество кислорода.
+    .desc = Высококлассный двухбаллонный резервуар аварийного жизнеобеспечения. Вмещает приличное для своих небольших размеров количество кислорода. Вмещает 2,5 Л газа.
 ent-DoubleEmergencyNitrogenTank = двойной аварийный азотный баллон
-    .desc = Высококлассный двухбаллонный резервуар аварийного жизнеобеспечения. Вмещает приличное для своих небольших размеров количество азота.
+    .desc = Высококлассный двухбаллонный резервуар аварийного жизнеобеспечения. Вмещает приличное для своих небольших размеров количество азота. Вмещает 2,5 Л газа.
 ent-EmergencyFunnyOxygenTank = весёлый аварийный кислородный баллон
-    .desc = Лёгкий переносной баллон для чрезвычайных ситуаций. Содержит очень мало кислорода и чуточку веселящего газа, предназначен только для выживания.
+    .desc = Лёгкий переносной баллон для чрезвычайных ситуаций. Содержит очень мало кислорода и чуточку веселящего газа, предназначен только для выживания. Вмещает 0,66 Л газа.
 ent-AirTank = баллон воздуха
-    .desc = Какая-то смесь?
+    .desc = Какая-то смесь? Вмещает 5 Л газа.
 ent-NitrousOxideTank = баллон оксида азота
-    .desc = Содержит смесь воздуха и оксида азота. Убедитесь, что вы не заправляете его чистым N2O.
+    .desc = Содержит смесь воздуха и оксида азота. Убедитесь, что вы не заправляете его чистым N2O. Вмещает 5 Л газа.
 ent-PlasmaTank = баллон плазмы
-    .desc = Содержит опасную плазму. Не вдыхать. Чрезвычайно огнеопасен.
+    .desc = Содержит опасную плазму. Не вдыхать. Чрезвычайно огнеопасен. Вмещает 5 Л газа.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/jetpacks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/jetpacks.ftl
index d1d11303193..d2c58b5182b 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/jetpacks.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/jetpacks.ftl
@@ -1,7 +1,7 @@
 ent-JetpackEffect = { "" }
     .desc = { "" }
 ent-BaseJetpack = джетпак
-    .desc = Это реактивный ранец - джетпак.
+    .desc = Это реактивный ранец - джетпак. Вмещает 5 Л газа.
 ent-ActionToggleJetpack = Переключить джетпак
     .desc = Переключить джетпак, позволяющий с лёгкостью передвигаться вне станции.
 ent-JetpackBlue = джетпак
@@ -24,7 +24,7 @@ ent-JetpackCaptainFilled = джетпак капитана
     .desc = { ent-JetpackCaptain.desc }
 ent-JetpackMini = мини джетпак
     .suffix = Пустой
-    .desc = { ent-BaseJetpack.desc }
+    .desc = Это реактивный ранец - джетпак. Вмещает 1,5 Л газа.
 ent-JetpackMiniFilled = мини джетпак
     .suffix = Полный
     .desc = { ent-JetpackMini.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl
index 615080dc1a5..3f26a813bc7 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl
@@ -12,3 +12,6 @@ ent-EnergyCutlass = абордажная энергосабля
     .desc = Экзотическое энергетическое оружие.
 ent-EnergySwordDouble = двухклинковый энергетический меч
     .desc = Стажеры из командования Синдиката решили, что одного клинка на энергетическом мече недостаточно. Его можно хранить в кармане.
+ent-CyborgEnergySwordDouble = { ent-EnergySwordDouble }
+    .desc = Интерны Командования Синдиката решили, что одного лезвия на энергетическом мече недостаточно. Специальная разработка для киборгов Синдиката.
+    .suffix = Одноручное, Для боргов
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/gates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/gates.ftl
index a2e4d1f5079..39554bfb6ab 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/gates.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/gates.ftl
@@ -1,7 +1,23 @@
 ent-BaseLogicItem = { ent-BaseItem }
     .desc = { ent-BaseItem.desc }
-ent-LogicGate = логический элемент
-    .desc = Логический элемент с двумя портами на вход и одним на выход, можно изменить логическую операцию с помощью отвёртки.
+ent-LogicGateOr = логический элемент
+    .desc = Логический элемент с двумя портами на вход и одним на выход. Можно изменить логическую операцию с помощью отвёртки.
+    .suffix = Or, ИЛИ
+ent-LogicGateAnd = { ent-LogicGateOr }
+    .suffix = And, И
+    .desc = { ent-LogicGateOr.desc }
+ent-LogicGateXor = { ent-LogicGateOr }
+    .suffix = Xor, Исключающее ИЛИ
+    .desc = { ent-LogicGateOr.desc }
+ent-LogicGateNor = { ent-LogicGateOr }
+    .suffix = Nor, ИЛИ-НЕ
+    .desc = { ent-LogicGateOr.desc }
+ent-LogicGateNand = { ent-LogicGateOr }
+    .suffix = Nand, И-НЕ
+    .desc = { ent-LogicGateOr.desc }
+ent-LogicGateXnor = { ent-LogicGateOr }
+    .suffix = Xnor, Исключающее ИЛИ-НЕ
+    .desc = { ent-LogicGateOr.desc }
 ent-EdgeDetector = детектор сигнала
     .desc = Определяет уровень сигнала и разделяет его. Устройство игнорирует импульсные сигналы.
 ent-PowerSensor = датчик питания
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/lathe.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/lathe.ftl
index 727ef453720..e52f6dd4b22 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/lathe.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/lathe.ftl
@@ -34,3 +34,5 @@ ent-OreProcessorIndustrial = промышленный переработчик 
     .desc = Переработчик руды, разработанный специально для производства металлов в промышленных масштабах.
 ent-Sheetifier = лист-мастер 2000
     .desc = Довольно мяссивное устройство.
+ent-CutterMachine = плиткорез
+    .desc = Это плиткорез. Он режет. Придайте разнообразия полу вашей станции с помощью интересных узоров! Не засовывайте внутрь пальцы.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/shelfs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/shelfs.ftl
new file mode 100644
index 00000000000..f6d494a3d80
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/shelfs.ftl
@@ -0,0 +1,25 @@
+ent-ShelfBase = shelf
+    .desc = a strange place to place, well, anything really. You feel like you shouldn't be seeing this.'
+ent-ShelfBaseReinforced = укреплённая полка
+    .desc = Она выглядит такой же прочной, как и наша реальность.
+ent-ShelfWood = деревянная полка
+    .desc = Удобное место для размещения, ээ, да чего угодно.
+ent-ShelfMetal = металлическая полка
+    .desc = Прочное место для размещения, ээ, да чего угодно.
+ent-ShelfGlass = стеклянная полка
+    .desc = Хрупкое место для размещения, ээ, да чего угодно.
+ent-ShelfRWood = прочная деревянная полка
+    .desc = Безопасное место, куда можно убрать любимую бутылку виски.
+ent-ShelfRMetal = прочная металлическая полка
+    .desc = Прочное и блестящее место для хранения всех ваших склянок.
+ent-ShelfRGlass = прочная стеклянная полка
+    .desc = Кристально чистые дверцы из армированного стекла позволят выставить напоказ все ваши модные бутылки, за которые вы точно не продали любимую таракамольку коллеги.
+ent-ShelfBar = барная полка
+    .desc = Изготовлена из отборной синтетической древесины для хранения алкоголя.
+ent-ShelfKitchen = кухонная полка
+    .desc = Для хранения ножей, специй и всего прочего!
+ent-ShelfChemistry = химическая полка
+    .desc = Держите все ваши химикаты в безопасности и подальше от клоу... эээ... публики!
+ent-ShelfChemistryChemistrySecure = { ent-ShelfChemistry }
+    .suffix = Химия, Защищённый
+    .desc = { ent-ShelfChemistry.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl
index afdb66dc79f..1b15b401116 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl
@@ -89,8 +89,8 @@ ent-WallCobblebrick = булыжниковая стена
     .desc = Идеально подогнанные друг к другу кирпичик за кирпичиком образовали стену.
 ent-WallBasaltCobblebrick = базальтовая стена
     .desc = { ent-WallCobblebrick.desc }
-ent-WallSnowCobblebrick = снежковая стена
-    .desc = A cold, not-so-impenetrable wall.
+ent-WallSnowCobblebrick = снежная стена
+    .desc = Холодная, не такая уж непроходимая стена.
 ent-WallAsteroidCobblebrick = астероидная булыжниковая стена
     .desc = { ent-WallCobblebrick.desc }
 ent-WallSandCobblebrick = песчаниковая булыжниковая стена
diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl
index db420f6ee84..3f78237937f 100644
--- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl
@@ -87,7 +87,9 @@ uplink-black-jetpack-desc = Чёрный джетпак. Позволяет ле
 uplink-reinforcement-radio-ancestor-name = Телепорт подкрепления генетическим предком
 uplink-reinforcement-radio-ancestor-desc = Призовите на помощь специально обученного предка по вашему выбору. Комплектуются одной сигаретой Синдиката.
 uplink-reinforcement-radio-name = Телепорт подкрепления
-uplink-reinforcement-radio-desc = Телепортирует агента крайне сомнительного качества. Не имеет кнопки отключения, покупайте его только если вы готовы к вечеринке. У агента есть пистолет без запасных патронов и нож. Это всё.
+uplink-reinforcement-radio-traitor-desc = Телепортирует в качестве подкрепления сомнительного качества агента. Не имеет кнопки отключения, покупайте его только если вы готовы к вечеринке. Вызовите медика, шпиона или вора, чтобы они помогли вам. Удачи.
+uplink-reinforcement-radio-nukeops-name = Телепорт Ядерного оперативника
+uplink-reinforcement-radio-nukeops-desc = Телепортирует в качестве подкрепления сомнительного качества ядерного оперативника. Не имеет кнопки отключения, покупайте его только если вы готовы к вечеринке. У них будет базовое снаряжение ядерного оперативника.
 uplink-reinforcement-radio-cyborg-assault-name = Телепорт штурмового киборга Синдиката
 uplink-reinforcement-radio-cyborg-assault-desc = Машина для убийств с доступом к энергомечу, пулемёту, криптографическому секвенсору и пинпоинтеру.
 uplink-stealth-box-name = Стелс-коробка
@@ -169,7 +171,7 @@ uplink-super-surplus-bundle-name = Ящик суперприпасов Синд
 uplink-super-surplus-bundle-desc = Содержит случайное снаряжение Синдиката, общей стоимостью в 125 телекристаллов.
 # Tools
 uplink-toolbox-name = Ящик инструментов
-uplink-toolbox-desc = Полный набор инструментов для предателя с тягой к механике. Включает пару изолированных боевых перчаток, противогаз Синдиката и плечевую кобуру.
+uplink-toolbox-desc = Полный набор инструментов для предателя с тягой к механике. Включает пару изолированных боевых перчаток и противогаз Синдиката.
 uplink-syndicate-jaws-of-life-name = Челюсти жизни
 uplink-syndicate-jaws-of-life-desc = Комбинация лома и кусачек. Используется для проникновения на станцию или в её отделы.
 uplink-duffel-surgery-name = Хирургический вещмешок
diff --git a/Resources/Locale/ru-RU/traits/traits.ftl b/Resources/Locale/ru-RU/traits/traits.ftl
index ae4cc0d9186..59a5e95e6bd 100644
--- a/Resources/Locale/ru-RU/traits/traits.ftl
+++ b/Resources/Locale/ru-RU/traits/traits.ftl
@@ -21,8 +21,8 @@ trait-accentless-name = Отсутствие акцента
 trait-accentless-desc = У вас нет того акцента, который характерен для представителей вашего вида.
 trait-frontal-lisp-name = Сигматизм
 trait-frontal-lisp-desc = У ваф имеютшя проблемы ш произношением.
-trait-socialanxiety-name = Социофобия
-trait-socialanxiety-desc = Вы испытываете тревожность, когда говорите, что приводит к заиканию.
+trait-socialanxiety-name = Заикание
+trait-socialanxiety-desc = Вы заикаетесь.
 trait-southern-name = Диалект юга США
 trait-southern-desc = У вас другая манера речи. Работает только с английским.
 trait-snoring-name = Храп
diff --git a/Resources/Locale/ru-RU/weapons/ranged/gun.ftl b/Resources/Locale/ru-RU/weapons/ranged/gun.ftl
index 4324029f149..91020607ebd 100644
--- a/Resources/Locale/ru-RU/weapons/ranged/gun.ftl
+++ b/Resources/Locale/ru-RU/weapons/ranged/gun.ftl
@@ -5,6 +5,7 @@ gun-selected-mode = Выбран { $mode }
 gun-disabled = Вы не можете использовать оружие!
 gun-clumsy = Оружие взрывается вам в лицо!
 gun-set-fire-mode = Выбран режим { $mode }
+gun-magazine-whitelist-fail = Это не помещается в оружие!
 # SelectiveFire
 gun-SemiAuto = полуавто
 gun-Burst = очередь
diff --git a/Resources/Locale/ru-RU/wieldable/wieldable-component.ftl b/Resources/Locale/ru-RU/wieldable/wieldable-component.ftl
index e15d3e2a0f7..cb370a1d248 100644
--- a/Resources/Locale/ru-RU/wieldable/wieldable-component.ftl
+++ b/Resources/Locale/ru-RU/wieldable/wieldable-component.ftl
@@ -16,3 +16,4 @@ wieldable-component-not-enough-free-hands =
 wieldable-component-not-in-hands = { CAPITALIZE($item) } не в ваших руках!
 wieldable-component-requires = { CAPITALIZE($item) } должно быть в двух руках!
 gunwieldbonus-component-examine = Это оружие обладает повышенной точностью, когда его держат в двух руках.
+gunrequireswield-component-examine = Из этого оружия можно стрелять только держа его в двух руках.
diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml
index 2e7f60c91df..2063451a0ee 100644
--- a/Resources/Maps/Nonstations/nukieplanet.yml
+++ b/Resources/Maps/Nonstations/nukieplanet.yml
@@ -13721,13 +13721,6 @@ entities:
     - type: Transform
       pos: 3.5882664,-8.344303
       parent: 104
-- proto: VariantCubeBox
-  entities:
-  - uid: 1826
-    components:
-    - type: Transform
-      pos: 14.485744,-16.427467
-      parent: 104
 - proto: VendingMachineBooze
   entities:
   - uid: 1380
diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml
index 2ba6b203e5e..d3b49496bfc 100644
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
@@ -11448,7 +11448,7 @@ entities:
       pos: 24.5,16.5
       parent: 8364
     - type: Door
-      secondsUntilStateChange: -3331.5208
+      secondsUntilStateChange: -4258.8877
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -17253,6 +17253,11 @@ entities:
     - type: Transform
       pos: -52.5,-6.5
       parent: 8364
+  - uid: 1301
+    components:
+    - type: Transform
+      pos: 25.5,-45.5
+      parent: 8364
   - uid: 1468
     components:
     - type: Transform
@@ -17668,6 +17673,16 @@ entities:
     - type: Transform
       pos: 25.5,-60.5
       parent: 8364
+  - uid: 3702
+    components:
+    - type: Transform
+      pos: 25.5,-49.5
+      parent: 8364
+  - uid: 3703
+    components:
+    - type: Transform
+      pos: 25.5,-53.5
+      parent: 8364
   - uid: 3705
     components:
     - type: Transform
@@ -17903,11 +17918,6 @@ entities:
     - type: Transform
       pos: 25.5,-51.5
       parent: 8364
-  - uid: 4163
-    components:
-    - type: Transform
-      pos: 22.5,-67.5
-      parent: 8364
   - uid: 4520
     components:
     - type: Transform
@@ -31538,71 +31548,6 @@ entities:
     - type: Transform
       pos: 24.5,-45.5
       parent: 8364
-  - uid: 16587
-    components:
-    - type: Transform
-      pos: 25.5,-45.5
-      parent: 8364
-  - uid: 16588
-    components:
-    - type: Transform
-      pos: 26.5,-45.5
-      parent: 8364
-  - uid: 16589
-    components:
-    - type: Transform
-      pos: 27.5,-45.5
-      parent: 8364
-  - uid: 16590
-    components:
-    - type: Transform
-      pos: 28.5,-45.5
-      parent: 8364
-  - uid: 16591
-    components:
-    - type: Transform
-      pos: 29.5,-45.5
-      parent: 8364
-  - uid: 16592
-    components:
-    - type: Transform
-      pos: 29.5,-44.5
-      parent: 8364
-  - uid: 16593
-    components:
-    - type: Transform
-      pos: 29.5,-43.5
-      parent: 8364
-  - uid: 16594
-    components:
-    - type: Transform
-      pos: 29.5,-42.5
-      parent: 8364
-  - uid: 16595
-    components:
-    - type: Transform
-      pos: 29.5,-41.5
-      parent: 8364
-  - uid: 16596
-    components:
-    - type: Transform
-      pos: 28.5,-41.5
-      parent: 8364
-  - uid: 16597
-    components:
-    - type: Transform
-      pos: 27.5,-41.5
-      parent: 8364
-  - uid: 16598
-    components:
-    - type: Transform
-      pos: 26.5,-41.5
-      parent: 8364
-  - uid: 16599
-    components:
-    - type: Transform
-      pos: 25.5,-41.5
-      parent: 8364
   - uid: 16600
     components:
     - type: Transform
@@ -31623,11 +31568,6 @@ entities:
     - type: Transform
       pos: 25.5,-48.5
       parent: 8364
-  - uid: 16606
-    components:
-    - type: Transform
-      pos: 25.5,-49.5
-      parent: 8364
   - uid: 16607
     components:
     - type: Transform
@@ -31643,11 +31583,6 @@ entities:
     - type: Transform
       pos: 25.5,-52.5
       parent: 8364
-  - uid: 16610
-    components:
-    - type: Transform
-      pos: 25.5,-53.5
-      parent: 8364
   - uid: 16611
     components:
     - type: Transform
@@ -31663,116 +31598,6 @@ entities:
     - type: Transform
       pos: 25.5,-56.5
       parent: 8364
-  - uid: 16614
-    components:
-    - type: Transform
-      pos: 25.5,-57.5
-      parent: 8364
-  - uid: 16615
-    components:
-    - type: Transform
-      pos: 26.5,-57.5
-      parent: 8364
-  - uid: 16616
-    components:
-    - type: Transform
-      pos: 27.5,-57.5
-      parent: 8364
-  - uid: 16617
-    components:
-    - type: Transform
-      pos: 28.5,-57.5
-      parent: 8364
-  - uid: 16618
-    components:
-    - type: Transform
-      pos: 29.5,-57.5
-      parent: 8364
-  - uid: 16619
-    components:
-    - type: Transform
-      pos: 29.5,-56.5
-      parent: 8364
-  - uid: 16620
-    components:
-    - type: Transform
-      pos: 29.5,-55.5
-      parent: 8364
-  - uid: 16621
-    components:
-    - type: Transform
-      pos: 29.5,-54.5
-      parent: 8364
-  - uid: 16622
-    components:
-    - type: Transform
-      pos: 29.5,-53.5
-      parent: 8364
-  - uid: 16623
-    components:
-    - type: Transform
-      pos: 29.5,-52.5
-      parent: 8364
-  - uid: 16624
-    components:
-    - type: Transform
-      pos: 29.5,-51.5
-      parent: 8364
-  - uid: 16625
-    components:
-    - type: Transform
-      pos: 29.5,-50.5
-      parent: 8364
-  - uid: 16626
-    components:
-    - type: Transform
-      pos: 29.5,-49.5
-      parent: 8364
-  - uid: 16627
-    components:
-    - type: Transform
-      pos: 29.5,-48.5
-      parent: 8364
-  - uid: 16628
-    components:
-    - type: Transform
-      pos: 29.5,-47.5
-      parent: 8364
-  - uid: 16629
-    components:
-    - type: Transform
-      pos: 29.5,-46.5
-      parent: 8364
-  - uid: 16630
-    components:
-    - type: Transform
-      pos: 28.5,-49.5
-      parent: 8364
-  - uid: 16631
-    components:
-    - type: Transform
-      pos: 27.5,-49.5
-      parent: 8364
-  - uid: 16632
-    components:
-    - type: Transform
-      pos: 26.5,-49.5
-      parent: 8364
-  - uid: 16633
-    components:
-    - type: Transform
-      pos: 28.5,-53.5
-      parent: 8364
-  - uid: 16634
-    components:
-    - type: Transform
-      pos: 27.5,-53.5
-      parent: 8364
-  - uid: 16635
-    components:
-    - type: Transform
-      pos: 26.5,-53.5
-      parent: 8364
   - uid: 16636
     components:
     - type: Transform
@@ -32188,141 +32013,11 @@ entities:
     - type: Transform
       pos: 22.5,-63.5
       parent: 8364
-  - uid: 16777
-    components:
-    - type: Transform
-      pos: 23.5,-63.5
-      parent: 8364
-  - uid: 16778
-    components:
-    - type: Transform
-      pos: 23.5,-64.5
-      parent: 8364
-  - uid: 16779
-    components:
-    - type: Transform
-      pos: 23.5,-65.5
-      parent: 8364
-  - uid: 16780
-    components:
-    - type: Transform
-      pos: 23.5,-66.5
-      parent: 8364
-  - uid: 16781
-    components:
-    - type: Transform
-      pos: 23.5,-67.5
-      parent: 8364
-  - uid: 16783
-    components:
-    - type: Transform
-      pos: 21.5,-67.5
-      parent: 8364
-  - uid: 16784
-    components:
-    - type: Transform
-      pos: 20.5,-67.5
-      parent: 8364
-  - uid: 16785
-    components:
-    - type: Transform
-      pos: 19.5,-67.5
-      parent: 8364
-  - uid: 16786
-    components:
-    - type: Transform
-      pos: 18.5,-67.5
-      parent: 8364
-  - uid: 16787
-    components:
-    - type: Transform
-      pos: 17.5,-67.5
-      parent: 8364
-  - uid: 16788
-    components:
-    - type: Transform
-      pos: 16.5,-67.5
-      parent: 8364
-  - uid: 16789
-    components:
-    - type: Transform
-      pos: 15.5,-67.5
-      parent: 8364
-  - uid: 16790
-    components:
-    - type: Transform
-      pos: 14.5,-67.5
-      parent: 8364
-  - uid: 16791
-    components:
-    - type: Transform
-      pos: 13.5,-67.5
-      parent: 8364
-  - uid: 16792
-    components:
-    - type: Transform
-      pos: 12.5,-67.5
-      parent: 8364
-  - uid: 16793
-    components:
-    - type: Transform
-      pos: 11.5,-67.5
-      parent: 8364
-  - uid: 16794
-    components:
-    - type: Transform
-      pos: 11.5,-66.5
-      parent: 8364
-  - uid: 16795
-    components:
-    - type: Transform
-      pos: 11.5,-65.5
-      parent: 8364
-  - uid: 16796
-    components:
-    - type: Transform
-      pos: 11.5,-64.5
-      parent: 8364
-  - uid: 16797
-    components:
-    - type: Transform
-      pos: 11.5,-63.5
-      parent: 8364
   - uid: 16798
     components:
     - type: Transform
       pos: 12.5,-63.5
       parent: 8364
-  - uid: 16799
-    components:
-    - type: Transform
-      pos: 15.5,-64.5
-      parent: 8364
-  - uid: 16800
-    components:
-    - type: Transform
-      pos: 15.5,-65.5
-      parent: 8364
-  - uid: 16801
-    components:
-    - type: Transform
-      pos: 15.5,-66.5
-      parent: 8364
-  - uid: 16802
-    components:
-    - type: Transform
-      pos: 19.5,-64.5
-      parent: 8364
-  - uid: 16803
-    components:
-    - type: Transform
-      pos: 19.5,-65.5
-      parent: 8364
-  - uid: 16804
-    components:
-    - type: Transform
-      pos: 19.5,-66.5
-      parent: 8364
   - uid: 16805
     components:
     - type: Transform
@@ -112272,11 +111967,6 @@ entities:
     - type: Transform
       pos: -6.5,2.5
       parent: 8364
-  - uid: 120
-    components:
-    - type: Transform
-      pos: 28.5,-45.5
-      parent: 8364
   - uid: 211
     components:
     - type: Transform
@@ -113041,11 +112731,6 @@ entities:
     - type: Transform
       pos: -54.5,-19.5
       parent: 8364
-  - uid: 1301
-    components:
-    - type: Transform
-      pos: 28.5,-53.5
-      parent: 8364
   - uid: 1344
     components:
     - type: Transform
@@ -114645,16 +114330,6 @@ entities:
     - type: Transform
       pos: -12.5,-77.5
       parent: 8364
-  - uid: 3702
-    components:
-    - type: Transform
-      pos: 29.5,-49.5
-      parent: 8364
-  - uid: 3703
-    components:
-    - type: Transform
-      pos: 29.5,-50.5
-      parent: 8364
   - uid: 3715
     components:
     - type: Transform
@@ -114675,36 +114350,6 @@ entities:
     - type: Transform
       pos: -1.5,-72.5
       parent: 8364
-  - uid: 3808
-    components:
-    - type: Transform
-      pos: 25.5,-53.5
-      parent: 8364
-  - uid: 3809
-    components:
-    - type: Transform
-      pos: 26.5,-53.5
-      parent: 8364
-  - uid: 3810
-    components:
-    - type: Transform
-      pos: 27.5,-53.5
-      parent: 8364
-  - uid: 3811
-    components:
-    - type: Transform
-      pos: 27.5,-49.5
-      parent: 8364
-  - uid: 3812
-    components:
-    - type: Transform
-      pos: 29.5,-46.5
-      parent: 8364
-  - uid: 3813
-    components:
-    - type: Transform
-      pos: 29.5,-48.5
-      parent: 8364
   - uid: 3832
     components:
     - type: Transform
@@ -117966,51 +117611,6 @@ entities:
     - type: Transform
       pos: -2.5,-65.5
       parent: 8364
-  - uid: 15105
-    components:
-    - type: Transform
-      pos: 19.5,-63.5
-      parent: 8364
-  - uid: 15106
-    components:
-    - type: Transform
-      pos: 29.5,-57.5
-      parent: 8364
-  - uid: 15126
-    components:
-    - type: Transform
-      pos: 16.5,-67.5
-      parent: 8364
-  - uid: 15127
-    components:
-    - type: Transform
-      pos: 17.5,-67.5
-      parent: 8364
-  - uid: 15128
-    components:
-    - type: Transform
-      pos: 15.5,-64.5
-      parent: 8364
-  - uid: 15129
-    components:
-    - type: Transform
-      pos: 15.5,-65.5
-      parent: 8364
-  - uid: 15136
-    components:
-    - type: Transform
-      pos: 25.5,-57.5
-      parent: 8364
-  - uid: 15137
-    components:
-    - type: Transform
-      pos: 15.5,-63.5
-      parent: 8364
-  - uid: 15139
-    components:
-    - type: Transform
-      pos: 15.5,-66.5
-      parent: 8364
   - uid: 15343
     components:
     - type: Transform
@@ -118026,141 +117626,6 @@ entities:
     - type: Transform
       pos: -29.5,-26.5
       parent: 8364
-  - uid: 15903
-    components:
-    - type: Transform
-      pos: 29.5,-56.5
-      parent: 8364
-  - uid: 15984
-    components:
-    - type: Transform
-      pos: 29.5,-55.5
-      parent: 8364
-  - uid: 16057
-    components:
-    - type: Transform
-      pos: 29.5,-54.5
-      parent: 8364
-  - uid: 16082
-    components:
-    - type: Transform
-      pos: 29.5,-53.5
-      parent: 8364
-  - uid: 16128
-    components:
-    - type: Transform
-      pos: 29.5,-51.5
-      parent: 8364
-  - uid: 16131
-    components:
-    - type: Transform
-      pos: 11.5,-67.5
-      parent: 8364
-  - uid: 16134
-    components:
-    - type: Transform
-      pos: 12.5,-67.5
-      parent: 8364
-  - uid: 16140
-    components:
-    - type: Transform
-      pos: 13.5,-67.5
-      parent: 8364
-  - uid: 16142
-    components:
-    - type: Transform
-      pos: 14.5,-67.5
-      parent: 8364
-  - uid: 16143
-    components:
-    - type: Transform
-      pos: 15.5,-67.5
-      parent: 8364
-  - uid: 16144
-    components:
-    - type: Transform
-      pos: 19.5,-66.5
-      parent: 8364
-  - uid: 16148
-    components:
-    - type: Transform
-      pos: 23.5,-63.5
-      parent: 8364
-  - uid: 16149
-    components:
-    - type: Transform
-      pos: 19.5,-64.5
-      parent: 8364
-  - uid: 16150
-    components:
-    - type: Transform
-      pos: 19.5,-65.5
-      parent: 8364
-  - uid: 16151
-    components:
-    - type: Transform
-      pos: 22.5,-67.5
-      parent: 8364
-  - uid: 16152
-    components:
-    - type: Transform
-      pos: 23.5,-67.5
-      parent: 8364
-  - uid: 16155
-    components:
-    - type: Transform
-      pos: 23.5,-66.5
-      parent: 8364
-  - uid: 16156
-    components:
-    - type: Transform
-      pos: 23.5,-65.5
-      parent: 8364
-  - uid: 16157
-    components:
-    - type: Transform
-      pos: 23.5,-64.5
-      parent: 8364
-  - uid: 16159
-    components:
-    - type: Transform
-      pos: 20.5,-67.5
-      parent: 8364
-  - uid: 16160
-    components:
-    - type: Transform
-      pos: 27.5,-57.5
-      parent: 8364
-  - uid: 16161
-    components:
-    - type: Transform
-      pos: 28.5,-57.5
-      parent: 8364
-  - uid: 16168
-    components:
-    - type: Transform
-      pos: 29.5,-52.5
-      parent: 8364
-  - uid: 16169
-    components:
-    - type: Transform
-      pos: 18.5,-67.5
-      parent: 8364
-  - uid: 16170
-    components:
-    - type: Transform
-      pos: 19.5,-67.5
-      parent: 8364
-  - uid: 16208
-    components:
-    - type: Transform
-      pos: 21.5,-67.5
-      parent: 8364
-  - uid: 16209
-    components:
-    - type: Transform
-      pos: 26.5,-57.5
-      parent: 8364
   - uid: 16526
     components:
     - type: Transform
@@ -118211,11 +117676,6 @@ entities:
     - type: Transform
       pos: 20.5,-63.5
       parent: 8364
-  - uid: 16877
-    components:
-    - type: Transform
-      pos: 29.5,-45.5
-      parent: 8364
   - uid: 16884
     components:
     - type: Transform
@@ -118271,41 +117731,11 @@ entities:
     - type: Transform
       pos: 4.5,-78.5
       parent: 8364
-  - uid: 16940
-    components:
-    - type: Transform
-      pos: 11.5,-64.5
-      parent: 8364
-  - uid: 16941
-    components:
-    - type: Transform
-      pos: 11.5,-63.5
-      parent: 8364
-  - uid: 16958
-    components:
-    - type: Transform
-      pos: 11.5,-65.5
-      parent: 8364
-  - uid: 16959
-    components:
-    - type: Transform
-      pos: 11.5,-66.5
-      parent: 8364
   - uid: 16972
     components:
     - type: Transform
       pos: 3.5,-78.5
       parent: 8364
-  - uid: 16973
-    components:
-    - type: Transform
-      pos: 26.5,-49.5
-      parent: 8364
-  - uid: 16974
-    components:
-    - type: Transform
-      pos: 25.5,-49.5
-      parent: 8364
   - uid: 16986
     components:
     - type: Transform
@@ -118356,11 +117786,6 @@ entities:
     - type: Transform
       pos: -4.5,-100.5
       parent: 8364
-  - uid: 17153
-    components:
-    - type: Transform
-      pos: 29.5,-44.5
-      parent: 8364
   - uid: 17154
     components:
     - type: Transform
@@ -118496,26 +117921,11 @@ entities:
     - type: Transform
       pos: -18.5,-29.5
       parent: 8364
-  - uid: 17670
-    components:
-    - type: Transform
-      pos: 26.5,-41.5
-      parent: 8364
-  - uid: 17688
-    components:
-    - type: Transform
-      pos: 29.5,-47.5
-      parent: 8364
   - uid: 17709
     components:
     - type: Transform
       pos: 13.5,-51.5
       parent: 8364
-  - uid: 17710
-    components:
-    - type: Transform
-      pos: 25.5,-41.5
-      parent: 8364
   - uid: 17721
     components:
     - type: Transform
@@ -118526,11 +117936,6 @@ entities:
     - type: Transform
       pos: -34.5,-26.5
       parent: 8364
-  - uid: 17764
-    components:
-    - type: Transform
-      pos: 29.5,-41.5
-      parent: 8364
   - uid: 17785
     components:
     - type: Transform
@@ -118897,11 +118302,6 @@ entities:
     - type: Transform
       pos: 13.5,-50.5
       parent: 8364
-  - uid: 20152
-    components:
-    - type: Transform
-      pos: 25.5,-45.5
-      parent: 8364
   - uid: 20195
     components:
     - type: Transform
@@ -118927,11 +118327,6 @@ entities:
     - type: Transform
       pos: 23.5,-34.5
       parent: 8364
-  - uid: 21110
-    components:
-    - type: Transform
-      pos: 29.5,-42.5
-      parent: 8364
   - uid: 21130
     components:
     - type: Transform
@@ -118942,16 +118337,6 @@ entities:
     - type: Transform
       pos: 76.5,-48.5
       parent: 8364
-  - uid: 21231
-    components:
-    - type: Transform
-      pos: 28.5,-41.5
-      parent: 8364
-  - uid: 21239
-    components:
-    - type: Transform
-      pos: 26.5,-45.5
-      parent: 8364
   - uid: 21337
     components:
     - type: Transform
@@ -119232,16 +118617,6 @@ entities:
     - type: Transform
       pos: 14.5,-53.5
       parent: 8364
-  - uid: 23204
-    components:
-    - type: Transform
-      pos: 27.5,-45.5
-      parent: 8364
-  - uid: 23211
-    components:
-    - type: Transform
-      pos: 28.5,-49.5
-      parent: 8364
   - uid: 23212
     components:
     - type: Transform
@@ -119347,11 +118722,6 @@ entities:
     - type: Transform
       pos: 12.5,-28.5
       parent: 8364
-  - uid: 26088
-    components:
-    - type: Transform
-      pos: 29.5,-43.5
-      parent: 8364
   - uid: 26472
     components:
     - type: Transform
@@ -132681,6 +132051,11 @@ entities:
       parent: 8364
 - proto: ReinforcedPlasmaWindow
   entities:
+  - uid: 120
+    components:
+    - type: Transform
+      pos: 25.5,-50.5
+      parent: 8364
   - uid: 3494
     components:
     - type: Transform
@@ -132801,11 +132176,6 @@ entities:
     - type: Transform
       pos: 25.5,-51.5
       parent: 8364
-  - uid: 22889
-    components:
-    - type: Transform
-      pos: 25.5,-50.5
-      parent: 8364
   - uid: 22890
     components:
     - type: Transform
diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml
index 32f860cae6e..53eb68994e1 100644
--- a/Resources/Maps/cluster.yml
+++ b/Resources/Maps/cluster.yml
@@ -27931,48 +27931,6 @@ entities:
     - type: Transform
       pos: -39.356712,-24.532705
       parent: 1
-- proto: ClothingOuterSanta
-  entities:
-  - uid: 8934
-    components:
-    - type: Transform
-      pos: 19.401697,12.696105
-      parent: 1
-  - uid: 9050
-    components:
-    - type: Transform
-      pos: 19.401697,12.696105
-      parent: 1
-  - uid: 9051
-    components:
-    - type: Transform
-      pos: 19.401697,12.696105
-      parent: 1
-  - uid: 9201
-    components:
-    - type: Transform
-      pos: 19.401697,12.696105
-      parent: 1
-  - uid: 9254
-    components:
-    - type: Transform
-      pos: 19.604822,12.571105
-      parent: 1
-  - uid: 9255
-    components:
-    - type: Transform
-      pos: 19.604822,12.571105
-      parent: 1
-  - uid: 9308
-    components:
-    - type: Transform
-      pos: 19.604822,12.571105
-      parent: 1
-  - uid: 9309
-    components:
-    - type: Transform
-      pos: 19.604822,12.571105
-      parent: 1
 - proto: ClothingOuterWinterCap
   entities:
   - uid: 5926
diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml
index 445965e3366..8719acd69b3 100644
--- a/Resources/Maps/core.yml
+++ b/Resources/Maps/core.yml
@@ -81,139 +81,139 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: DgAAAAADDgAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAACDgAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAACDgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAACegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAACegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAADXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAA
+          tiles: DgAAAAACDgAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAACDgAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAACDgAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAADegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAADegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAADXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADfgAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: bAAAAAAAbAAAAAAAXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADJAAAAAADXQAAAAADXQAAAAADaAAAAAADbAAAAAAAbAAAAAAAXQAAAAACaAAAAAACJAAAAAADJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAABaAAAAAABJAAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: bAAAAAAAbAAAAAAAXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAAAXQAAAAAAXQAAAAAAaAAAAAAAbAAAAAAAbAAAAAAAXQAAAAACaAAAAAACJAAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAADaAAAAAADJAAAAAAAJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: fgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADXQAAAAAAaAAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAXQAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACaAAAAAADXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAJAAAAAABJAAAAAAAJAAAAAAAXQAAAAADJAAAAAADXQAAAAACXQAAAAACaAAAAAACXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACHwAAAAAAfgAAAAAAXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAACegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAADegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAACDgAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAXQAAAAACaAAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABXQAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAACaAAAAAAAXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABfgAAAAAAJAAAAAACJAAAAAADJAAAAAAAXQAAAAADJAAAAAADXQAAAAACXQAAAAADaAAAAAACXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACHwAAAAABfgAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-2:
           ind: -1,-2
-          tiles: XQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAAAaAAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADaAAAAAABaAAAAAABaAAAAAACaAAAAAACaAAAAAACaAAAAAADaAAAAAADaAAAAAABaAAAAAACaAAAAAACTgAAAAAATgAAAAABaAAAAAAATgAAAAACTgAAAAAAaAAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAADaAAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABHwAAAAACfgAAAAAAHwAAAAABfgAAAAAAXQAAAAADfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAaAAAAAADaAAAAAACXQAAAAACXQAAAAADfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACaAAAAAADaAAAAAACXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAaAAAAAABaAAAAAACXQAAAAACJAAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAABaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAACaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABXQAAAAACTgAAAAABTgAAAAACTgAAAAACXQAAAAABXQAAAAAATgAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAADXQAAAAABJAAAAAACJAAAAAACJAAAAAAAfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADXQAAAAAAaAAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAD
+          tiles: XQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAABaAAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAADaAAAAAACaAAAAAADaAAAAAACaAAAAAADaAAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAAAaAAAAAABTgAAAAACTgAAAAACaAAAAAAATgAAAAACTgAAAAABaAAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADaAAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACHwAAAAAAfgAAAAAAHwAAAAABfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACfgAAAAAAaAAAAAACaAAAAAAAXQAAAAADXQAAAAADfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAABaAAAAAABXQAAAAABXQAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAaAAAAAAAaAAAAAADXQAAAAAAJAAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAADaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAXQAAAAABTgAAAAAATgAAAAADTgAAAAADXQAAAAAAXQAAAAACTgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAAAXQAAAAACJAAAAAACJAAAAAAAJAAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACXQAAAAABaAAAAAACXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAD
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: aAAAAAAAaAAAAAACXQAAAAABXQAAAAADaAAAAAAAXQAAAAACXQAAAAACXQAAAAADaAAAAAACXQAAAAAAaAAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAAATgAAAAAATgAAAAACaAAAAAACaAAAAAABaAAAAAADaAAAAAACaAAAAAABaAAAAAACaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABaAAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAHwAAAAAAJAAAAAABJAAAAAABJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAHwAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAJAAAAAADegAAAAABfgAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAACJAAAAAAAfgAAAAAAHwAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABegAAAAAAegAAAAACfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAHwAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAACJAAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACaAAAAAABXQAAAAAAHwAAAAACfgAAAAAAHwAAAAAAJAAAAAABJAAAAAADJAAAAAABJAAAAAABXQAAAAABXQAAAAADJAAAAAACfgAAAAAAJAAAAAABaAAAAAAAaAAAAAABaAAAAAADXQAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAATgAAAAAATgAAAAADJAAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAADXQAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAAAXQAAAAABXQAAAAACXQAAAAACaAAAAAACaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABXQAAAAABHwAAAAACHwAAAAACHwAAAAABHwAAAAABXQAAAAAAXQAAAAABaAAAAAADXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAaAAAAAABaAAAAAADaAAAAAABaAAAAAABXQAAAAACHwAAAAAAHwAAAAACfgAAAAAAHwAAAAABXQAAAAAAXQAAAAADaAAAAAADHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAACaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAABaAAAAAACXQAAAAACfgAAAAAAJAAAAAADJAAAAAACJAAAAAAAXQAAAAACXQAAAAABaAAAAAABXQAAAAACXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAJAAAAAACHwAAAAADHwAAAAAAXQAAAAABXQAAAAACaAAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAACXQAAAAAAXQAAAAABaAAAAAAA
+          tiles: aAAAAAAAaAAAAAAAXQAAAAADXQAAAAADaAAAAAACXQAAAAABXQAAAAADXQAAAAABaAAAAAABXQAAAAADaAAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADTgAAAAABTgAAAAABaAAAAAACaAAAAAACaAAAAAABaAAAAAAAaAAAAAABaAAAAAACaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAaAAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAHwAAAAAAJAAAAAAAJAAAAAABJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAHwAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAJAAAAAADegAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAAAJAAAAAADfgAAAAAAHwAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADegAAAAAAegAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAHwAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADJAAAAAABJAAAAAAAJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACaAAAAAABXQAAAAABHwAAAAABfgAAAAAAHwAAAAACJAAAAAABJAAAAAACJAAAAAAAJAAAAAABXQAAAAAAXQAAAAAAJAAAAAAAfgAAAAAAJAAAAAACaAAAAAADaAAAAAAAaAAAAAACXQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAATgAAAAACTgAAAAADJAAAAAABfgAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAACXQAAAAACHwAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADXQAAAAAAXQAAAAABXQAAAAABaAAAAAADaAAAAAADaAAAAAACaAAAAAADaAAAAAACXQAAAAABHwAAAAACHwAAAAAAHwAAAAABHwAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAaAAAAAACaAAAAAADaAAAAAACaAAAAAADXQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAACXQAAAAADXQAAAAABaAAAAAAAHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAABXQAAAAABfgAAAAAAJAAAAAACJAAAAAAAJAAAAAABXQAAAAABXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAJAAAAAACHwAAAAACHwAAAAACXQAAAAAAXQAAAAADaAAAAAADXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAABXQAAAAADXQAAAAAAaAAAAAAD
           version: 6
         1,-2:
           ind: 1,-2
-          tiles: XQAAAAADXQAAAAADaAAAAAADXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAHwAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAADaAAAAAAAHwAAAAACfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAABfgAAAAAAHwAAAAACaAAAAAABaAAAAAABaAAAAAACaAAAAAACaAAAAAADHwAAAAACfgAAAAAAHwAAAAACJAAAAAABHwAAAAADfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAHwAAAAADaAAAAAAAaAAAAAADaAAAAAABXQAAAAACaAAAAAACHwAAAAAAHwAAAAAAHwAAAAAAJAAAAAACHwAAAAABfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAHwAAAAADaAAAAAACaAAAAAABaAAAAAABaAAAAAACaAAAAAAAHwAAAAABfgAAAAAAHwAAAAAAJAAAAAADHwAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACJAAAAAABHwAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABJAAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAfgAAAAAAXQAAAAACaAAAAAAAaAAAAAACaAAAAAABaAAAAAACaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAABaAAAAAACXQAAAAADfgAAAAAAHwAAAAACJAAAAAAAHwAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACaAAAAAABXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAACHwAAAAACXQAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAADaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAHwAAAAAAJAAAAAADXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAADaAAAAAAAXQAAAAABaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAADaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA
+          tiles: XQAAAAAAXQAAAAABaAAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAHwAAAAACaAAAAAADaAAAAAABaAAAAAABaAAAAAADaAAAAAABHwAAAAABfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAABfgAAAAAAHwAAAAAAaAAAAAADaAAAAAAAaAAAAAADaAAAAAABaAAAAAABHwAAAAAAfgAAAAAAHwAAAAAAJAAAAAABHwAAAAACfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAHwAAAAAAaAAAAAAAaAAAAAABaAAAAAABXQAAAAADaAAAAAACHwAAAAADHwAAAAACHwAAAAACJAAAAAAAHwAAAAADfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAHwAAAAADaAAAAAABaAAAAAABaAAAAAABaAAAAAADaAAAAAADHwAAAAABfgAAAAAAHwAAAAAAJAAAAAACHwAAAAABfgAAAAAAaAAAAAAAaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAADHwAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAJAAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAJAAAAAADHwAAAAABfgAAAAAAXQAAAAACaAAAAAACaAAAAAAAaAAAAAABaAAAAAACaAAAAAACaAAAAAABaAAAAAADaAAAAAABaAAAAAADXQAAAAACfgAAAAAAHwAAAAABJAAAAAAAHwAAAAADfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAHwAAAAAAHwAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAJAAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAHwAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAaAAAAAABXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAABaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAADfgAAAAAAXQAAAAABXQAAAAABXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA
           version: 6
         1,-1:
           ind: 1,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAD
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAD
           version: 6
         -2,-2:
           ind: -2,-2
-          tiles: EgAAAAACXQAAAAAAegAAAAAAegAAAAAAXQAAAAACfgAAAAAAJAAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAACaAAAAAACXQAAAAABXQAAAAAAXQAAAAADEgAAAAACXQAAAAACegAAAAAAegAAAAACXQAAAAACfgAAAAAAXQAAAAACTgAAAAAATgAAAAAAaAAAAAAATgAAAAAAaAAAAAADaAAAAAADaAAAAAACaAAAAAACaAAAAAABEgAAAAACXQAAAAABegAAAAADegAAAAACXQAAAAABfgAAAAAAXQAAAAAATgAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAADaAAAAAADXQAAAAABXQAAAAABXQAAAAABEgAAAAAAXQAAAAABegAAAAADegAAAAACXQAAAAADaAAAAAADXQAAAAAAaAAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACEgAAAAADXQAAAAABegAAAAADegAAAAADXQAAAAACaAAAAAAAXQAAAAACTgAAAAADXQAAAAAAXQAAAAAAaAAAAAADHwAAAAAAHwAAAAABJgAAAAABJgAAAAADJgAAAAADEgAAAAABXQAAAAACegAAAAACegAAAAAAXQAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAADXQAAAAABaAAAAAABHwAAAAABHwAAAAAATgAAAAAATgAAAAABTgAAAAACXQAAAAADXQAAAAACKAAAAAACKAAAAAADXQAAAAADfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAXQAAAAABaAAAAAABHwAAAAADHwAAAAAAJgAAAAABJgAAAAABJgAAAAABKAAAAAABKAAAAAABKAAAAAAAKAAAAAADXQAAAAADfgAAAAAAXQAAAAACaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAegAAAAACfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAegAAAAABegAAAAACegAAAAABegAAAAACegAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAACfgAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAACfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAACegAAAAAAegAAAAACegAAAAADegAAAAADegAAAAADegAAAAADfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABegAAAAADegAAAAACegAAAAADegAAAAADegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAfgAAAAAA
+          tiles: EgAAAAADXQAAAAABegAAAAABegAAAAABXQAAAAADfgAAAAAAJAAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAaAAAAAAAXQAAAAADXQAAAAADXQAAAAADEgAAAAAAXQAAAAACegAAAAABegAAAAADXQAAAAADfgAAAAAAXQAAAAADTgAAAAADTgAAAAACaAAAAAADTgAAAAAAaAAAAAACaAAAAAABaAAAAAAAaAAAAAAAaAAAAAAAEgAAAAABXQAAAAACegAAAAADegAAAAABXQAAAAABfgAAAAAAXQAAAAABTgAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAADaAAAAAADXQAAAAADXQAAAAAAXQAAAAACEgAAAAACXQAAAAADegAAAAAAegAAAAACXQAAAAABaAAAAAAAXQAAAAADaAAAAAACXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAEgAAAAABXQAAAAAAegAAAAAAegAAAAABXQAAAAADaAAAAAADXQAAAAADTgAAAAACXQAAAAADXQAAAAACaAAAAAADHwAAAAACHwAAAAADJgAAAAACJgAAAAABJgAAAAACEgAAAAABXQAAAAABegAAAAACegAAAAABXQAAAAACfgAAAAAAXQAAAAABTgAAAAADXQAAAAAAXQAAAAADaAAAAAAAHwAAAAAAHwAAAAAATgAAAAABTgAAAAADTgAAAAADXQAAAAAAXQAAAAAAKAAAAAABKAAAAAADXQAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAAAXQAAAAAAaAAAAAADHwAAAAAAHwAAAAADJgAAAAADJgAAAAABJgAAAAACKAAAAAAAKAAAAAABKAAAAAACKAAAAAADXQAAAAACfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAABfgAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAADegAAAAACfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAegAAAAACegAAAAADegAAAAADegAAAAABegAAAAACfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAACegAAAAACegAAAAACegAAAAADegAAAAACegAAAAADegAAAAABfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAfgAAAAAA
           version: 6
         -2,-1:
           ind: -2,-1
-          tiles: egAAAAADegAAAAADegAAAAAAegAAAAACegAAAAAAaAAAAAACXQAAAAADaAAAAAABXQAAAAACfgAAAAAAegAAAAABegAAAAAAegAAAAABewAAAAACewAAAAABfgAAAAAATgAAAAACTgAAAAAAKAAAAAAATgAAAAADTgAAAAADaAAAAAAAXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAABewAAAAADewAAAAADbAAAAAAATgAAAAAATgAAAAABKAAAAAAATgAAAAADTgAAAAACaAAAAAACXQAAAAADaAAAAAADXQAAAAADfgAAAAAAegAAAAAAegAAAAADegAAAAABewAAAAACewAAAAACfgAAAAAAegAAAAADegAAAAACegAAAAABegAAAAADegAAAAADaAAAAAACXQAAAAACaAAAAAACXQAAAAABfgAAAAAAegAAAAADegAAAAAAegAAAAACewAAAAAAewAAAAACfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAaAAAAAABfgAAAAAAewAAAAACewAAAAACewAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAQAAAAAAAfgAAAAAAaAAAAAACfgAAAAAAKAAAAAADKAAAAAABKAAAAAAAfgAAAAAAXQAAAAAAaAAAAAACaAAAAAABXQAAAAACfgAAAAAAHwAAAAACHwAAAAADHwAAAAACQAAAAAAAQAAAAAAAXQAAAAAAfgAAAAAAKAAAAAAAKAAAAAACKAAAAAADfgAAAAAAXQAAAAABXQAAAAADaAAAAAADXQAAAAABfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAaAAAAAADaAAAAAABaAAAAAABaAAAAAAAaAAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAJAAAAAABXwAAAAAAXwAAAAACXwAAAAABXQAAAAADXQAAAAAAXQAAAAAAaAAAAAABegAAAAADegAAAAADegAAAAAAegAAAAAAegAAAAADfgAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABXQAAAAACXQAAAAABXQAAAAABaAAAAAABegAAAAACegAAAAADegAAAAACegAAAAAAegAAAAABfgAAAAAAgQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAACXQAAAAACXQAAAAACXQAAAAAAaAAAAAADegAAAAABegAAAAADegAAAAAAegAAAAADegAAAAACfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABXQAAAAABXQAAAAADXQAAAAAAaAAAAAACegAAAAABegAAAAAAegAAAAABegAAAAABfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAADaAAAAAACegAAAAABegAAAAACegAAAAACegAAAAACegAAAAAD
+          tiles: egAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAACaAAAAAAAXQAAAAACaAAAAAAAXQAAAAABfgAAAAAAegAAAAABegAAAAABegAAAAADewAAAAADewAAAAABfgAAAAAATgAAAAABTgAAAAABKAAAAAADTgAAAAAATgAAAAACaAAAAAACXQAAAAACaAAAAAACXQAAAAABfgAAAAAAegAAAAABegAAAAABegAAAAADewAAAAAAewAAAAABbAAAAAAATgAAAAADTgAAAAABKAAAAAABTgAAAAACTgAAAAACaAAAAAABXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAADewAAAAACewAAAAADfgAAAAAAegAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAACaAAAAAABXQAAAAACaAAAAAADXQAAAAABfgAAAAAAegAAAAADegAAAAABegAAAAADewAAAAABewAAAAADfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAewAAAAABewAAAAAAewAAAAACfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAQAAAAAAAfgAAAAAAaAAAAAACfgAAAAAAKAAAAAACKAAAAAACKAAAAAACfgAAAAAAXQAAAAABaAAAAAAAaAAAAAACXQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABQAAAAAAAQAAAAAAAXQAAAAABfgAAAAAAKAAAAAABKAAAAAAAKAAAAAACfgAAAAAAXQAAAAABXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAaAAAAAACaAAAAAAAaAAAAAABaAAAAAACaAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAJAAAAAABXwAAAAADXwAAAAABXwAAAAAAXQAAAAAAXQAAAAADXQAAAAABaAAAAAAAegAAAAACegAAAAACegAAAAABegAAAAABegAAAAADXQAAAAAAXQAAAAABfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAACXQAAAAABXQAAAAAAXQAAAAADaAAAAAABegAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAACXQAAAAABXQAAAAACfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAABXQAAAAACXQAAAAAAXQAAAAACaAAAAAABegAAAAADegAAAAACegAAAAABegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAADXQAAAAACXQAAAAAAXQAAAAAAaAAAAAACegAAAAAAegAAAAABegAAAAABegAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAaAAAAAAAegAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAAC
           version: 6
         1,0:
           ind: 1,0
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAADAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAABaAAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAATgAAAAADTgAAAAAAaAAAAAABaAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAABaAAAAAADaAAAAAAAaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAABXQAAAAAAXQAAAAABJAAAAAADJAAAAAACJAAAAAABXQAAAAABXQAAAAAAaAAAAAABXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAABfgAAAAAAJAAAAAADJAAAAAABJAAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADfgAAAAAAJAAAAAADJAAAAAAAJAAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABaAAAAAADaAAAAAABfgAAAAAAaAAAAAAAaAAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAaAAAAAACaAAAAAADHQAAAAACaAAAAAAAaAAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAADaAAAAAADaAAAAAACXQAAAAAAaAAAAAABaAAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACaAAAAAADaAAAAAACXQAAAAABaAAAAAABaAAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADaAAAAAAAaAAAAAABfgAAAAAAaAAAAAAAaAAAAAABXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAaAAAAAADaAAAAAACAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAaAAAAAADXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADTgAAAAABTgAAAAACaAAAAAABaAAAAAACbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAADaAAAAAABaAAAAAACaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABTgAAAAADXQAAAAABXQAAAAADXQAAAAADJAAAAAACJAAAAAACJAAAAAAAXQAAAAAAXQAAAAADaAAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAADXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAJAAAAAAAJAAAAAACJAAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAACXQAAAAABXQAAAAABXQAAAAABfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAABaAAAAAABaAAAAAADfgAAAAAAaAAAAAADaAAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABaAAAAAABaAAAAAACHQAAAAAAaAAAAAACaAAAAAACXQAAAAAAXQAAAAABfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAAAaAAAAAACaAAAAAAAXQAAAAADaAAAAAABaAAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABaAAAAAAAaAAAAAABXQAAAAAAaAAAAAACaAAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADaAAAAAAAaAAAAAADfgAAAAAAaAAAAAADaAAAAAAAXQAAAAAAXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAB
           version: 6
         2,-2:
           ind: 2,-2
-          tiles: HwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAHwAAAAADHwAAAAAAewAAAAACfgAAAAAAewAAAAAAHwAAAAAAHwAAAAABMwAAAAAAHwAAAAAAHwAAAAABewAAAAADfgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAACHwAAAAADHwAAAAAAewAAAAABewAAAAAAewAAAAACHwAAAAADHwAAAAAAMwAAAAAAHwAAAAABHwAAAAADewAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACfgAAAAAAHwAAAAACHwAAAAADewAAAAAAfgAAAAAAewAAAAADHwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAABewAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABewAAAAADewAAAAADewAAAAABewAAAAACewAAAAACewAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAegAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACXQAAAAADegAAAAADegAAAAACegAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAXQAAAAABXQAAAAACegAAAAADJAAAAAACfgAAAAAAHwAAAAADXQAAAAAAXQAAAAAAXQAAAAACegAAAAADegAAAAABegAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAcAAAAAAAcAAAAAADcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACaAAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAACaAAAAAADXQAAAAADTgAAAAADTgAAAAADaAAAAAAATgAAAAABTgAAAAAAaAAAAAAAaAAAAAAATgAAAAADaAAAAAADTgAAAAABTgAAAAACTgAAAAADaAAAAAADTgAAAAACaAAAAAABaAAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAABaAAAAAABXQAAAAABXQAAAAACXQAAAAAAaAAAAAADXQAAAAADXQAAAAAAXQAAAAABaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: HwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAHwAAAAABHwAAAAADewAAAAABfgAAAAAAewAAAAABHwAAAAACHwAAAAABMwAAAAAAHwAAAAABHwAAAAABewAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAAAewAAAAABewAAAAAAewAAAAAAHwAAAAADHwAAAAACMwAAAAAAHwAAAAAAHwAAAAACewAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAHwAAAAAAHwAAAAAAewAAAAABfgAAAAAAewAAAAAAHwAAAAABHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACewAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABewAAAAACewAAAAACewAAAAADewAAAAADewAAAAABewAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAegAAAAABegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAXQAAAAACegAAAAACegAAAAAAegAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACXQAAAAADXQAAAAACegAAAAAAJAAAAAACfgAAAAAAHwAAAAADXQAAAAAAXQAAAAABXQAAAAABegAAAAACegAAAAABegAAAAACHwAAAAABHwAAAAACHwAAAAABHwAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAcAAAAAAAcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAAAaAAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAADXQAAAAADTgAAAAACTgAAAAAAaAAAAAACTgAAAAACTgAAAAAAaAAAAAAAaAAAAAABTgAAAAADaAAAAAAATgAAAAABTgAAAAAATgAAAAADaAAAAAACTgAAAAABaAAAAAACaAAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACaAAAAAADXQAAAAACXQAAAAADXQAAAAACaAAAAAACXQAAAAADXQAAAAACXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         2,-1:
           ind: 2,-1
-          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAAAaAAAAAABaAAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAdQAAAAADdQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAABfgAAAAAAdQAAAAACdQAAAAACcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAAAfgAAAAAAdQAAAAACdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAdQAAAAACdQAAAAAAcAAAAAADJAAAAAACJAAAAAABJAAAAAABfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAAAfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAACfgAAAAAAdQAAAAADdQAAAAADfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAaAAAAAACaAAAAAADaAAAAAABaAAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAdQAAAAAAdQAAAAACcAAAAAAC
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAACaAAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABfgAAAAAAdQAAAAACdQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAdQAAAAABdQAAAAACcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAXQAAAAACaAAAAAACXQAAAAACfgAAAAAAdQAAAAABdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAdQAAAAACdQAAAAACcAAAAAACJAAAAAADJAAAAAABJAAAAAAAfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAAAfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAAAfgAAAAAAdQAAAAADdQAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABaAAAAAABfgAAAAAAXQAAAAABaAAAAAACXQAAAAABfgAAAAAAdQAAAAABdQAAAAADcAAAAAAA
           version: 6
         -2,0:
           ind: -2,0
-          tiles: aAAAAAADaAAAAAAAaAAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADaAAAAAACegAAAAACegAAAAABegAAAAACegAAAAABegAAAAAAaAAAAAACaAAAAAACXwAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAACaAAAAAADegAAAAABegAAAAABegAAAAAAegAAAAABegAAAAABaAAAAAADaAAAAAACXwAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAADaAAAAAACegAAAAAAegAAAAABegAAAAAAegAAAAABegAAAAADaAAAAAAAaAAAAAAAaAAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAaAAAAAACegAAAAABegAAAAADegAAAAAAegAAAAABegAAAAACewAAAAABewAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADAwAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAACXQAAAAABXQAAAAADXQAAAAAAHwAAAAACewAAAAABAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAADXQAAAAACXQAAAAABAwAAAAAAegAAAAACHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAJAAAAAABHwAAAAACHwAAAAACewAAAAABAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAAAXQAAAAAAAwAAAAAAegAAAAADJAAAAAAAJAAAAAACJAAAAAACfgAAAAAAJAAAAAABHwAAAAABHwAAAAACewAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAADXQAAAAAAXQAAAAACAwAAAAAAegAAAAAAJAAAAAADJAAAAAADJAAAAAADfgAAAAAAJAAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAACaAAAAAABaAAAAAACaAAAAAAAaAAAAAADaAAAAAABaAAAAAADaAAAAAADaAAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAeQAAAAAAeQAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAABXQAAAAACXQAAAAADXQAAAAABaAAAAAABXQAAAAADeQAAAAAAeQAAAAAAeQAAAAADeQAAAAAAeQAAAAABeQAAAAABLgAAAAAALgAAAAAAAQAAAAAAaAAAAAADaAAAAAACAQAAAAADfgAAAAAAXQAAAAABaAAAAAADXQAAAAADfgAAAAAAJAAAAAADeQAAAAAAeQAAAAADeQAAAAAAeQAAAAADfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAQAAAAAAXQAAAAAAXQAAAAADaAAAAAAAXQAAAAABXQAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAfgAAAAAALgAAAAAAXQAAAAACXQAAAAABPAAAAAAAAQAAAAACXQAAAAADXQAAAAAAaAAAAAAAXQAAAAACXQAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAADYAAAAAABfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAJAAAAAABfgAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAABYAAAAAACfgAAAAAAfgAAAAAA
+          tiles: aAAAAAACaAAAAAACaAAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAADaAAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAAAegAAAAADaAAAAAADaAAAAAADXwAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAABaAAAAAADegAAAAAAegAAAAABegAAAAACegAAAAAAegAAAAADaAAAAAADaAAAAAABXwAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAADaAAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAAAegAAAAADaAAAAAABaAAAAAACaAAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADaAAAAAADegAAAAADegAAAAACegAAAAACegAAAAAAegAAAAACewAAAAABewAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAACAwAAAAAAegAAAAAAegAAAAAAegAAAAACegAAAAACXQAAAAABXQAAAAACXQAAAAACHwAAAAACewAAAAADAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAABXQAAAAACAwAAAAAAegAAAAACHwAAAAACHwAAAAACHwAAAAADfgAAAAAAJAAAAAAAHwAAAAACHwAAAAAAewAAAAABAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAADXQAAAAAAAwAAAAAAegAAAAACJAAAAAABJAAAAAABJAAAAAABfgAAAAAAJAAAAAADHwAAAAAAHwAAAAABewAAAAADAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAADXQAAAAABXQAAAAABAwAAAAAAegAAAAAAJAAAAAACJAAAAAAAJAAAAAABfgAAAAAAJAAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADaAAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAACaAAAAAACaAAAAAADaAAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAAAaAAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAeQAAAAADeQAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACaAAAAAADXQAAAAABXQAAAAABXQAAAAAAaAAAAAAAXQAAAAADeQAAAAACeQAAAAADeQAAAAADeQAAAAAAeQAAAAABeQAAAAACLgAAAAAALgAAAAAAAQAAAAACaAAAAAAAaAAAAAABAQAAAAACfgAAAAAAXQAAAAADaAAAAAADXQAAAAADfgAAAAAAJAAAAAABeQAAAAADeQAAAAACeQAAAAABeQAAAAAAfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAQAAAAADXQAAAAACXQAAAAABaAAAAAAAXQAAAAAAXQAAAAACYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAfgAAAAAALgAAAAAAXQAAAAACXQAAAAABPAAAAAAAAQAAAAADXQAAAAABXQAAAAAAaAAAAAABXQAAAAACXQAAAAABYAAAAAADYAAAAAACYAAAAAACYAAAAAACYAAAAAABfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAJAAAAAABfgAAAAAAXQAAAAACaAAAAAACXQAAAAACfgAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         1,-3:
           ind: 1,-3
-          tiles: bQAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAJAAAAAACJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADbQAAAAAAbQAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABbQAAAAAAbQAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABJAAAAAAAJAAAAAABJAAAAAAAJAAAAAADfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAADHwAAAAABHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABHwAAAAABHwAAAAACHwAAAAAAHwAAAAADJAAAAAABJAAAAAABJAAAAAADJAAAAAABJAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAJAAAAAABJAAAAAACJAAAAAABJAAAAAACfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAJAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABXQAAAAACXQAAAAABaAAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAHwAAAAADaAAAAAADaAAAAAABaAAAAAAAaAAAAAABaAAAAAACHwAAAAADfgAAAAAAHwAAAAABTgAAAAADaAAAAAADaAAAAAACaAAAAAABaAAAAAAAXQAAAAAAfgAAAAAAHwAAAAABaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAABHwAAAAAAfgAAAAAAHwAAAAAA
+          tiles: bQAAAAAAfgAAAAAAJAAAAAABJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADbQAAAAAAbQAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAbQAAAAAAbQAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAABJAAAAAACJAAAAAABJAAAAAABJAAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADHwAAAAADHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAADfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACJAAAAAACJAAAAAAAJAAAAAAAJAAAAAACfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAJAAAAAABfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACXQAAAAABXQAAAAAAaAAAAAACXQAAAAACXQAAAAACXQAAAAACfgAAAAAAHwAAAAACaAAAAAAAaAAAAAABaAAAAAABaAAAAAAAaAAAAAAAHwAAAAACfgAAAAAAHwAAAAADTgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAABXQAAAAABfgAAAAAAHwAAAAADaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAADHwAAAAACfgAAAAAAHwAAAAAA
           version: 6
         0,-3:
           ind: 0,-3
-          tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAACfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAJAAAAAADJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADaAAAAAAAaAAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADaAAAAAACaAAAAAADJAAAAAADfgAAAAAAXQAAAAADXQAAAAAAHwAAAAACHwAAAAABHwAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAABHwAAAAABHwAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAaAAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAAAaAAAAAAAaAAAAAADaAAAAAACaAAAAAAATgAAAAACaAAAAAACTgAAAAAAaAAAAAAD
+          tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABJAAAAAABJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAaAAAAAACaAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABaAAAAAADaAAAAAABJAAAAAACfgAAAAAAXQAAAAAAXQAAAAADHwAAAAAAHwAAAAAAHwAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAABJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAAAHwAAAAACHwAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAaAAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAABaAAAAAABaAAAAAADaAAAAAACaAAAAAABTgAAAAADaAAAAAAATgAAAAACaAAAAAAA
           version: 6
         1,1:
           ind: 1,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAJAAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAABfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADaAAAAAADXQAAAAACXQAAAAABaAAAAAAAXQAAAAADfgAAAAAAXQAAAAAAaAAAAAACaAAAAAABaAAAAAAAXQAAAAADaAAAAAACaAAAAAABaAAAAAADXQAAAAABaAAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAACXQAAAAABfgAAAAAAXQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAXQAAAAAAaAAAAAACaAAAAAAAaAAAAAACXQAAAAABXQAAAAADaAAAAAAAXQAAAAACXQAAAAAAXQAAAAABJAAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAACaAAAAAACXQAAAAAAaAAAAAAAaAAAAAADaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAdQAAAAADdAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAADfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAJAAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAADfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABaAAAAAABXQAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAXQAAAAACaAAAAAACaAAAAAAAaAAAAAAAXQAAAAADaAAAAAABaAAAAAADaAAAAAABXQAAAAADaAAAAAADaAAAAAACaAAAAAAAaAAAAAABaAAAAAAAXQAAAAACfgAAAAAAXQAAAAADaAAAAAAAaAAAAAAAaAAAAAABXQAAAAACaAAAAAADaAAAAAACaAAAAAABXQAAAAACXQAAAAAAaAAAAAADXQAAAAACXQAAAAABXQAAAAACJAAAAAADfgAAAAAAXQAAAAACaAAAAAADaAAAAAACaAAAAAADXQAAAAABaAAAAAADaAAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAdQAAAAACdAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,1:
           ind: 0,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADaAAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAADaAAAAAABaAAAAAACaAAAAAAAaAAAAAADaAAAAAADaAAAAAABaAAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAABaAAAAAAAaAAAAAADaAAAAAADaAAAAAACaAAAAAABXQAAAAABXQAAAAADXQAAAAADaAAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAACcAAAAAADcAAAAAAAdQAAAAAAdAAAAAAAdAAAAAACdAAAAAADXQAAAAACXQAAAAAAXQAAAAAAHwAAAAACHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAABcAAAAAABdQAAAAACdAAAAAADdAAAAAACdAAAAAAAfgAAAAAAXQAAAAACXQAAAAACHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAADdAAAAAABdAAAAAABfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAADdQAAAAADfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAADfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAcAAAAAABcAAAAAABaAAAAAADfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABaAAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABaAAAAAADaAAAAAAAaAAAAAAAaAAAAAADaAAAAAAAaAAAAAACaAAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAABaAAAAAABaAAAAAACaAAAAAAAaAAAAAAAaAAAAAADXQAAAAAAXQAAAAACXQAAAAADaAAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAABcAAAAAABcAAAAAAAdQAAAAACdAAAAAAAdAAAAAAAdAAAAAADXQAAAAACXQAAAAABXQAAAAADHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAAAcAAAAAADdQAAAAACdAAAAAACdAAAAAACdAAAAAAAfgAAAAAAXQAAAAADXQAAAAADHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAAAdAAAAAABdAAAAAABfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdQAAAAADdQAAAAACfgAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAcAAAAAABcAAAAAADaAAAAAACfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAACHwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA
           version: 6
         -1,1:
           ind: -1,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAACaAAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAACaAAAAAADaAAAAAACaAAAAAABaAAAAAAAaAAAAAADaAAAAAAATgAAAAADTgAAAAABaAAAAAACTgAAAAAATgAAAAACaAAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAABaAAAAAABXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAADHwAAAAABHwAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAACHwAAAAACHwAAAAADXQAAAAADfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAXQAAAAAAJAAAAAABJAAAAAACXQAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAHwAAAAABTgAAAAABTgAAAAACHwAAAAABTgAAAAABTgAAAAACTgAAAAABHwAAAAACTgAAAAABTgAAAAABHwAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAJAAAAAACHwAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAACHwAAAAADHwAAAAAAHwAAAAAAHwAAAAACHwAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABJAAAAAACJAAAAAABfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAB
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADaAAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAAAaAAAAAADaAAAAAAAaAAAAAADTgAAAAADTgAAAAABaAAAAAABTgAAAAADTgAAAAAAaAAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAACaAAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAXQAAAAAAHwAAAAABHwAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAXQAAAAACHwAAAAABHwAAAAABXQAAAAADfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAXQAAAAABJAAAAAACJAAAAAACXQAAAAABHwAAAAABHwAAAAACHwAAAAADHwAAAAACHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAHwAAAAACTgAAAAACTgAAAAADHwAAAAADTgAAAAABTgAAAAABTgAAAAABHwAAAAADTgAAAAAATgAAAAACHwAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAACJAAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAABHwAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADJAAAAAAAJAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAD
           version: 6
         -2,1:
           ind: -2,1
-          tiles: AQAAAAADAQAAAAADAQAAAAACJAAAAAABfgAAAAAAXQAAAAADaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAaAAAAAABfgAAAAAAXQAAAAACaAAAAAADXQAAAAADKAAAAAABKAAAAAACKAAAAAACKAAAAAAAKAAAAAACKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABXwAAAAADXwAAAAADXwAAAAABXwAAAAADXwAAAAAAXwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAABaAAAAAAAaAAAAAACaAAAAAAAaAAAAAAAaAAAAAACaAAAAAACaAAAAAABaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAADXwAAAAACXwAAAAAAXwAAAAABXwAAAAADXwAAAAADXwAAAAADaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACJAAAAAAAKAAAAAABKAAAAAACKAAAAAAAKAAAAAACKAAAAAABKAAAAAADXQAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACfgAAAAAAegAAAAADegAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAADegAAAAAAegAAAAACegAAAAABbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAA
+          tiles: AQAAAAAAAQAAAAADAQAAAAACJAAAAAACfgAAAAAAXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAaAAAAAACfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAKAAAAAABKAAAAAADKAAAAAACKAAAAAADKAAAAAABKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAAAXwAAAAACXwAAAAABXwAAAAABXwAAAAAAXwAAAAAAXwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAACaAAAAAABaAAAAAABaAAAAAACaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAAAaAAAAAACaAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAACXwAAAAACXwAAAAADXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAABaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABJAAAAAADKAAAAAADKAAAAAAAKAAAAAAAKAAAAAABKAAAAAADKAAAAAABXQAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAACfgAAAAAAegAAAAABegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAACegAAAAAAegAAAAADegAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADJAAAAAACHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAC
           version: 6
         -1,-3:
           ind: -1,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXgAAAAABYQAAAAABXgAAAAAAXQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAYQAAAAADfgAAAAAAggAAAAABfgAAAAAAXgAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAggAAAAAAfgAAAAAAfgAAAAAAggAAAAABfgAAAAAAfgAAAAAAYQAAAAACXQAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAggAAAAACgQAAAAAAfgAAAAAAgQAAAAAAggAAAAACfgAAAAAAfgAAAAAAfgAAAAAAggAAAAACYQAAAAAEXgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAADfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXgAAAAAAYQAAAAADXgAAAAABXQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAYQAAAAAAfgAAAAAAggAAAAABfgAAAAAAXgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAggAAAAABfgAAAAAAfgAAAAAAggAAAAACfgAAAAAAfgAAAAAAYQAAAAABXQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAggAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAggAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAggAAAAABYQAAAAACXgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAACfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAC
           version: 6
         2,-3:
           ind: 2,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAJAAAAAAAJAAAAAABJAAAAAAAJAAAAAADJAAAAAADJAAAAAAAJAAAAAACJAAAAAADJAAAAAAAJAAAAAABJAAAAAADJAAAAAABJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAABJAAAAAAAJAAAAAAAJAAAAAADJAAAAAACJAAAAAACJAAAAAABJAAAAAAAJAAAAAAAJAAAAAADJAAAAAAAJAAAAAABJAAAAAABJAAAAAABJAAAAAABJAAAAAACJAAAAAACJgAAAAACJgAAAAACJgAAAAACJgAAAAACJgAAAAAAJgAAAAADJgAAAAADJgAAAAADJgAAAAAAJgAAAAADJgAAAAACJgAAAAACJAAAAAABJAAAAAABJAAAAAADJgAAAAACJgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAABHwAAAAACHwAAAAACHwAAAAACJgAAAAAAJgAAAAAAJAAAAAAAJAAAAAACJAAAAAAAJgAAAAAAJgAAAAACHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAABJgAAAAAAJgAAAAABJAAAAAABHwAAAAABHwAAAAAAJAAAAAAAJAAAAAABHwAAAAADHwAAAAACJAAAAAABJAAAAAAAJAAAAAABJAAAAAABJAAAAAAAHwAAAAAAHwAAAAABJAAAAAADJAAAAAABHwAAAAABHwAAAAABHwAAAAAAJgAAAAADJAAAAAABJAAAAAADJAAAAAABJAAAAAADJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAACJAAAAAAAJAAAAAACJAAAAAACJgAAAAACHwAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABJAAAAAADJAAAAAABJAAAAAACJAAAAAADJAAAAAAAJAAAAAADJAAAAAABJAAAAAAAJAAAAAABJAAAAAABJAAAAAADJAAAAAADJAAAAAABJAAAAAACJAAAAAABJAAAAAABJAAAAAADJAAAAAADJAAAAAADJAAAAAABJAAAAAADJAAAAAADJAAAAAAAJAAAAAAAJAAAAAACJAAAAAABJAAAAAAAJAAAAAAAJAAAAAABJAAAAAAAJAAAAAADJAAAAAADJAAAAAABJgAAAAABJgAAAAAAJgAAAAABJgAAAAADJgAAAAAAJgAAAAAAJgAAAAABJgAAAAABJgAAAAAAJgAAAAADJgAAAAABJgAAAAADJAAAAAACJAAAAAABJAAAAAADJgAAAAABJgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAACHwAAAAABHwAAAAADHwAAAAADJgAAAAADJgAAAAADJAAAAAAAJAAAAAADJAAAAAACJgAAAAABJgAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAACHwAAAAADJgAAAAADJgAAAAADJAAAAAAAHwAAAAABHwAAAAADJAAAAAACJAAAAAAAHwAAAAADHwAAAAADJAAAAAADJAAAAAACJAAAAAADJAAAAAACJAAAAAACHwAAAAADHwAAAAAAJAAAAAABJAAAAAADHwAAAAAAHwAAAAABHwAAAAAAJgAAAAABJAAAAAADJAAAAAADJAAAAAAAJAAAAAADJAAAAAABJAAAAAAAJAAAAAABJAAAAAAAJAAAAAABJAAAAAABJAAAAAABJgAAAAADHwAAAAAC
           version: 6
         3,-2:
           ind: 3,-2
-          tiles: HwAAAAADHwAAAAACfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADHwAAAAACHwAAAAACfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAABHwAAAAAAHwAAAAABfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAACaAAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAACJAAAAAADfgAAAAAAXQAAAAACTgAAAAADTgAAAAACaAAAAAAATgAAAAADTgAAAAACaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAACaAAAAAABaAAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAAC
+          tiles: HwAAAAABHwAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAHwAAAAABHwAAAAABfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABHwAAAAAAHwAAAAADfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAADHwAAAAAAHwAAAAABfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAaAAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABJAAAAAADfgAAAAAAXQAAAAADTgAAAAACTgAAAAACaAAAAAABTgAAAAABTgAAAAABaAAAAAABaAAAAAACaAAAAAACaAAAAAACaAAAAAABaAAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABfgAAAAAAXQAAAAAD
           version: 6
         3,-3:
           ind: 3,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAACwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAABfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAABwAAAAALBwAAAAAABwAAAAAAJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAAAJAAAAAADfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAABJAAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAHwAAAAADHwAAAAACOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAKfwAAAAAAJAAAAAADJAAAAAACfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAADHwAAAAAAOAAAAAAAHwAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAACHwAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAADOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAACwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAALBwAAAAAAJAAAAAADfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAADJAAAAAADfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAADJAAAAAACJAAAAAACHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAHwAAAAADHwAAAAABOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAHBwAAAAAAfwAAAAAAJAAAAAACJAAAAAACfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAAAHwAAAAAAOAAAAAAAHwAAAAABOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAALHwAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAADOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAB
           version: 6
         -2,-3:
           ind: -2,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAADegAAAAACegAAAAABegAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAegAAAAACFQAAAAAGegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAFQAAAAACgQAAAAAAFQAAAAAGegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACJAAAAAACfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAADKAAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAABKAAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAAAegAAAAABegAAAAACegAAAAABegAAAAACegAAAAACegAAAAABegAAAAADegAAAAADfgAAAAAAfgAAAAAAewAAAAACewAAAAACfgAAAAAAegAAAAAAegAAAAACegAAAAAAKAAAAAAAKAAAAAADKAAAAAAAKAAAAAADKAAAAAACKAAAAAABKAAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAewAAAAACewAAAAADfgAAAAAAegAAAAAAegAAAAAAegAAAAABKAAAAAABKAAAAAABKAAAAAADKAAAAAABKAAAAAAAKAAAAAADKAAAAAADKAAAAAACfgAAAAAAfgAAAAAAewAAAAADewAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABKAAAAAACKAAAAAADKAAAAAADKAAAAAACKAAAAAABKAAAAAADKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAACegAAAAAAegAAAAABegAAAAACegAAAAACJAAAAAABfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAADKAAAAAADKAAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAbAAAAAAAXQAAAAABXQAAAAAAKAAAAAABKAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAABegAAAAACegAAAAAAegAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAegAAAAACFQAAAAACegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAFQAAAAAFgQAAAAAAFQAAAAAFegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAJAAAAAADfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACKAAAAAAAKAAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAADfgAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAADegAAAAACegAAAAABegAAAAAAegAAAAADegAAAAADegAAAAAAegAAAAACfgAAAAAAfgAAAAAAewAAAAACewAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAABKAAAAAACKAAAAAAAKAAAAAACKAAAAAACKAAAAAABKAAAAAADKAAAAAADKAAAAAACfgAAAAAAfgAAAAAAewAAAAABewAAAAABfgAAAAAAegAAAAABegAAAAABegAAAAACKAAAAAABKAAAAAACKAAAAAADKAAAAAABKAAAAAAAKAAAAAADKAAAAAAAKAAAAAABfgAAAAAAfgAAAAAAewAAAAADewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAAAKAAAAAACKAAAAAAAKAAAAAAAKAAAAAABKAAAAAADKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAACegAAAAADegAAAAADegAAAAADegAAAAADJAAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAADKAAAAAADKAAAAAACXQAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAABKAAAAAAAKAAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAA
           version: 6
         -3,-1:
           ind: -3,-1
-          tiles: HwAAAAADfgAAAAAAewAAAAADewAAAAABewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAegAAAAAAegAAAAADegAAAAAAegAAAAAAegAAAAACegAAAAAAegAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACTgAAAAAATgAAAAAAKAAAAAADTgAAAAACTgAAAAACKAAAAAAAHwAAAAACfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACTgAAAAAATgAAAAADKAAAAAABTgAAAAAATgAAAAAAKAAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAAAegAAAAACegAAAAADegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAKAAAAAADKAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAABZQAAAAAAfgAAAAAAewAAAAAAewAAAAAAewAAAAADfgAAAAAAaAAAAAABKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZQAAAAADZQAAAAAAfgAAAAAAKAAAAAACKAAAAAACKAAAAAABfgAAAAAAaAAAAAADKAAAAAABBAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAACZQAAAAACfgAAAAAAKAAAAAADKAAAAAACKAAAAAABfgAAAAAAXQAAAAAAXQAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAXwAAAAACXwAAAAABXwAAAAACXwAAAAAAJAAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAABfgAAAAAAXwAAAAADHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAXQAAAAAAXQAAAAADJAAAAAACJAAAAAACJAAAAAAAJAAAAAABJAAAAAADXQAAAAACXQAAAAACfgAAAAAAXwAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAADfgAAAAAAXQAAAAADXQAAAAADAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAABfgAAAAAAXwAAAAABHwAAAAABHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACJAAAAAADJAAAAAADJAAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAAA
+          tiles: HwAAAAABfgAAAAAAewAAAAACewAAAAADewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAegAAAAAAegAAAAACegAAAAACegAAAAADegAAAAAAegAAAAABegAAAAADHwAAAAADHwAAAAABHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADTgAAAAABTgAAAAADKAAAAAABTgAAAAAATgAAAAAAKAAAAAAAHwAAAAACfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAATgAAAAABTgAAAAACKAAAAAADTgAAAAABTgAAAAAAKAAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAAAegAAAAACegAAAAADegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAKAAAAAABKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAADZQAAAAADfgAAAAAAewAAAAAAewAAAAABewAAAAABfgAAAAAAaAAAAAABKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZQAAAAAAZQAAAAADfgAAAAAAKAAAAAAAKAAAAAADKAAAAAABfgAAAAAAaAAAAAABKAAAAAADBAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAABZQAAAAABfgAAAAAAKAAAAAACKAAAAAADKAAAAAABfgAAAAAAXQAAAAABXQAAAAACBAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAXwAAAAACXwAAAAADXwAAAAADXwAAAAAAJAAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAXwAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAACfgAAAAAAXQAAAAACXQAAAAADJAAAAAABJAAAAAACJAAAAAACJAAAAAAAJAAAAAACXQAAAAABXQAAAAABfgAAAAAAXwAAAAADHwAAAAABHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAXQAAAAABXQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAABXQAAAAADfgAAAAAAXwAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAACJAAAAAAAJAAAAAACXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAC
           version: 6
         -3,0:
           ind: -3,0
-          tiles: ZQAAAAABZQAAAAADZQAAAAACZQAAAAACZQAAAAADXQAAAAAAaAAAAAAAaAAAAAADXQAAAAADXQAAAAADaAAAAAABaAAAAAACaAAAAAADaAAAAAACaAAAAAABXQAAAAAATgAAAAACTgAAAAADaAAAAAADTgAAAAACTgAAAAABaAAAAAAAaAAAAAADaAAAAAADXQAAAAADXQAAAAACXwAAAAAAaAAAAAACaAAAAAACaAAAAAADXwAAAAACaAAAAAAAZQAAAAABZQAAAAABZQAAAAACZQAAAAABZQAAAAABXQAAAAABaAAAAAABaAAAAAACXQAAAAABXQAAAAABXwAAAAADaAAAAAABaAAAAAACaAAAAAAAXwAAAAABaAAAAAACJAAAAAAAJAAAAAADJAAAAAADJAAAAAACJAAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAABaAAAAAACaAAAAAAAaAAAAAACaAAAAAACaAAAAAACaAAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAABewAAAAABewAAAAABewAAAAACewAAAAACewAAAAAAJAAAAAACJAAAAAADJAAAAAACJAAAAAAAJAAAAAACXQAAAAACXQAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAJAAAAAABJAAAAAABJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAADHwAAAAABHwAAAAABbAAAAAAAfgAAAAAAfgAAAAAAewAAAAADewAAAAAAewAAAAACfgAAAAAAaAAAAAADaAAAAAABaAAAAAACAgAAAAAAJAAAAAABJAAAAAADHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABewAAAAAAewAAAAADfgAAAAAAaAAAAAACaAAAAAABaAAAAAADAgAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAAQAAAAADPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAACAQAAAAADPAAAAAAAXQAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAAAPAAAAAAAPAAAAAAA
+          tiles: ZQAAAAACZQAAAAADZQAAAAABZQAAAAACZQAAAAACXQAAAAABaAAAAAADaAAAAAAAXQAAAAABXQAAAAAAaAAAAAAAaAAAAAABaAAAAAAAaAAAAAADaAAAAAAAXQAAAAADTgAAAAAATgAAAAACaAAAAAAATgAAAAACTgAAAAABaAAAAAACaAAAAAADaAAAAAACXQAAAAABXQAAAAACXwAAAAADaAAAAAAAaAAAAAABaAAAAAAAXwAAAAACaAAAAAABZQAAAAAAZQAAAAABZQAAAAACZQAAAAAAZQAAAAABXQAAAAABaAAAAAABaAAAAAABXQAAAAABXQAAAAABXwAAAAAAaAAAAAADaAAAAAABaAAAAAACXwAAAAAAaAAAAAACJAAAAAACJAAAAAADJAAAAAACJAAAAAACJAAAAAADXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAABaAAAAAADaAAAAAACaAAAAAABaAAAAAADaAAAAAACaAAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAADXQAAAAADXQAAAAABewAAAAAAewAAAAAAewAAAAADewAAAAADewAAAAADJAAAAAADJAAAAAAAJAAAAAABJAAAAAADJAAAAAACXQAAAAACXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAADHwAAAAADHwAAAAADHwAAAAABHwAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAABHwAAAAABHwAAAAADHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAJAAAAAADJAAAAAABJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAADewAAAAACfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAAgAAAAAAJAAAAAADJAAAAAACHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABewAAAAADewAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAADAgAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAAQAAAAACPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAADAQAAAAAAPAAAAAAAXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAACPAAAAAAAPAAAAAAA
           version: 6
         -3,1:
           ind: -3,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAABegAAAAADegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAACegAAAAADegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAACRQAAAAAAIwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAADegAAAAAAegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAAGgQAAAAAAegAAAAABegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAABFQAAAAACegAAAAADfgAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAACgQAAAAAAgQAAAAAAgQAAAAAAggAAAAABegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAACgQAAAAAAFQAAAAAGfgAAAAAAegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAFQAAAAAEfgAAAAAAgQAAAAAAegAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAggAAAAACFQAAAAAAegAAAAABegAAAAAAfgAAAAAAegAAAAAAegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAABegAAAAADegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAACRQAAAAAAIwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAADegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAAEgQAAAAAAegAAAAADegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAABFQAAAAAGegAAAAABfgAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAggAAAAACegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAACgQAAAAAAFQAAAAAFfgAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAFQAAAAADfgAAAAAAgQAAAAAAegAAAAABegAAAAAAegAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAggAAAAACFQAAAAACegAAAAAAegAAAAADfgAAAAAAegAAAAABegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -3,-2:
           ind: -3,-2
-          tiles: aAAAAAABaAAAAAADaAAAAAABaAAAAAACXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADegAAAAAAegAAAAADXQAAAAADEgAAAAAAEgAAAAACEgAAAAACEgAAAAADEgAAAAACfgAAAAAAfgAAAAAAJAAAAAACaAAAAAACXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAegAAAAAAegAAAAACXQAAAAAAEgAAAAADEgAAAAABEgAAAAACEgAAAAABEgAAAAACAwAAAAAAAwAAAAAAJAAAAAACaAAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAACegAAAAAAegAAAAABXQAAAAABEgAAAAADEgAAAAAAEgAAAAABEgAAAAABEgAAAAACAwAAAAAAAwAAAAAAJAAAAAABaAAAAAACaAAAAAAAXQAAAAABaAAAAAAAXQAAAAACegAAAAABegAAAAABXQAAAAAAEgAAAAAAEgAAAAADEgAAAAACEgAAAAADEgAAAAABAwAAAAAAAwAAAAAAJAAAAAAAaAAAAAADaAAAAAACXQAAAAADaAAAAAADXQAAAAABegAAAAAAegAAAAAAXQAAAAADEgAAAAADEgAAAAAAEgAAAAADEgAAAAACEgAAAAAAAwAAAAAAAwAAAAAAJAAAAAABaAAAAAADXQAAAAADXQAAAAABfgAAAAAAXQAAAAABegAAAAADegAAAAAAXQAAAAAAEgAAAAABEgAAAAACEgAAAAAAEgAAAAACEgAAAAADfgAAAAAAfgAAAAAAJAAAAAADaAAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAACKAAAAAADKAAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACaAAAAAADaAAAAAADaAAAAAADaAAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAACKAAAAAADKAAAAAABKAAAAAABKAAAAAADKAAAAAAAKAAAAAADKAAAAAABKAAAAAABaAAAAAAAaAAAAAADXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAABKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAABfgAAAAAAewAAAAAAewAAAAACewAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAACfgAAAAAAewAAAAAAewAAAAABewAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADKAAAAAAC
+          tiles: aAAAAAADaAAAAAACaAAAAAAAaAAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABegAAAAADegAAAAADXQAAAAABEgAAAAACEgAAAAACEgAAAAACEgAAAAADEgAAAAADfgAAAAAAfgAAAAAAJAAAAAACaAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABegAAAAADegAAAAADXQAAAAACEgAAAAADEgAAAAACEgAAAAAAEgAAAAACEgAAAAABAwAAAAAAAwAAAAAAJAAAAAACaAAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABegAAAAAAegAAAAABXQAAAAADEgAAAAACEgAAAAADEgAAAAABEgAAAAABEgAAAAAAAwAAAAAAAwAAAAAAJAAAAAADaAAAAAABaAAAAAACXQAAAAAAaAAAAAABXQAAAAABegAAAAADegAAAAABXQAAAAABEgAAAAADEgAAAAABEgAAAAADEgAAAAAAEgAAAAADAwAAAAAAAwAAAAAAJAAAAAACaAAAAAABaAAAAAACXQAAAAAAaAAAAAADXQAAAAAAegAAAAAAegAAAAADXQAAAAABEgAAAAABEgAAAAADEgAAAAAAEgAAAAACEgAAAAABAwAAAAAAAwAAAAAAJAAAAAAAaAAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAADegAAAAAAegAAAAADXQAAAAABEgAAAAAAEgAAAAADEgAAAAABEgAAAAACEgAAAAADfgAAAAAAfgAAAAAAJAAAAAABaAAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAKAAAAAADKAAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAaAAAAAADaAAAAAABaAAAAAACaAAAAAADXQAAAAABXQAAAAACfgAAAAAAXQAAAAAAKAAAAAADKAAAAAABKAAAAAACKAAAAAACKAAAAAAAKAAAAAAAKAAAAAABKAAAAAADaAAAAAACaAAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAABKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADfgAAAAAAewAAAAADewAAAAACewAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAABfgAAAAAAewAAAAADewAAAAADewAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAAC
           version: 6
         -3,-3:
           ind: -3,-3
-          tiles: XQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABaAAAAAACXQAAAAABfgAAAAAABwAAAAAABwAAAAAIBwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAATgAAAAAATgAAAAAAaAAAAAAATgAAAAAATgAAAAAAaAAAAAABaAAAAAAAaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAACfgAAAAAAJAAAAAABJAAAAAABHwAAAAADHwAAAAADfgAAAAAAegAAAAAAaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABHwAAAAACHwAAAAACfgAAAAAAegAAAAAAaAAAAAAAXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADHwAAAAAAHwAAAAABfgAAAAAAegAAAAABTgAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAAAfgAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAADBwAAAAAABwAAAAAJBwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAADfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACXQAAAAACTgAAAAACXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABXQAAAAACaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAATgAAAAABXQAAAAABXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAABTgAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAACaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABKAAAAAADKAAAAAADKAAAAAAAKAAAAAADKAAAAAADKAAAAAADKAAAAAABKAAAAAACaAAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABKAAAAAABKAAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAB
+          tiles: XQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAADaAAAAAAAXQAAAAABfgAAAAAABwAAAAALBwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAATgAAAAACTgAAAAACaAAAAAACTgAAAAAATgAAAAABaAAAAAAAaAAAAAACaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAJAAAAAACJAAAAAABHwAAAAACHwAAAAAAfgAAAAAAegAAAAACaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACHwAAAAACHwAAAAACfgAAAAAAegAAAAACaAAAAAADXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACHwAAAAACHwAAAAAAfgAAAAAAegAAAAAATgAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAADfgAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAKBwAAAAAGBwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAADfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABXQAAAAABTgAAAAAAXQAAAAAAfgAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAATgAAAAAAXQAAAAACXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAADTgAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAADaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAACKAAAAAAAKAAAAAABKAAAAAABKAAAAAACaAAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAABKAAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAA
           version: 6
         -4,0:
           ind: -4,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAAAXQAAAAACZQAAAAAAZQAAAAAAZQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAACaAAAAAAATgAAAAADTgAAAAAAaAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAAAXQAAAAADXQAAAAAAZQAAAAADZQAAAAACZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABJAAAAAABJAAAAAAAJAAAAAADJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADXQAAAAAAXQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAXQAAAAAAJAAAAAADJAAAAAABJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAACXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAJAAAAAABJAAAAAAAJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAACXQAAAAADXQAAAAACZQAAAAADZQAAAAADZQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABaAAAAAABTgAAAAACTgAAAAADaAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAADXQAAAAACZQAAAAADZQAAAAABZQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAADJAAAAAABJAAAAAADJAAAAAABJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABXQAAAAADXQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAAAXQAAAAACJAAAAAACJAAAAAABJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAJAAAAAADJAAAAAAAJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -4,-1:
           ind: -4,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAADXQAAAAABfgAAAAAAHwAAAAADHwAAAAABHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAHwAAAAABHwAAAAABHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAACXQAAAAAAXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAACXQAAAAACfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAABXQAAAAADfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABXQAAAAADJAAAAAADJAAAAAAAJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABXQAAAAABXQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAAAJAAAAAABJAAAAAADJAAAAAABJAAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAABXQAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAADfgAAAAAAHwAAAAACHwAAAAADHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAADXQAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADXQAAAAACJAAAAAAAJAAAAAABJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABXQAAAAAAXQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABJAAAAAABJAAAAAABJAAAAAAAJAAAAAAC
           version: 6
         -4,-2:
           ind: -4,-2
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABJAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAXQAAAAABaAAAAAAAJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAJAAAAAADHwAAAAADHwAAAAADHwAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAXQAAAAADaAAAAAAAJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAXQAAAAADaAAAAAAAJAAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAAAHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABaAAAAAACJAAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAACHwAAAAADfgAAAAAAaAAAAAABaAAAAAACaAAAAAABaAAAAAACaAAAAAACXQAAAAAAaAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAADfgAAAAAAaAAAAAABaAAAAAAAaAAAAAABaAAAAAACaAAAAAAAXQAAAAACaAAAAAADaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAABaAAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACaAAAAAACaAAAAAADaAAAAAAAaAAAAAAAaAAAAAACfQAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAD
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABJAAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAXQAAAAAAaAAAAAADJAAAAAABAwAAAAAAfgAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAABfgAAAAAAXQAAAAACaAAAAAADJAAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAADHwAAAAADHwAAAAACfgAAAAAAXQAAAAADaAAAAAAAJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAABHwAAAAABfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAXQAAAAAAaAAAAAABJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAACHwAAAAADfgAAAAAAaAAAAAADaAAAAAACaAAAAAADaAAAAAADaAAAAAACXQAAAAACaAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAACfgAAAAAAaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAADXQAAAAAAaAAAAAACaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAABaAAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADaAAAAAADaAAAAAADaAAAAAACaAAAAAABaAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAABAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAACfgAAAAAAXQAAAAACXQAAAAACXQAAAAAB
           version: 6
         -4,-3:
           ind: -4,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAABaAAAAAAAaAAAAAADTgAAAAADTgAAAAAAaAAAAAAATgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXgAAAAAAXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXgAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXgAAAAAAXgAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACYQAAAAAAYQAAAAAEXgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAACaAAAAAABTgAAAAACTgAAAAADaAAAAAACTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXgAAAAABXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXgAAAAABXgAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAYQAAAAAEYQAAAAADXgAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAD
           version: 6
         2,0:
           ind: 2,0
-          tiles: HwAAAAACHwAAAAADHwAAAAACfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAABaAAAAAABXQAAAAABdQAAAAABdQAAAAAAdQAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAACJAAAAAAAXQAAAAAAXQAAAAADXQAAAAADaAAAAAACXQAAAAAAXQAAAAADTgAAAAACXQAAAAAAdQAAAAACdQAAAAACdQAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAACTgAAAAABTgAAAAACaAAAAAAAaAAAAAAAaAAAAAACTgAAAAADTgAAAAABXQAAAAADdQAAAAACdQAAAAACaAAAAAADfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAaAAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAdQAAAAACdQAAAAAAdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABcAAAAAABcAAAAAAAcAAAAAACcAAAAAACcAAAAAACfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAcAAAAAABcAAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAdQAAAAAAdQAAAAADcAAAAAAAcAAAAAAAcAAAAAABcAAAAAABcAAAAAADdQAAAAACXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAADdQAAAAACTgAAAAACcAAAAAABdQAAAAAAcAAAAAADTgAAAAABdQAAAAADXQAAAAACXQAAAAABXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAADcAAAAAADcAAAAAABcAAAAAAAcAAAAAADdQAAAAADXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAACdQAAAAABdQAAAAABdQAAAAAAdAAAAAABdQAAAAAAfgAAAAAAXQAAAAABegAAAAAAegAAAAABegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAACdQAAAAAAdQAAAAACdQAAAAABdAAAAAACJAAAAAADXQAAAAABXQAAAAADegAAAAACegAAAAABegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAcAAAAAAAcAAAAAABcAAAAAABcAAAAAACcAAAAAADcAAAAAAAfgAAAAAAXQAAAAACegAAAAABegAAAAADegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADJAAAAAACHwAAAAAAJAAAAAAAfgAAAAAAXQAAAAACegAAAAADegAAAAABegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAADTwAAAAAATwAAAAAA
+          tiles: HwAAAAABHwAAAAABHwAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAACfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAACaAAAAAADXQAAAAABdQAAAAACdQAAAAABdQAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABJAAAAAADXQAAAAACXQAAAAAAXQAAAAAAaAAAAAACXQAAAAABXQAAAAADTgAAAAACXQAAAAACdQAAAAADdQAAAAADdQAAAAADfgAAAAAAaAAAAAADaAAAAAACaAAAAAACaAAAAAABTgAAAAABTgAAAAABaAAAAAACaAAAAAADaAAAAAADTgAAAAABTgAAAAACXQAAAAADdQAAAAACdQAAAAABaAAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAaAAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAABdQAAAAACdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAAAcAAAAAAAcAAAAAACcAAAAAADcAAAAAACcAAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAcAAAAAABcAAAAAACcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAdQAAAAAAdQAAAAABcAAAAAABcAAAAAABcAAAAAAAcAAAAAADcAAAAAABdQAAAAADXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAAAdQAAAAAATgAAAAADcAAAAAAAdQAAAAAAcAAAAAAATgAAAAADdQAAAAACXQAAAAABXQAAAAADXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACcAAAAAACcAAAAAABcAAAAAADcAAAAAABcAAAAAADdQAAAAABXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdAAAAAADdQAAAAAAdQAAAAABdQAAAAACdAAAAAABdQAAAAAAfgAAAAAAXQAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdAAAAAADdQAAAAABdQAAAAADdQAAAAABdAAAAAADJAAAAAACXQAAAAAAXQAAAAACegAAAAADegAAAAACegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACcAAAAAABcAAAAAADcAAAAAACcAAAAAABcAAAAAAAcAAAAAAAfgAAAAAAXQAAAAACegAAAAACegAAAAACegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABJAAAAAABHwAAAAACJAAAAAABfgAAAAAAXQAAAAADegAAAAAAegAAAAACegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAADTwAAAAAATwAAAAAA
           version: 6
         -5,-2:
           ind: -5,-2
@@ -221,71 +221,71 @@ entities:
           version: 6
         0,2:
           ind: 0,2
-          tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAABHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAdAAAAAACdAAAAAACdQAAAAADfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAABHwAAAAADHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAABHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAdAAAAAADdAAAAAACdQAAAAABfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAADHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAACHwAAAAADHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,2:
           ind: -1,2
-          tiles: HwAAAAAAHwAAAAAAewAAAAADewAAAAADewAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAABJAAAAAADJAAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAHwAAAAACewAAAAACewAAAAACewAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAABHwAAAAAAHwAAAAADfgAAAAAAHwAAAAACHwAAAAABHwAAAAADfgAAAAAAHwAAAAABewAAAAADewAAAAABewAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAABXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACHwAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdAAAAAADdAAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAACgQAAAAAAHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAJAAAAAACJAAAAAABJAAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAXQAAAAABXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAAA
+          tiles: HwAAAAABHwAAAAAAewAAAAADewAAAAAAewAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABJAAAAAABJAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAHwAAAAACewAAAAABewAAAAABewAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAADHwAAAAACHwAAAAABfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAHwAAAAABewAAAAAAewAAAAABewAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAADHwAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABHwAAAAABXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAHwAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAADdAAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAgQAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAJAAAAAAAJAAAAAACJAAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAAD
           version: 6
         -2,2:
           ind: -2,2
-          tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADXQAAAAACfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABXQAAAAACfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAADHwAAAAACHwAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAACAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,3:
           ind: -1,3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAJAAAAAABXQAAAAABXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADHwAAAAABHwAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACJAAAAAADXQAAAAACXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACHwAAAAABHwAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,3:
           ind: 0,3
-          tiles: XQAAAAAAHwAAAAABHwAAAAACJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAABHwAAAAABXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XQAAAAABHwAAAAAAHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAACHwAAAAAAXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         2,1:
           ind: 2,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAACTwAAAAAATwAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACTgAAAAADTgAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAATgAAAAADTgAAAAACHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAAAaAAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADJAAAAAADTwAAAAAATwAAAAAAfgAAAAAAJAAAAAADHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACTgAAAAACTgAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAATgAAAAABTgAAAAADHwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAABaAAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         3,0:
           ind: 3,0
-          tiles: fgAAAAAAdQAAAAACdQAAAAACdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAADfgAAAAAAdQAAAAADdQAAAAACdQAAAAACcAAAAAABdQAAAAACcAAAAAABfgAAAAAAcAAAAAACcAAAAAAAdQAAAAADdQAAAAAAdQAAAAABfgAAAAAAcAAAAAACdQAAAAACdQAAAAABdQAAAAADdQAAAAAAdQAAAAAAcAAAAAADdQAAAAAAcAAAAAABcAAAAAACcAAAAAAAcAAAAAABdQAAAAABdQAAAAACdQAAAAAAdQAAAAAAdQAAAAADdQAAAAABcAAAAAAAcAAAAAACcAAAAAABdQAAAAAAcAAAAAACdQAAAAABcAAAAAADcAAAAAACcAAAAAACcAAAAAAAdQAAAAABdQAAAAAAdQAAAAAAfgAAAAAAcAAAAAACdQAAAAACdQAAAAABdQAAAAABdQAAAAABdQAAAAACcAAAAAAAdQAAAAACcAAAAAABfgAAAAAAcAAAAAAAcAAAAAADdQAAAAAAdQAAAAADdQAAAAACfgAAAAAAcAAAAAAAcAAAAAADfgAAAAAAdQAAAAADdQAAAAAAdQAAAAAAcAAAAAAAdQAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAADcAAAAAADfgAAAAAAcAAAAAACcAAAAAAAcAAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAABdQAAAAADcAAAAAAAcAAAAAAAcAAAAAACdQAAAAADdQAAAAAAdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdQAAAAADdQAAAAAAcAAAAAADfgAAAAAAcAAAAAACdQAAAAAAdQAAAAACdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAdQAAAAAAcAAAAAAAdQAAAAABcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABfgAAAAAAcAAAAAAAdQAAAAABcAAAAAABfgAAAAAAJAAAAAADHwAAAAABHwAAAAABHwAAAAADHwAAAAADegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAcAAAAAACdQAAAAAAcAAAAAABcAAAAAABcAAAAAABHwAAAAABHwAAAAACHwAAAAADfgAAAAAAegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAACcAAAAAACfgAAAAAAcAAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAAAdQAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdQAAAAABdQAAAAAAdQAAAAABcAAAAAABcAAAAAADcAAAAAABdQAAAAADcAAAAAADcAAAAAACcAAAAAACcAAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdQAAAAAAdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAdQAAAAABdQAAAAABdQAAAAACcAAAAAACfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAdQAAAAAAdQAAAAADdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAABfgAAAAAAdQAAAAADdQAAAAAAdQAAAAABcAAAAAABdQAAAAACcAAAAAACfgAAAAAAcAAAAAADcAAAAAADdQAAAAABdQAAAAADdQAAAAAAfgAAAAAAcAAAAAAAdQAAAAACdQAAAAACdQAAAAACdQAAAAACdQAAAAAAcAAAAAABdQAAAAADcAAAAAACcAAAAAABcAAAAAACcAAAAAACdQAAAAABdQAAAAACdQAAAAADdQAAAAAAdQAAAAABdQAAAAABcAAAAAABcAAAAAAAcAAAAAAAdQAAAAACcAAAAAACdQAAAAADcAAAAAABcAAAAAADcAAAAAACcAAAAAABdQAAAAAAdQAAAAABdQAAAAACfgAAAAAAcAAAAAAAdQAAAAADdQAAAAABdQAAAAACdQAAAAADdQAAAAADcAAAAAACdQAAAAADcAAAAAACfgAAAAAAcAAAAAADcAAAAAACdQAAAAACdQAAAAACdQAAAAAAfgAAAAAAcAAAAAADcAAAAAABfgAAAAAAdQAAAAADdQAAAAADdQAAAAABcAAAAAAAdQAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAACcAAAAAAAfgAAAAAAcAAAAAADcAAAAAADcAAAAAACcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAABdQAAAAABcAAAAAABcAAAAAAAcAAAAAACdQAAAAAAdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAABdQAAAAAAcAAAAAABfgAAAAAAcAAAAAADdQAAAAAAdQAAAAACdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABdQAAAAABcAAAAAABdQAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABfgAAAAAAcAAAAAABdQAAAAADcAAAAAACfgAAAAAAJAAAAAABHwAAAAAAHwAAAAABHwAAAAADHwAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAcAAAAAADdQAAAAABcAAAAAADcAAAAAAAcAAAAAACHwAAAAACHwAAAAABHwAAAAADfgAAAAAAegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAAAcAAAAAACfgAAAAAAcAAAAAADHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAABdQAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdQAAAAAAdQAAAAADdQAAAAAAcAAAAAAAcAAAAAACcAAAAAACdQAAAAADcAAAAAADcAAAAAACcAAAAAAAcAAAAAADcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdQAAAAABdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADdQAAAAAAdQAAAAAAdQAAAAADcAAAAAADfgAAAAAAfgAAAAAA
           version: 6
         3,1:
           ind: 3,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAACdQAAAAACdQAAAAACcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAABcAAAAAACcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAegAAAAAAegAAAAADegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAXgAAAAABZAAAAAAAXQAAAAABXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAABdQAAAAAAdQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAABcAAAAAACcAAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAegAAAAAAegAAAAACegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAXgAAAAABZAAAAAAAXQAAAAADXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAXQAAAAADXQAAAAABXgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAABfgAAAAAAegAAAAAAegAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -4,-4:
           ind: -4,-4
-          tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABJAAAAAADJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAADJAAAAAABJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAABHwAAAAAAHwAAAAABHwAAAAADJAAAAAAAJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAADHwAAAAADJAAAAAACJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAACHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAAAHwAAAAADHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADTgAAAAADXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAADfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA
+          tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAACJAAAAAABJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAADJAAAAAABJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAADHwAAAAADHwAAAAAAHwAAAAABJAAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAABJAAAAAACJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAACHwAAAAABHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAABHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAATgAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA
           version: 6
         -3,-4:
           ind: -3,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAADJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAABJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAADHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAADHwAAAAAAHwAAAAADHwAAAAAAHwAAAAAAJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABHwAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAACJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADfgAAAAAAJAAAAAABJAAAAAACJAAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAABfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAABfgAAAAAABwAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAACHwAAAAACHwAAAAABHwAAAAABHwAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAACHwAAAAACHwAAAAABHwAAAAACHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAADJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAJAAAAAACJAAAAAAAJAAAAAABfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAAAfgAAAAAABwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAABfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAADfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -4,-5:
           ind: -4,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAABHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -3,-5:
           ind: -3,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAA
           version: 6
         3,-1:
           ind: 3,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAACHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAACHwAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAABfgAAAAAAXQAAAAACHwAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAXQAAAAABJAAAAAABJAAAAAAAJAAAAAABJAAAAAACJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAAAJAAAAAADJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAABdQAAAAAAdQAAAAABcAAAAAACfgAAAAAAdQAAAAADdQAAAAAAfgAAAAAAcAAAAAAAcAAAAAABcAAAAAABbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACdQAAAAACcAAAAAADcAAAAAADcAAAAAADdQAAAAAAdQAAAAABfgAAAAAAcAAAAAABdQAAAAACdQAAAAACdQAAAAADcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAAAdQAAAAACcAAAAAABcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAADdQAAAAADdQAAAAADcAAAAAACfgAAAAAAfgAAAAAAcAAAAAADdQAAAAADdQAAAAACdQAAAAACcAAAAAADcAAAAAAAdQAAAAABcAAAAAAAcAAAAAABcAAAAAABaAAAAAACaAAAAAABaAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAACdQAAAAADcAAAAAADcAAAAAACcAAAAAADdQAAAAAAcAAAAAABcAAAAAADcAAAAAACaAAAAAADaAAAAAAAaAAAAAACcAAAAAADfgAAAAAAfgAAAAAAcAAAAAACcAAAAAADdQAAAAAAcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAADdQAAAAAAdQAAAAAAcAAAAAADfgAAAAAAdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAADdQAAAAACdQAAAAACcAAAAAAAcAAAAAABdQAAAAADdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAACHwAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADHwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAXQAAAAADJAAAAAABJAAAAAACJAAAAAABJAAAAAADJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAACJAAAAAADJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAABdQAAAAABdQAAAAACcAAAAAABfgAAAAAAdQAAAAAAdQAAAAABfgAAAAAAcAAAAAABcAAAAAADcAAAAAABbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAAAdQAAAAAAcAAAAAACcAAAAAADcAAAAAAAdQAAAAACdQAAAAACfgAAAAAAcAAAAAAAdQAAAAADdQAAAAABdQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAADdQAAAAABcAAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAADdQAAAAAAdQAAAAACcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAACdQAAAAADdQAAAAADcAAAAAACcAAAAAABdQAAAAABcAAAAAACcAAAAAACcAAAAAADaAAAAAAAaAAAAAABaAAAAAABcAAAAAADfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAACdQAAAAACcAAAAAAAcAAAAAACcAAAAAABdQAAAAADcAAAAAABcAAAAAAAcAAAAAABaAAAAAABaAAAAAADaAAAAAADcAAAAAABfgAAAAAAfgAAAAAAcAAAAAACcAAAAAAAdQAAAAADcAAAAAABcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAAAdQAAAAABdQAAAAABcAAAAAADfgAAAAAAdQAAAAADdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAAAdQAAAAAAdQAAAAABcAAAAAADcAAAAAACdQAAAAACdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         4,0:
           ind: 4,0
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         4,-1:
           ind: 4,-1
-          tiles: XQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAACfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABaAAAAAACaAAAAAABfgAAAAAAXQAAAAADbQAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAATgAAAAABXQAAAAADfgAAAAAAaAAAAAADaAAAAAAAaAAAAAADaAAAAAACaAAAAAAAfgAAAAAAXQAAAAABbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAACaAAAAAACfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAAAXQAAAAACXQAAAAACaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAADfgAAAAAAaAAAAAACaAAAAAACaAAAAAABaAAAAAABaAAAAAADfgAAAAAAXQAAAAABbQAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAATgAAAAABXQAAAAACfgAAAAAAaAAAAAADaAAAAAADaAAAAAABaAAAAAAAaAAAAAABfgAAAAAAXQAAAAADbQAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADaAAAAAABaAAAAAABaAAAAAADaAAAAAAAaAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAaAAAAAABaAAAAAABaAAAAAAAaAAAAAAAaAAAAAACfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAADXQAAAAAAXQAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         4,1:
           ind: 4,1
-          tiles: fgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAggAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAABfgAAAAAAgQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAggAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         4,-2:
           ind: 4,-2
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAJAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADJAAAAAAAJAAAAAAAJAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABJAAAAAAAHwAAAAADXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABegAAAAADegAAAAACegAAAAABXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAaAAAAAACXQAAAAAAegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADegAAAAADegAAAAABegAAAAADXQAAAAADXQAAAAAAJAAAAAACfgAAAAAAaAAAAAACXQAAAAABegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACegAAAAABegAAAAACegAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAAAJAAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAbQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACbQAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAbQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADJAAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAJAAAAAACJAAAAAACJAAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAJAAAAAABHwAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAADXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAegAAAAABegAAAAAAegAAAAABXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAaAAAAAACXQAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACegAAAAABegAAAAAAegAAAAAAXQAAAAAAXQAAAAADJAAAAAADfgAAAAAAaAAAAAAAXQAAAAACegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACegAAAAAAegAAAAAAegAAAAADfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAaAAAAAADXQAAAAADJAAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAADbQAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADbQAAAAAAXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAATgAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         5,-1:
           ind: 5,-1
@@ -293,19 +293,19 @@ entities:
           version: 6
         5,-2:
           ind: 5,-2
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAADXQAAAAACaAAAAAACaAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABXQAAAAABXQAAAAACJAAAAAAAJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADXQAAAAACXQAAAAAAJAAAAAACJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACXQAAAAABXQAAAAACaAAAAAAAaAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABXQAAAAABXQAAAAADJAAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADXQAAAAADXQAAAAACJAAAAAAAJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         4,-3:
           ind: 4,-3
-          tiles: CwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: CwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         1,-4:
           ind: 1,-4
-          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAIBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAHBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAABJAAAAAACfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAACHwAAAAABHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAIBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAAfwAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAHwAAAAABHwAAAAADEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAGfwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAKfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAACJAAAAAACfgAAAAAAfgAAAAAABwAAAAAEBwAAAAAABwAAAAACfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAAAHwAAAAABHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAHBwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAEBwAAAAAABwAAAAAIBwAAAAAABwAAAAAGAAAAAAAAAAAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAAfwAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAHwAAAAABHwAAAAACEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAALBwAAAAAHfwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAADfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         0,-4:
           ind: 0,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAJAAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAJAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAJAAAAAAD
           version: 6
         -5,-3:
           ind: -5,-3
@@ -313,7 +313,7 @@ entities:
           version: 6
         -3,2:
           ind: -3,2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-4:
           ind: -1,-4
@@ -325,11 +325,11 @@ entities:
           version: 6
         5,-3:
           ind: 5,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAKfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAGWwAAAAAAWwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,2:
           ind: 1,2
-          tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -2,-4:
           ind: -2,-4
@@ -337,15 +337,15 @@ entities:
           version: 6
         2,-4:
           ind: 2,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAADBwAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAALBwAAAAAABwAAAAAABwAAAAAKBwAAAAAIBwAAAAAABwAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAABBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAEBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAKBwAAAAAABwAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAACBwAAAAAEBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAMBwAAAAAABwAAAAAJBwAAAAAABwAAAAAIfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAABwAAAAAABwAAAAAABwAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAABBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         3,-4:
           ind: 3,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAEfwAAAAAABwAAAAACBwAAAAAAfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAJBwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAADBwAAAAAIBwAAAAAEBwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAAGfwAAAAAABwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAGBwAAAAAKfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAAfwAAAAAABwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAIBwAAAAAGBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAIBwAAAAAABwAAAAAFBwAAAAACBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAEBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA
           version: 6
         4,-4:
           ind: 4,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAFBwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAABfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAACfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAACegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAABfgAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAABfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -1390,6 +1390,9 @@ entities:
             6533: 7,-48
             6534: 8,-48
             6535: 9,-48
+            6985: -32,-3
+            6986: -31,-3
+            6987: -33,-3
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
@@ -1491,6 +1494,10 @@ entities:
             6956: -29,-1
             6971: -35,-1
             6972: -30,-1
+            6988: -34,-5
+            6989: -32,-5
+            6990: -33,-5
+            6991: -31,-5
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -5544,11 +5551,9 @@ entities:
             6905: 58,-24
             6936: 78,-7
             6944: 52,-23
-            6957: -34,-5
-            6958: -33,-4
-            6959: -33,-3
-            6960: -31,-4
-            6961: -31,-2
+            7010: -34,-5
+            7011: -32,-3
+            7012: -34,-2
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -6447,11 +6452,6 @@ entities:
             6953: 3,-22
             6954: 16,23
             6955: 16,25
-            6962: -34,-3
-            6963: -34,-4
-            6964: -33,-5
-            6965: -32,-5
-            6970: -31,-5
             6975: -36,3
             6976: -33,3
             6977: -35,-1
@@ -6462,6 +6462,14 @@ entities:
             6982: -34,1
             6983: -30,1
             6984: -38,2
+            6992: -33,-4
+            6993: -34,-4
+            6994: -32,-3
+            6995: -31,-3
+            6996: -34,-3
+            6997: -34,-2
+            6998: -31,-5
+            6999: -32,-5
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -6520,8 +6528,12 @@ entities:
             6915: 58,-23
             6916: 57,-24
             6946: 54,-23
-            6968: -31,-5
-            6969: -31,-5
+            7000: -33,-5
+            7001: -34,-3
+            7002: -32,-3
+            7003: -33,-4
+            7004: -32,-4
+            7005: -34,-5
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -6578,8 +6590,10 @@ entities:
             6880: -12,-39
             6917: 52,-21
             6918: 57,-22
-            6966: -33,-3
-            6967: -34,-4
+            7006: -31,-5
+            7007: -33,-3
+            7008: -34,-3
+            7009: -34,-4
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -9702,17 +9716,13 @@ entities:
           -9,-3:
             1: 56796
           -8,-2:
-            1: 33008
-            3: 12288
+            1: 45296
           -9,-2:
-            1: 4336
-            3: 49152
+            1: 53488
           -8,-1:
-            3: 34
-            1: 64136
+            1: 64443
           -9,-1:
-            3: 204
-            1: 61713
+            1: 62941
           -8,0:
             1: 65535
           -7,-3:
@@ -13577,6 +13587,16 @@ entities:
       - 21114
       - 21102
       - 21101
+  - uid: 21958
+    components:
+    - type: Transform
+      pos: -32.5,-1.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 21959
+      - 8815
+      - 21957
 - proto: AirCanister
   entities:
   - uid: 4
@@ -13701,21 +13721,6 @@ entities:
     - type: Transform
       pos: 61.5,24.5
       parent: 2
-  - uid: 17379
-    components:
-    - type: MetaData
-      name: Nitrogen room airlock
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-3.5
-      parent: 2
-  - uid: 21376
-    components:
-    - type: MetaData
-      name: Nitrogen room airlock
-    - type: Transform
-      pos: -30.5,-1.5
-      parent: 2
 - proto: AirlockArmoryLocked
   entities:
   - uid: 4316
@@ -14699,7 +14704,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -57.5,4.5
       parent: 2
-  - uid: 3613
+  - uid: 6351
     components:
     - type: MetaData
       name: Evacuation docking airlock
@@ -14709,6 +14714,13 @@ entities:
       parent: 2
 - proto: AirlockExternalGlassShuttleEscape
   entities:
+  - uid: 7393
+    components:
+    - type: MetaData
+      name: Evacuation pod docking airlock
+    - type: Transform
+      pos: -22.5,-48.5
+      parent: 2
   - uid: 15228
     components:
     - type: MetaData
@@ -14733,13 +14745,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 73.5,5.5
       parent: 2
-  - uid: 17525
-    components:
-    - type: MetaData
-      name: Evacuation pod docking airlock
-    - type: Transform
-      pos: -22.5,-48.5
-      parent: 2
   - uid: 21378
     components:
     - type: MetaData
@@ -17536,6 +17541,14 @@ entities:
       deviceLists:
       - 17633
       - 8405
+  - uid: 21959
+    components:
+    - type: Transform
+      pos: -32.5,-2.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 21958
 - proto: AltarHeaven
   entities:
   - uid: 16557
@@ -19295,152 +19308,168 @@ entities:
     - type: Transform
       pos: 43.5,-55.5
       parent: 2
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 107
+  - uid: 730
     components:
     - type: Transform
-      pos: -17.5,11.5
+      rot: -1.5707963267948966 rad
+      pos: -57.5,6.5
       parent: 2
-  - uid: 108
+  - uid: 961
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -14.5,11.5
       parent: 2
-  - uid: 1668
+  - uid: 1651
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 68.5,19.5
+      pos: -17.5,11.5
       parent: 2
-  - uid: 6351
+  - uid: 1653
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -41.5,-58.5
+      rot: 1.5707963267948966 rad
+      pos: 68.5,21.5
       parent: 2
-  - uid: 6376
+  - uid: 1654
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -53.5,-65.5
+      rot: 1.5707963267948966 rad
+      pos: -52.5,-58.5
       parent: 2
-  - uid: 6377
+  - uid: 1668
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -53.5,-58.5
+      pos: -42.5,-65.5
       parent: 2
-  - uid: 6378
+  - uid: 1897
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -41.5,-65.5
+      pos: -42.5,-58.5
       parent: 2
-  - uid: 7393
+  - uid: 2296
     components:
     - type: Transform
-      pos: 26.5,27.5
+      rot: 1.5707963267948966 rad
+      pos: -52.5,-65.5
       parent: 2
-  - uid: 15192
+  - uid: 2299
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 25.5,27.5
       parent: 2
-  - uid: 15193
+  - uid: 2300
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 26.5,27.5
+      parent: 2
+  - uid: 3099
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 29.5,27.5
       parent: 2
-  - uid: 15605
+  - uid: 3228
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 28.5,27.5
       parent: 2
-  - uid: 17258
+  - uid: 3257
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 64.5,-53.5
       parent: 2
-  - uid: 20292
+  - uid: 3613
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 73.5,-2.5
       parent: 2
-  - uid: 20293
+  - uid: 3856
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 73.5,1.5
       parent: 2
-  - uid: 20294
+  - uid: 5519
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 73.5,5.5
       parent: 2
-  - uid: 20295
+  - uid: 5539
     components:
     - type: Transform
-      pos: 68.5,21.5
+      rot: 1.5707963267948966 rad
+      pos: 68.5,19.5
       parent: 2
-  - uid: 21184
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 21128
-  - uid: 21185
+  - uid: 6376
     components:
     - type: Transform
-      pos: -0.5,-3.5
-      parent: 21128
-  - uid: 21186
+      rot: -1.5707963267948966 rad
+      pos: -57.5,4.5
+      parent: 2
+  - uid: 6377
     components:
     - type: Transform
-      pos: -0.5,-4.5
-      parent: 21128
-  - uid: 21187
+      rot: -1.5707963267948966 rad
+      pos: -57.5,-3.5
+      parent: 2
+  - uid: 6378
     components:
     - type: Transform
-      pos: 10.5,-2.5
-      parent: 21128
-  - uid: 21188
+      rot: -1.5707963267948966 rad
+      pos: -57.5,-1.5
+      parent: 2
+  - uid: 8839
     components:
     - type: Transform
-      pos: 10.5,-4.5
-      parent: 21128
-  - uid: 21406
+      pos: -18.5,-48.5
+      parent: 2
+  - uid: 11057
     components:
     - type: Transform
       pos: -22.5,-48.5
       parent: 2
-  - uid: 21407
+  - uid: 21961
     components:
     - type: Transform
-      pos: -18.5,-48.5
-      parent: 2
-  - uid: 21892
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-4.5
+      parent: 21128
+  - uid: 21962
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -57.5,4.5
-      parent: 2
-  - uid: 21893
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-3.5
+      parent: 21128
+  - uid: 21963
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -57.5,6.5
-      parent: 2
-  - uid: 21894
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-2.5
+      parent: 21128
+- proto: AtmosDeviceFanTiny
+  entities:
+  - uid: 21187
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -57.5,-1.5
-      parent: 2
-  - uid: 21895
+      pos: 10.5,-2.5
+      parent: 21128
+  - uid: 21188
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -57.5,-3.5
-      parent: 2
+      pos: 10.5,-4.5
+      parent: 21128
 - proto: AtmosFixBlockerMarker
   entities:
   - uid: 109
@@ -19596,66 +19625,6 @@ entities:
     - type: Transform
       pos: 18.5,-4.5
       parent: 2
-  - uid: 21937
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,-2.5
-      parent: 2
-  - uid: 21938
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-2.5
-      parent: 2
-  - uid: 21939
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-3.5
-      parent: 2
-  - uid: 21940
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,-3.5
-      parent: 2
-  - uid: 21941
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-4.5
-      parent: 2
-  - uid: 21942
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,-4.5
-      parent: 2
-  - uid: 21943
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-4.5
-      parent: 2
-  - uid: 21944
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-4.5
-      parent: 2
-  - uid: 21945
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-2.5
-      parent: 2
-  - uid: 21946
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-3.5
-      parent: 2
 - proto: AtmosFixOxygenMarker
   entities:
   - uid: 121
@@ -24103,25 +24072,15 @@ entities:
     - type: Transform
       pos: -28.5,-4.5
       parent: 2
-  - uid: 11057
-    components:
-    - type: Transform
-      pos: -29.5,-4.5
-      parent: 2
   - uid: 11058
     components:
     - type: Transform
-      pos: -30.5,-4.5
-      parent: 2
-  - uid: 11059
-    components:
-    - type: Transform
-      pos: -31.5,-4.5
+      pos: -29.5,-4.5
       parent: 2
   - uid: 11060
     components:
     - type: Transform
-      pos: -32.5,-4.5
+      pos: -30.5,-4.5
       parent: 2
   - uid: 11061
     components:
@@ -24393,6 +24352,11 @@ entities:
     - type: Transform
       pos: -53.5,2.5
       parent: 2
+  - uid: 11115
+    components:
+    - type: Transform
+      pos: -32.5,-4.5
+      parent: 2
   - uid: 11117
     components:
     - type: Transform
@@ -32868,6 +32832,11 @@ entities:
     - type: Transform
       pos: -11.5,-36.5
       parent: 2
+  - uid: 13179
+    components:
+    - type: Transform
+      pos: -31.5,-4.5
+      parent: 2
   - uid: 13452
     components:
     - type: Transform
@@ -34158,11 +34127,6 @@ entities:
     - type: Transform
       pos: 16.5,16.5
       parent: 2
-  - uid: 14334
-    components:
-    - type: Transform
-      pos: 17.5,16.5
-      parent: 2
   - uid: 14335
     components:
     - type: Transform
@@ -37853,6 +37817,16 @@ entities:
     - type: Transform
       pos: 8.5,-47.5
       parent: 2
+  - uid: 21376
+    components:
+    - type: Transform
+      pos: -33.5,-2.5
+      parent: 2
+  - uid: 21406
+    components:
+    - type: Transform
+      pos: -33.5,-3.5
+      parent: 2
   - uid: 21413
     components:
     - type: Transform
@@ -37873,25 +37847,15 @@ entities:
     - type: Transform
       pos: 45.5,15.5
       parent: 2
-  - uid: 21948
-    components:
-    - type: Transform
-      pos: -30.5,-3.5
-      parent: 2
-  - uid: 21949
-    components:
-    - type: Transform
-      pos: -30.5,-2.5
-      parent: 2
-  - uid: 21950
+  - uid: 21943
     components:
     - type: Transform
-      pos: -30.5,-1.5
+      pos: -33.5,-1.5
       parent: 2
-  - uid: 21951
+  - uid: 21946
     components:
     - type: Transform
-      pos: -30.5,-0.5
+      pos: -33.5,-0.5
       parent: 2
   - uid: 21952
     components:
@@ -51841,6 +51805,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -38.5,16.5
       parent: 2
+  - uid: 11116
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,16.5
+      parent: 2
   - uid: 12460
     components:
     - type: Transform
@@ -52343,12 +52313,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 17.5,12.5
       parent: 2
-  - uid: 13935
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 17.5,16.5
-      parent: 2
   - uid: 13936
     components:
     - type: Transform
@@ -54689,6 +54653,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -13.5,-39.5
       parent: 2
+  - uid: 20292
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-1.5
+      parent: 2
   - uid: 20437
     components:
     - type: Transform
@@ -55729,10 +55699,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,44.5
       parent: 2
-  - uid: 21947
+  - uid: 21941
     components:
     - type: Transform
-      pos: -30.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: -30.5,-1.5
       parent: 2
 - proto: Chair
   entities:
@@ -57353,15 +57324,17 @@ entities:
     - type: Transform
       pos: -30.5,-12.5
       parent: 2
-  - uid: 13181
+  - uid: 13183
     components:
     - type: Transform
-      pos: -32.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: -31.5,-4.5
       parent: 2
-  - uid: 13182
+  - uid: 13191
     components:
     - type: Transform
-      pos: -33.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: -31.5,-3.5
       parent: 2
   - uid: 13862
     components:
@@ -61400,11 +61373,6 @@ entities:
     - type: Transform
       pos: 16.5,15.5
       parent: 2
-  - uid: 15413
-    components:
-    - type: Transform
-      pos: -40.5,-14.5
-      parent: 2
   - uid: 15414
     components:
     - type: Transform
@@ -69059,6 +69027,13 @@ entities:
     - type: Transform
       pos: 63.5,-26.5
       parent: 2
+- proto: ExplosivesSignMed
+  entities:
+  - uid: 21892
+    components:
+    - type: Transform
+      pos: 48.5,16.5
+      parent: 2
 - proto: ExtendedEmergencyOxygenTankFilled
   entities:
   - uid: 996
@@ -74646,6 +74621,16 @@ entities:
     - type: Transform
       pos: 60.5,-5.5
       parent: 2
+- proto: GasFilterFlipped
+  entities:
+  - uid: 21947
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasMinerCarbonDioxide
   entities:
   - uid: 1093
@@ -74800,6 +74785,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 80.5,-14.5
       parent: 2
+  - uid: 21956
+    components:
+    - type: Transform
+      pos: -30.5,-0.5
+      parent: 2
 - proto: GasPipeBend
   entities:
   - uid: 1113
@@ -74879,6 +74869,14 @@ entities:
     - type: Transform
       pos: 61.5,-4.5
       parent: 2
+  - uid: 8365
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8957
     components:
     - type: Transform
@@ -74901,6 +74899,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: 60.5,-6.5
       parent: 2
+  - uid: 13181
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -30.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 16392
     components:
     - type: Transform
@@ -77156,6 +77162,20 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 79.5,-12.5
       parent: 2
+  - uid: 7797
+    components:
+    - type: Transform
+      pos: -30.5,0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7798
+    components:
+    - type: Transform
+      pos: -30.5,1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 7918
     components:
     - type: Transform
@@ -77195,6 +77215,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 8816
+    components:
+    - type: Transform
+      pos: -32.5,0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8857
     components:
     - type: Transform
@@ -80534,14 +80561,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18274
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -30.5,2.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 18275
     components:
     - type: Transform
@@ -80558,14 +80577,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18277
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -32.5,2.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 18278
     components:
     - type: Transform
@@ -89993,6 +90004,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 21955
+    components:
+    - type: Transform
+      pos: -32.5,1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasPipeTJunction
   entities:
   - uid: 575
@@ -90141,6 +90159,20 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 13240
+    components:
+    - type: Transform
+      pos: -30.5,2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 13935
+    components:
+    - type: Transform
+      pos: -32.5,2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 17684
     components:
     - type: Transform
@@ -91919,12 +91951,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 24.5,-14.5
       parent: 2
-  - uid: 2300
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-4.5
-      parent: 2
   - uid: 5522
     components:
     - type: Transform
@@ -92155,6 +92181,15 @@ entities:
       - 4744
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 8815
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-1.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 21958
   - uid: 9034
     components:
     - type: Transform
@@ -92163,11 +92198,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 13175
-    components:
-    - type: Transform
-      pos: -33.5,-3.5
-      parent: 2
   - uid: 17707
     components:
     - type: Transform
@@ -94302,6 +94332,15 @@ entities:
       - 21113
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 21957
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-1.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 21958
 - proto: GasVolumePump
   entities:
   - uid: 9163
@@ -94396,6 +94435,12 @@ entities:
       parent: 2
 - proto: Grille
   entities:
+  - uid: 108
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-2.5
+      parent: 2
   - uid: 759
     components:
     - type: Transform
@@ -95469,21 +95514,11 @@ entities:
     - type: Transform
       pos: -33.5,-37.5
       parent: 2
-  - uid: 1653
-    components:
-    - type: Transform
-      pos: -33.5,-1.5
-      parent: 2
   - uid: 2012
     components:
     - type: Transform
       pos: 37.5,-31.5
       parent: 2
-  - uid: 2299
-    components:
-    - type: Transform
-      pos: -34.5,-2.5
-      parent: 2
   - uid: 2700
     components:
     - type: Transform
@@ -95494,11 +95529,6 @@ entities:
     - type: Transform
       pos: -3.5,22.5
       parent: 2
-  - uid: 3257
-    components:
-    - type: Transform
-      pos: -29.5,-2.5
-      parent: 2
   - uid: 3329
     components:
     - type: Transform
@@ -96959,15 +96989,11 @@ entities:
     - type: Transform
       pos: -13.5,-41.5
       parent: 2
-  - uid: 13176
-    components:
-    - type: Transform
-      pos: -32.5,-1.5
-      parent: 2
-  - uid: 13179
+  - uid: 13182
     components:
     - type: Transform
-      pos: -31.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: -34.5,-3.5
       parent: 2
   - uid: 14852
     components:
@@ -98909,6 +98935,18 @@ entities:
     - type: Transform
       pos: -42.5,28.5
       parent: 2
+  - uid: 21942
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-3.5
+      parent: 2
+  - uid: 21945
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,-2.5
+      parent: 2
 - proto: GrilleBroken
   entities:
   - uid: 15037
@@ -102723,11 +102761,6 @@ entities:
     - type: Transform
       pos: 23.5,-17.5
       parent: 2
-  - uid: 1897
-    components:
-    - type: Transform
-      pos: -33.5,-4.5
-      parent: 2
   - uid: 6386
     components:
     - type: Transform
@@ -103097,6 +103130,13 @@ entities:
           ents:
           - 7948
     - type: InsideEntityStorage
+- proto: PackPaperRollingFilters
+  entities:
+  - uid: 7157
+    components:
+    - type: Transform
+      pos: -4.659782,40.34784
+      parent: 2
 - proto: Paper
   entities:
   - uid: 1521
@@ -103282,6 +103322,18 @@ entities:
     - type: Transform
       pos: 27.520927,-44.445698
       parent: 2
+  - uid: 21960
+    components:
+    - type: Transform
+      pos: -30.522171,-4.355038
+      parent: 2
+    - type: Paper
+      content: >-
+        [bold] As the air alarm is currently not set up, please follow these basic setup instructions:[/bold]
+
+        - Enable all gas filters under "Scrubbers", except for Nitrogen.
+
+        - Ensure that the mode is on filtering, with widenet and scrubbing enabled.
 - proto: PaperBin10
   entities:
   - uid: 1527
@@ -104025,16 +104077,41 @@ entities:
       parent: 2
 - proto: PortableGeneratorJrPacman
   entities:
+  - uid: 732
+    components:
+    - type: Transform
+      pos: 58.5,-27.5
+      parent: 2
   - uid: 4914
     components:
     - type: Transform
       pos: 15.5,-21.5
       parent: 2
+  - uid: 5923
+    components:
+    - type: Transform
+      pos: 70.5,6.5
+      parent: 2
+  - uid: 6008
+    components:
+    - type: Transform
+      pos: -65.5,-26.5
+      parent: 2
+  - uid: 8364
+    components:
+    - type: Transform
+      pos: 5.5,-40.5
+      parent: 2
   - uid: 11657
     components:
     - type: Transform
       pos: 72.5,-4.5
       parent: 2
+  - uid: 13239
+    components:
+    - type: Transform
+      pos: -40.5,-14.5
+      parent: 2
   - uid: 15095
     components:
     - type: Transform
@@ -105605,12 +105682,6 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 3099
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 29.5,-37.5
-      parent: 2
   - uid: 3256
     components:
     - type: Transform
@@ -106949,6 +107020,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 58.5,-23.5
       parent: 2
+  - uid: 17525
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-4.5
+      parent: 2
   - uid: 17538
     components:
     - type: Transform
@@ -107220,23 +107297,17 @@ entities:
     - type: Transform
       pos: -12.5,-36.5
       parent: 2
-  - uid: 13177
+  - uid: 14224
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -33.5,-3.5
+      rot: -1.5707963267948966 rad
+      pos: 37.5,14.5
       parent: 2
-  - uid: 13183
+  - uid: 14334
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -31.5,-0.5
-      parent: 2
-  - uid: 14224
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 37.5,14.5
+      pos: -34.5,-0.5
       parent: 2
   - uid: 14851
     components:
@@ -107273,6 +107344,12 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 15192
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-0.5
+      parent: 2
   - uid: 15250
     components:
     - type: Transform
@@ -107472,6 +107549,12 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 18274
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,-37.5
+      parent: 2
   - uid: 20386
     components:
     - type: Transform
@@ -110454,18 +110537,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -40.5,-0.5
       parent: 2
-  - uid: 8815
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-5.5
-      parent: 2
-  - uid: 8816
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,-5.5
-      parent: 2
   - uid: 8817
     components:
     - type: Transform
@@ -110598,12 +110669,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,26.5
       parent: 2
-  - uid: 8839
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 15.5,22.5
-      parent: 2
   - uid: 8840
     components:
     - type: Transform
@@ -111047,6 +111112,12 @@ entities:
     - type: Transform
       pos: -8.5,-24.5
       parent: 2
+  - uid: 15605
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,-5.5
+      parent: 2
   - uid: 15976
     components:
     - type: Transform
@@ -111082,6 +111153,12 @@ entities:
     - type: Transform
       pos: 58.5,-8.5
       parent: 2
+  - uid: 20294
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-5.5
+      parent: 2
   - uid: 21863
     components:
     - type: Transform
@@ -111135,6 +111212,11 @@ entities:
       parent: 2
 - proto: RandomSpawner
   entities:
+  - uid: 107
+    components:
+    - type: Transform
+      pos: -33.5,-4.5
+      parent: 2
   - uid: 1921
     components:
     - type: Transform
@@ -111823,16 +111905,6 @@ entities:
       parent: 2
 - proto: ReinforcedWindow
   entities:
-  - uid: 730
-    components:
-    - type: Transform
-      pos: -34.5,-2.5
-      parent: 2
-  - uid: 732
-    components:
-    - type: Transform
-      pos: -32.5,-1.5
-      parent: 2
   - uid: 758
     components:
     - type: Transform
@@ -111843,11 +111915,6 @@ entities:
     - type: Transform
       pos: -19.5,-47.5
       parent: 2
-  - uid: 961
-    components:
-    - type: Transform
-      pos: -33.5,-1.5
-      parent: 2
   - uid: 1963
     components:
     - type: Transform
@@ -113511,16 +113578,6 @@ entities:
     - type: Transform
       pos: 41.5,19.5
       parent: 2
-  - uid: 13239
-    components:
-    - type: Transform
-      pos: -31.5,-2.5
-      parent: 2
-  - uid: 13240
-    components:
-    - type: Transform
-      pos: -29.5,-2.5
-      parent: 2
   - uid: 13965
     components:
     - type: Transform
@@ -113673,6 +113730,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 73.5,0.5
       parent: 2
+  - uid: 15413
+    components:
+    - type: Transform
+      pos: -34.5,-3.5
+      parent: 2
   - uid: 15869
     components:
     - type: Transform
@@ -113886,6 +113948,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 64.5,-52.5
       parent: 2
+  - uid: 18277
+    components:
+    - type: Transform
+      pos: -34.5,-2.5
+      parent: 2
   - uid: 19794
     components:
     - type: Transform
@@ -113913,6 +113980,11 @@ entities:
     - type: Transform
       pos: 80.5,-36.5
       parent: 2
+  - uid: 20815
+    components:
+    - type: Transform
+      pos: -29.5,-3.5
+      parent: 2
   - uid: 20881
     components:
     - type: Transform
@@ -113957,6 +114029,11 @@ entities:
     - type: Transform
       pos: -21.5,-46.5
       parent: 2
+  - uid: 21944
+    components:
+    - type: Transform
+      pos: -29.5,-2.5
+      parent: 2
 - proto: RemoteSignaller
   entities:
   - uid: 3270
@@ -114159,6 +114236,11 @@ entities:
       rot: 4.71238898038469 rad
       pos: 30.5,-24.5
       parent: 2
+  - uid: 20293
+    components:
+    - type: Transform
+      pos: -31.5,-5.5
+      parent: 2
   - uid: 20311
     components:
     - type: Transform
@@ -114264,11 +114346,6 @@ entities:
     - type: Transform
       pos: -49.5,-5.5
       parent: 2
-  - uid: 20815
-    components:
-    - type: Transform
-      pos: -30.5,-5.5
-      parent: 2
   - uid: 20816
     components:
     - type: Transform
@@ -115132,16 +115209,16 @@ entities:
       parent: 21128
 - proto: SignAi
   entities:
-  - uid: 7797
+  - uid: 21407
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: 17.5,-41.5
       parent: 2
-  - uid: 7798
+- proto: SignAiUpload
+  entities:
+  - uid: 21887
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: 20.5,-41.5
       parent: 2
 - proto: SignalButton
@@ -115256,6 +115333,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: 50.5,-2.5
       parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        6514:
+        - Pressed: Open
+        6515:
+        - Pressed: Open
+        6516:
+        - Pressed: Open
 - proto: SignalButtonDirectional
   entities:
   - uid: 2100
@@ -116009,8 +116094,6 @@ entities:
     - type: Transform
       pos: 15.5,-10.5
       parent: 2
-- proto: SignAtmosMinsky
-  entities:
   - uid: 8347
     components:
     - type: Transform
@@ -116030,6 +116113,13 @@ entities:
     - type: Transform
       pos: 52.5,15.5
       parent: 2
+- proto: SignBiohazardMed
+  entities:
+  - uid: 21893
+    components:
+    - type: Transform
+      pos: 47.5,10.5
+      parent: 2
 - proto: SignBridge
   entities:
   - uid: 6813
@@ -116044,29 +116134,32 @@ entities:
     - type: Transform
       pos: 22.5,9.5
       parent: 2
-- proto: SignChapel
+- proto: SignCargoDock
   entities:
-  - uid: 2082
+  - uid: 21894
     components:
     - type: Transform
-      pos: -25.5,-32.5
+      pos: 30.5,24.5
       parent: 2
-- proto: SignChem
+  - uid: 21895
+    components:
+    - type: Transform
+      pos: 24.5,24.5
+      parent: 2
+- proto: SignChapel
   entities:
-  - uid: 6008
+  - uid: 2082
     components:
     - type: Transform
-      pos: 47.5,10.5
+      pos: -25.5,-32.5
       parent: 2
-- proto: SignChemistry1
+- proto: SignChem
   entities:
   - uid: 5964
     components:
     - type: Transform
       pos: 41.5,10.5
       parent: 2
-- proto: SignChemistry2
-  entities:
   - uid: 8369
     components:
     - type: Transform
@@ -116546,13 +116639,6 @@ entities:
     - type: Transform
       pos: -54.5,-64.5
       parent: 2
-- proto: SignDrones
-  entities:
-  - uid: 4375
-    components:
-    - type: Transform
-      pos: 31.5,1.5
-      parent: 2
 - proto: SignElectricalMed
   entities:
   - uid: 6817
@@ -116779,10 +116865,12 @@ entities:
     - type: Transform
       pos: 22.5,16.5
       parent: 2
-  - uid: 8364
+- proto: SignMaterials
+  entities:
+  - uid: 4375
     components:
     - type: Transform
-      pos: 28.5,16.5
+      pos: 31.5,1.5
       parent: 2
 - proto: SignMedical
   entities:
@@ -116791,19 +116879,6 @@ entities:
     - type: Transform
       pos: 44.5,0.5
       parent: 2
-- proto: SignMinerDock
-  entities:
-  - uid: 5519
-    components:
-    - type: Transform
-      pos: 24.5,24.5
-      parent: 2
-  - uid: 5539
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,24.5
-      parent: 2
 - proto: SignMorgue
   entities:
   - uid: 6665
@@ -116922,12 +116997,19 @@ entities:
       rot: 3.141592653589793 rad
       pos: -27.505127,-11.735416
       parent: 2
+- proto: SignRestroom
+  entities:
+  - uid: 20295
+    components:
+    - type: Transform
+      pos: 15.5,22.5
+      parent: 2
 - proto: SignRND
   entities:
-  - uid: 8365
+  - uid: 21928
     components:
     - type: Transform
-      pos: 62.5,-14.5
+      pos: 61.5,-15.5
       parent: 2
 - proto: SignRobo
   entities:
@@ -116944,13 +117026,6 @@ entities:
       pos: 32.5,19.5
       parent: 2
 - proto: SignScience
-  entities:
-  - uid: 7157
-    components:
-    - type: Transform
-      pos: 61.5,-15.5
-      parent: 2
-- proto: SignScience2
   entities:
   - uid: 7158
     components:
@@ -116959,12 +117034,6 @@ entities:
       parent: 2
 - proto: SignSecureMed
   entities:
-  - uid: 5923
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-34.5
-      parent: 2
   - uid: 6827
     components:
     - type: Transform
@@ -117020,6 +117089,11 @@ entities:
     - type: Transform
       pos: 64.5,-48.5
       parent: 2
+  - uid: 21950
+    components:
+    - type: Transform
+      pos: 53.5,-35.5
+      parent: 2
 - proto: SignSecureMedRed
   entities:
   - uid: 6826
@@ -117034,6 +117108,13 @@ entities:
     - type: Transform
       pos: 0.5,22.5
       parent: 2
+- proto: SignServer
+  entities:
+  - uid: 21937
+    components:
+    - type: Transform
+      pos: 71.5,-24.5
+      parent: 2
 - proto: SignShipDock
   entities:
   - uid: 8354
@@ -117078,6 +117159,31 @@ entities:
     - type: Transform
       pos: -5.5,-12.5
       parent: 2
+  - uid: 21938
+    components:
+    - type: Transform
+      pos: -10.5,40.5
+      parent: 2
+  - uid: 21948
+    components:
+    - type: Transform
+      pos: 71.5,-33.5
+      parent: 2
+  - uid: 21951
+    components:
+    - type: Transform
+      pos: -23.5,38.5
+      parent: 2
+  - uid: 21953
+    components:
+    - type: Transform
+      pos: -57.5,-20.5
+      parent: 2
+  - uid: 21954
+    components:
+    - type: Transform
+      pos: 68.5,20.5
+      parent: 2
 - proto: SignSurgery
   entities:
   - uid: 6886
@@ -117107,6 +117213,13 @@ entities:
     - type: Transform
       pos: 40.5,0.5
       parent: 2
+- proto: SignVault
+  entities:
+  - uid: 21949
+    components:
+    - type: Transform
+      pos: 53.5,-34.5
+      parent: 2
 - proto: SignVirology
   entities:
   - uid: 6829
@@ -122171,12 +122284,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 9.5,40.5
       parent: 2
+  - uid: 17379
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-3.5
+      parent: 2
   - uid: 20792
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 8.5,16.5
       parent: 2
+  - uid: 21186
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-4.5
+      parent: 2
   - uid: 21330
     components:
     - type: Transform
@@ -137490,17 +137615,6 @@ entities:
       parent: 21128
 - proto: WallSolid
   entities:
-  - uid: 1654
-    components:
-    - type: Transform
-      pos: -34.5,-1.5
-      parent: 2
-  - uid: 2296
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,-4.5
-      parent: 2
   - uid: 2702
     components:
     - type: Transform
@@ -139978,15 +140092,10 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -32.5,26.5
       parent: 2
-  - uid: 11115
-    components:
-    - type: Transform
-      pos: -31.5,-3.5
-      parent: 2
-  - uid: 11116
+  - uid: 11059
     components:
     - type: Transform
-      pos: -29.5,-1.5
+      pos: -34.5,-4.5
       parent: 2
   - uid: 11655
     components:
@@ -140010,6 +140119,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -32.5,22.5
       parent: 2
+  - uid: 13177
+    components:
+    - type: Transform
+      pos: -34.5,-1.5
+      parent: 2
   - uid: 13745
     components:
     - type: Transform
@@ -140226,6 +140340,11 @@ entities:
     - type: Transform
       pos: 80.5,-32.5
       parent: 2
+  - uid: 21940
+    components:
+    - type: Transform
+      pos: -29.5,-4.5
+      parent: 2
 - proto: WallSolidRust
   entities:
   - uid: 757
@@ -140238,12 +140357,6 @@ entities:
     - type: Transform
       pos: -25.5,-41.5
       parent: 2
-  - uid: 1651
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,-3.5
-      parent: 2
   - uid: 2704
     components:
     - type: Transform
@@ -140856,12 +140969,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -32.5,-5.5
       parent: 2
-  - uid: 3228
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,-3.5
-      parent: 2
   - uid: 3230
     components:
     - type: Transform
@@ -141328,12 +141435,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -46.5,-12.5
       parent: 2
-  - uid: 3856
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-1.5
-      parent: 2
   - uid: 4067
     components:
     - type: Transform
@@ -142147,11 +142248,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -32.5,23.5
       parent: 2
-  - uid: 13191
+  - uid: 13175
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,-4.5
+      pos: -32.5,-1.5
+      parent: 2
+  - uid: 13176
+    components:
+    - type: Transform
+      pos: -29.5,-1.5
       parent: 2
   - uid: 13238
     components:
@@ -143382,6 +143487,29 @@ entities:
       rot: 3.141592653589793 rad
       pos: 65.5,-50.5
       parent: 2
+  - uid: 17258
+    components:
+    - type: Transform
+      pos: -33.5,-2.5
+      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        21184:
+        - DoorStatus: DoorBolt
+  - uid: 21184
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,-1.5
+      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        17258:
+        - DoorStatus: DoorBolt
   - uid: 21321
     components:
     - type: Transform
@@ -144373,6 +144501,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 46.5,16.5
       parent: 2
+  - uid: 15193
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-1.5
+      parent: 2
   - uid: 15404
     components:
     - type: Transform
@@ -144439,6 +144573,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,-39.5
       parent: 2
+  - uid: 21185
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -32.5,-2.5
+      parent: 2
   - uid: 21553
     components:
     - type: Transform
@@ -144487,6 +144627,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 55.5,1.5
       parent: 2
+  - uid: 21939
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-1.5
+      parent: 2
 - proto: WoodDoor
   entities:
   - uid: 3557
@@ -144654,9 +144800,4 @@ entities:
     - type: Transform
       pos: 1.7595062,-8.203196
       parent: 21128
-  - uid: 21928
-    components:
-    - type: Transform
-      pos: -33.683754,-4.75871
-      parent: 2
 ...
diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index 80bce4b9228..c9cd7c1d0a0 100644
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -156995,141 +156995,6 @@ entities:
     - type: Transform
       pos: 98.5,-18.5
       parent: 13329
-  - uid: 20449
-    components:
-    - type: Transform
-      pos: 69.5,-43.5
-      parent: 13329
-  - uid: 20450
-    components:
-    - type: Transform
-      pos: 69.5,-42.5
-      parent: 13329
-  - uid: 20451
-    components:
-    - type: Transform
-      pos: 69.5,-41.5
-      parent: 13329
-  - uid: 20452
-    components:
-    - type: Transform
-      pos: 69.5,-40.5
-      parent: 13329
-  - uid: 20453
-    components:
-    - type: Transform
-      pos: 69.5,-39.5
-      parent: 13329
-  - uid: 20454
-    components:
-    - type: Transform
-      pos: 70.5,-43.5
-      parent: 13329
-  - uid: 20455
-    components:
-    - type: Transform
-      pos: 71.5,-43.5
-      parent: 13329
-  - uid: 20456
-    components:
-    - type: Transform
-      pos: 72.5,-43.5
-      parent: 13329
-  - uid: 20457
-    components:
-    - type: Transform
-      pos: 73.5,-43.5
-      parent: 13329
-  - uid: 20458
-    components:
-    - type: Transform
-      pos: 74.5,-43.5
-      parent: 13329
-  - uid: 20459
-    components:
-    - type: Transform
-      pos: 75.5,-43.5
-      parent: 13329
-  - uid: 20460
-    components:
-    - type: Transform
-      pos: 76.5,-43.5
-      parent: 13329
-  - uid: 20461
-    components:
-    - type: Transform
-      pos: 77.5,-43.5
-      parent: 13329
-  - uid: 20462
-    components:
-    - type: Transform
-      pos: 78.5,-43.5
-      parent: 13329
-  - uid: 20463
-    components:
-    - type: Transform
-      pos: 79.5,-43.5
-      parent: 13329
-  - uid: 20464
-    components:
-    - type: Transform
-      pos: 80.5,-43.5
-      parent: 13329
-  - uid: 20465
-    components:
-    - type: Transform
-      pos: 81.5,-43.5
-      parent: 13329
-  - uid: 20466
-    components:
-    - type: Transform
-      pos: 81.5,-42.5
-      parent: 13329
-  - uid: 20467
-    components:
-    - type: Transform
-      pos: 81.5,-41.5
-      parent: 13329
-  - uid: 20468
-    components:
-    - type: Transform
-      pos: 81.5,-40.5
-      parent: 13329
-  - uid: 20469
-    components:
-    - type: Transform
-      pos: 81.5,-39.5
-      parent: 13329
-  - uid: 20470
-    components:
-    - type: Transform
-      pos: 77.5,-42.5
-      parent: 13329
-  - uid: 20472
-    components:
-    - type: Transform
-      pos: 77.5,-40.5
-      parent: 13329
-  - uid: 20473
-    components:
-    - type: Transform
-      pos: 77.5,-39.5
-      parent: 13329
-  - uid: 20474
-    components:
-    - type: Transform
-      pos: 73.5,-42.5
-      parent: 13329
-  - uid: 20476
-    components:
-    - type: Transform
-      pos: 73.5,-40.5
-      parent: 13329
-  - uid: 20477
-    components:
-    - type: Transform
-      pos: 73.5,-39.5
-      parent: 13329
   - uid: 20506
     components:
     - type: Transform
@@ -157145,136 +157010,6 @@ entities:
     - type: Transform
       pos: 90.5,-41.5
       parent: 13329
-  - uid: 20531
-    components:
-    - type: Transform
-      pos: 90.5,-44.5
-      parent: 13329
-  - uid: 20532
-    components:
-    - type: Transform
-      pos: 91.5,-44.5
-      parent: 13329
-  - uid: 20533
-    components:
-    - type: Transform
-      pos: 92.5,-44.5
-      parent: 13329
-  - uid: 20534
-    components:
-    - type: Transform
-      pos: 93.5,-44.5
-      parent: 13329
-  - uid: 20535
-    components:
-    - type: Transform
-      pos: 94.5,-44.5
-      parent: 13329
-  - uid: 20536
-    components:
-    - type: Transform
-      pos: 94.5,-43.5
-      parent: 13329
-  - uid: 20537
-    components:
-    - type: Transform
-      pos: 94.5,-42.5
-      parent: 13329
-  - uid: 20538
-    components:
-    - type: Transform
-      pos: 94.5,-41.5
-      parent: 13329
-  - uid: 20539
-    components:
-    - type: Transform
-      pos: 94.5,-40.5
-      parent: 13329
-  - uid: 20540
-    components:
-    - type: Transform
-      pos: 94.5,-39.5
-      parent: 13329
-  - uid: 20541
-    components:
-    - type: Transform
-      pos: 94.5,-38.5
-      parent: 13329
-  - uid: 20542
-    components:
-    - type: Transform
-      pos: 94.5,-37.5
-      parent: 13329
-  - uid: 20543
-    components:
-    - type: Transform
-      pos: 94.5,-36.5
-      parent: 13329
-  - uid: 20544
-    components:
-    - type: Transform
-      pos: 94.5,-35.5
-      parent: 13329
-  - uid: 20545
-    components:
-    - type: Transform
-      pos: 94.5,-34.5
-      parent: 13329
-  - uid: 20546
-    components:
-    - type: Transform
-      pos: 94.5,-33.5
-      parent: 13329
-  - uid: 20547
-    components:
-    - type: Transform
-      pos: 94.5,-32.5
-      parent: 13329
-  - uid: 20548
-    components:
-    - type: Transform
-      pos: 93.5,-32.5
-      parent: 13329
-  - uid: 20549
-    components:
-    - type: Transform
-      pos: 91.5,-32.5
-      parent: 13329
-  - uid: 20550
-    components:
-    - type: Transform
-      pos: 90.5,-32.5
-      parent: 13329
-  - uid: 20551
-    components:
-    - type: Transform
-      pos: 93.5,-40.5
-      parent: 13329
-  - uid: 20552
-    components:
-    - type: Transform
-      pos: 93.5,-36.5
-      parent: 13329
-  - uid: 20553
-    components:
-    - type: Transform
-      pos: 91.5,-36.5
-      parent: 13329
-  - uid: 20554
-    components:
-    - type: Transform
-      pos: 90.5,-36.5
-      parent: 13329
-  - uid: 20555
-    components:
-    - type: Transform
-      pos: 91.5,-40.5
-      parent: 13329
-  - uid: 20556
-    components:
-    - type: Transform
-      pos: 90.5,-40.5
-      parent: 13329
   - uid: 20572
     components:
     - type: Transform
diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index 2d0f821d203..35a1740237f 100644
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -608,9 +608,9 @@ entities:
             2919: 2,-44
             2920: 3,-44
             2921: 4,-44
-            3045: 4,-51
-            3049: -4,-48
-            3050: -3,-48
+            3033: 4,-51
+            3037: -4,-48
+            3038: -3,-48
         - node:
             color: '#FFFFFFFF'
             id: BotGreyscale
@@ -651,11 +651,11 @@ entities:
             2265: 39,9
             2896: -14,-38
             2897: -12,-38
-            3035: -5,-54
-            3036: -4,-54
-            3046: -4,-50
-            3047: 4,-49
-            3048: 4,-50
+            3031: -5,-54
+            3032: -4,-54
+            3034: -4,-50
+            3035: 4,-49
+            3036: 4,-50
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkBox
@@ -1001,13 +1001,13 @@ entities:
             id: BrickTileWhiteCornerNe
           decals:
             2433: -40,19
-            2977: -25,-45
-            2978: -26,-43
-            2979: -20,-45
-            2987: -14,-46
-            2989: -20,-49
-            2996: -21,-57
-            3021: -1,-42
+            2973: -25,-45
+            2974: -26,-43
+            2975: -20,-45
+            2983: -14,-46
+            2985: -20,-49
+            2992: -21,-57
+            3017: -1,-42
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerNe
@@ -1040,14 +1040,14 @@ entities:
             2227: 5,-24
             2232: 9,-23
             2437: -44,19
-            2976: -23,-45
-            2985: -16,-45
-            2986: -11,-46
-            2991: -16,-49
-            2999: -15,-57
-            3010: -10,-42
-            3019: 3,-40
-            3020: 1,-42
+            2972: -23,-45
+            2981: -16,-45
+            2982: -11,-46
+            2987: -16,-49
+            2995: -15,-57
+            3006: -10,-42
+            3015: 3,-40
+            3016: 1,-42
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerNw
@@ -1074,14 +1074,14 @@ entities:
           decals:
             1642: 7,-30
             2440: -40,17
-            2974: -26,-41
-            2990: -20,-47
-            2992: -19,-51
-            2998: -21,-55
-            3013: -9,-39
-            3014: -5,-39
-            3015: -4,-38
-            3017: 0,-38
+            2970: -26,-41
+            2986: -20,-47
+            2988: -19,-51
+            2994: -21,-55
+            3009: -9,-39
+            3010: -5,-39
+            3011: -4,-38
+            3013: 0,-38
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerSe
@@ -1109,13 +1109,13 @@ entities:
           decals:
             1641: 5,-30
             2438: -44,17
-            2988: -16,-47
-            2993: -17,-51
-            2997: -15,-55
-            3011: -11,-39
-            3012: -7,-39
-            3016: -2,-38
-            3018: 3,-38
+            2984: -16,-47
+            2989: -17,-51
+            2993: -15,-55
+            3007: -11,-39
+            3008: -7,-39
+            3012: -2,-38
+            3014: 3,-38
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerSw
@@ -1126,7 +1126,7 @@ entities:
             color: '#EFB34196'
             id: BrickTileWhiteEndS
           decals:
-            2984: -20,-40
+            2980: -20,-40
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerNe
@@ -1147,7 +1147,7 @@ entities:
             color: '#EFB34196'
             id: BrickTileWhiteInnerNe
           decals:
-            2980: -26,-45
+            2976: -26,-45
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteInnerNe
@@ -1179,7 +1179,7 @@ entities:
             id: BrickTileWhiteInnerNw
           decals:
             2231: 9,-24
-            3033: 3,-42
+            3029: 3,-42
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteInnerNw
@@ -1302,8 +1302,8 @@ entities:
             2058: -4,-35
             2059: -4,-34
             2442: -40,18
-            2975: -26,-40
-            2981: -26,-44
+            2971: -26,-40
+            2977: -26,-44
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineE
@@ -1368,17 +1368,17 @@ entities:
             2434: -41,19
             2435: -42,19
             2436: -43,19
-            2982: -22,-45
-            2983: -21,-45
-            3022: -9,-42
-            3023: -8,-42
-            3024: -6,-42
-            3025: -7,-42
-            3026: -5,-42
-            3027: -4,-42
-            3028: -3,-42
-            3029: -2,-42
-            3030: 2,-42
+            2978: -22,-45
+            2979: -21,-45
+            3018: -9,-42
+            3019: -8,-42
+            3020: -6,-42
+            3021: -7,-42
+            3022: -5,-42
+            3023: -4,-42
+            3024: -3,-42
+            3025: -2,-42
+            3026: 2,-42
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineN
@@ -1437,10 +1437,10 @@ entities:
             2229: 8,-25
             2439: -43,17
             2441: -42,17
-            2994: -20,-51
-            2995: -16,-51
-            3031: -10,-39
-            3032: -6,-39
+            2990: -20,-51
+            2991: -16,-51
+            3027: -10,-39
+            3028: -6,-39
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineS
@@ -1519,7 +1519,7 @@ entities:
             1643: 9,-26
             2060: -2,-35
             2061: -2,-34
-            3034: 3,-41
+            3030: 3,-41
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineW
@@ -2956,8 +2956,8 @@ entities:
             1428: -16,34
             1492: -5,36
             1493: -16,36
-            2968: -10,-31
-            2969: -10,-32
+            2964: -10,-31
+            2965: -10,-32
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale270
@@ -2966,8 +2966,8 @@ entities:
             525: -5,-3
             2729: -26,-12
             2730: -26,-9
-            2956: -6,-28
-            2957: -6,-29
+            2952: -6,-28
+            2953: -6,-29
         - node:
             color: '#724276FF'
             id: HalfTileOverlayGreyscale270
@@ -2979,8 +2979,8 @@ entities:
             color: '#9FED5896'
             id: HalfTileOverlayGreyscale270
           decals:
-            2966: -12,-28
-            2967: -12,-29
+            2962: -12,-28
+            2963: -12,-29
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale270
@@ -2996,8 +2996,8 @@ entities:
             933: 27,0
             934: 27,1
             935: 27,2
-            2954: -10,-28
-            2955: -10,-29
+            2950: -10,-28
+            2951: -10,-29
         - node:
             color: '#D381C996'
             id: HalfTileOverlayGreyscale270
@@ -3005,14 +3005,14 @@ entities:
             1724: 30,21
             1725: 30,22
             1726: 30,23
-            2952: -8,-28
-            2953: -8,-29
+            2948: -8,-28
+            2949: -8,-29
         - node:
             color: '#D4D4D428'
             id: HalfTileOverlayGreyscale270
           decals:
-            2972: -12,-31
-            2973: -12,-32
+            2968: -12,-31
+            2969: -12,-32
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale270
@@ -3052,8 +3052,8 @@ entities:
             468: -20,-3
             469: -20,-2
             470: -20,-1
-            2950: -6,-31
-            2951: -6,-32
+            2946: -6,-31
+            2947: -6,-32
         - node:
             color: '#EDD75E93'
             id: HalfTileOverlayGreyscale270
@@ -3071,8 +3071,8 @@ entities:
             590: 9,-28
             2889: -14,-49
             2890: -14,-50
-            2944: -8,-32
-            2945: -8,-31
+            2940: -8,-32
+            2941: -8,-31
         - node:
             color: '#334E6DC8'
             id: HalfTileOverlayGreyscale90
@@ -3087,8 +3087,8 @@ entities:
             1429: -15,34
             1494: -15,36
             1495: -4,36
-            2970: -12,-31
-            2971: -12,-32
+            2966: -12,-31
+            2967: -12,-32
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale90
@@ -3101,8 +3101,8 @@ entities:
             549: -15,-5
             2737: -18,-9
             2738: -18,-12
-            2958: -8,-28
-            2959: -8,-29
+            2954: -8,-28
+            2955: -8,-29
         - node:
             color: '#724276FF'
             id: HalfTileOverlayGreyscale90
@@ -3122,16 +3122,16 @@ entities:
             id: HalfTileOverlayGreyscale90
           decals:
             2807: -24,8
-            2964: -14,-28
-            2965: -14,-29
+            2960: -14,-28
+            2961: -14,-29
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale90
           decals:
             564: 5,-1
             1049: 21,-4
-            2962: -12,-28
-            2963: -12,-29
+            2958: -12,-28
+            2959: -12,-29
         - node:
             cleanable: True
             color: '#A4610696'
@@ -3146,8 +3146,8 @@ entities:
             1727: 32,21
             1728: 32,22
             1729: 32,23
-            2960: -10,-28
-            2961: -10,-29
+            2956: -10,-28
+            2957: -10,-29
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale90
@@ -3196,8 +3196,8 @@ entities:
             466: -17,-2
             467: -17,-1
             2341: 14,21
-            2948: -8,-31
-            2949: -8,-32
+            2944: -8,-31
+            2945: -8,-32
         - node:
             color: '#EDD75E93'
             id: HalfTileOverlayGreyscale90
@@ -3218,8 +3218,8 @@ entities:
             593: 12,-28
             2894: -8,-49
             2895: -8,-50
-            2946: -10,-31
-            2947: -10,-32
+            2942: -10,-31
+            2943: -10,-32
         - node:
             color: '#FFFFFFFF'
             id: HatchSmall
@@ -4321,14 +4321,14 @@ entities:
           decals:
             2072: 2,-33
             2876: -8,-51
-            3001: -17,-53
+            2997: -17,-53
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNW
           decals:
             2071: 0,-33
             2878: -14,-51
-            3000: -19,-53
+            2996: -19,-53
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSE
@@ -4338,7 +4338,7 @@ entities:
             2810: 13,12
             2877: -8,-53
             2902: -5,-52
-            3003: -17,-56
+            2999: -17,-56
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSW
@@ -4346,7 +4346,7 @@ entities:
             1732: 3,21
             2069: 0,-35
             2879: -14,-53
-            3002: -19,-56
+            2998: -19,-56
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNE
@@ -4359,7 +4359,7 @@ entities:
           decals:
             1175: 21,-19
             1691: -58,19
-            2934: 1,-52
+            2932: 1,-52
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSE
@@ -4368,7 +4368,7 @@ entities:
             1734: 5,22
             2865: 14,-18
             2866: 14,-19
-            2931: -3,-50
+            2930: -3,-50
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSW
@@ -4378,7 +4378,7 @@ entities:
             1182: 22,-19
             1690: -58,17
             1735: 3,22
-            2932: 1,-50
+            2931: 1,-50
         - node:
             angle: -3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -4440,8 +4440,8 @@ entities:
             2905: -5,-49
             2906: -5,-48
             2925: -3,-51
-            3005: -17,-54
-            3006: -17,-55
+            3001: -17,-54
+            3002: -17,-55
         - node:
             color: '#334E6DC8'
             id: WarnLineGreyscaleE
@@ -4608,7 +4608,7 @@ entities:
             2922: -2,-50
             2923: -1,-50
             2924: 0,-50
-            3009: -18,-56
+            3005: -18,-56
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
@@ -4636,8 +4636,8 @@ entities:
             2423: -47,-10
             2424: -47,-9
             2880: -14,-52
-            3007: -19,-54
-            3008: -19,-55
+            3003: -19,-54
+            3004: -19,-55
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
@@ -4677,20 +4677,20 @@ entities:
             2873: -10,-51
             2874: -12,-51
             2875: -9,-51
-            2927: -2,-52
-            2928: -1,-52
+            2926: -2,-52
+            2927: -1,-52
+            2928: 0,-52
             2929: 0,-52
-            2930: 0,-52
-            2937: -2,-48
-            2938: -1,-48
-            2939: 0,-48
-            2940: 1,-48
-            2941: 2,-48
-            2942: 3,-48
-            2943: 4,-48
-            3004: -18,-53
-            3051: -4,-48
-            3052: -3,-48
+            2933: -2,-48
+            2934: -1,-48
+            2935: 0,-48
+            2936: 1,-48
+            2937: 2,-48
+            2938: 3,-48
+            2939: 4,-48
+            3000: -18,-53
+            3039: -4,-48
+            3040: -3,-48
         - node:
             angle: -3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -10065,6 +10065,17 @@ entities:
     - type: Transform
       pos: -26.5,24.5
       parent: 30
+  - uid: 840
+    components:
+    - type: Transform
+      pos: -50.5,62.5
+      parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        2312:
+        - DoorStatus: DoorBolt
   - uid: 1006
     components:
     - type: Transform
@@ -10140,6 +10151,17 @@ entities:
     - type: Transform
       pos: -25.5,28.5
       parent: 30
+  - uid: 1827
+    components:
+    - type: Transform
+      pos: -46.5,62.5
+      parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1829:
+        - DoorStatus: DoorBolt
   - uid: 2123
     components:
     - type: Transform
@@ -10965,7 +10987,7 @@ entities:
       pos: -20.5,-5.5
       parent: 30
     - type: Door
-      secondsUntilStateChange: -19125.69
+      secondsUntilStateChange: -19887.758
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -11135,17 +11157,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 14.5,13.5
       parent: 30
-- proto: AirlockSecurityGlass
-  entities:
-  - uid: 2312
-    components:
-    - type: Transform
-      pos: -50.5,62.5
-      parent: 30
-    - type: DeviceLinkSource
-      linkedPorts:
-        840:
-        - DoorStatus: DoorBolt
 - proto: AirlockSecurityGlassLocked
   entities:
   - uid: 1696
@@ -11170,11 +11181,6 @@ entities:
     - type: Transform
       pos: -32.5,45.5
       parent: 30
-  - uid: 1829
-    components:
-    - type: Transform
-      pos: -46.5,62.5
-      parent: 30
   - uid: 1873
     components:
     - type: Transform
@@ -11234,15 +11240,6 @@ entities:
       parent: 30
 - proto: AirlockSecurityLocked
   entities:
-  - uid: 840
-    components:
-    - type: Transform
-      pos: -50.5,59.5
-      parent: 30
-    - type: DeviceLinkSource
-      linkedPorts:
-        2312:
-        - DoorStatus: DoorBolt
   - uid: 1057
     components:
     - type: Transform
@@ -11258,16 +11255,33 @@ entities:
     - type: Transform
       pos: -28.5,46.5
       parent: 30
-  - uid: 1827
+  - uid: 1828
+    components:
+    - type: Transform
+      pos: -29.5,55.5
+      parent: 30
+  - uid: 1829
     components:
     - type: Transform
       pos: -46.5,59.5
       parent: 30
-  - uid: 1828
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1827:
+        - DoorStatus: DoorBolt
+  - uid: 2312
     components:
     - type: Transform
-      pos: -29.5,55.5
+      pos: -50.5,59.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        840:
+        - DoorStatus: DoorBolt
   - uid: 13548
     components:
     - type: Transform
@@ -14120,16 +14134,6 @@ entities:
       parent: 30
 - proto: Bookshelf
   entities:
-  - uid: 2356
-    components:
-    - type: Transform
-      pos: -52.5,67.5
-      parent: 30
-  - uid: 2357
-    components:
-    - type: Transform
-      pos: -52.5,66.5
-      parent: 30
   - uid: 12667
     components:
     - type: Transform
@@ -14152,6 +14156,16 @@ entities:
     - type: Transform
       pos: -39.5,-0.5
       parent: 30
+  - uid: 2356
+    components:
+    - type: Transform
+      pos: -52.5,66.5
+      parent: 30
+  - uid: 2357
+    components:
+    - type: Transform
+      pos: -52.5,67.5
+      parent: 30
   - uid: 2917
     components:
     - type: Transform
@@ -52374,20 +52388,20 @@ entities:
       parent: 30
 - proto: ContainmentFieldGenerator
   entities:
-  - uid: 18859
+  - uid: 8026
     components:
     - type: Transform
-      pos: -18.5,-35.5
+      pos: -19.5,-35.5
       parent: 30
-  - uid: 19414
+  - uid: 10654
     components:
     - type: Transform
-      pos: -17.5,-34.5
+      pos: -19.5,-34.5
       parent: 30
-  - uid: 19417
+  - uid: 18859
     components:
     - type: Transform
-      pos: -17.5,-35.5
+      pos: -18.5,-35.5
       parent: 30
   - uid: 19418
     components:
@@ -53226,6 +53240,34 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -74.382675,-63.392025
       parent: 30
+- proto: DefaultStationBeaconAI
+  entities:
+  - uid: 20686
+    components:
+    - type: Transform
+      pos: -0.5,74.5
+      parent: 30
+- proto: DefaultStationBeaconAICore
+  entities:
+  - uid: 20685
+    components:
+    - type: Transform
+      pos: -0.5,83.5
+      parent: 30
+- proto: DefaultStationBeaconAISatellite
+  entities:
+  - uid: 20687
+    components:
+    - type: Transform
+      pos: -0.5,61.5
+      parent: 30
+- proto: DefaultStationBeaconAME
+  entities:
+  - uid: 20688
+    components:
+    - type: Transform
+      pos: -11.5,-48.5
+      parent: 30
 - proto: DefaultStationBeaconAnomalyGenerator
   entities:
   - uid: 20529
@@ -53256,10 +53298,10 @@ entities:
       parent: 30
 - proto: DefaultStationBeaconAtmospherics
   entities:
-  - uid: 20534
+  - uid: 11463
     components:
     - type: Transform
-      pos: 10.5,-29.5
+      pos: 11.5,-24.5
       parent: 30
 - proto: DefaultStationBeaconBar
   entities:
@@ -53310,6 +53352,13 @@ entities:
     - type: Transform
       pos: 15.5,-4.5
       parent: 30
+- proto: DefaultStationBeaconCERoom
+  entities:
+  - uid: 20689
+    components:
+    - type: Transform
+      pos: -7.5,-35.5
+      parent: 30
 - proto: DefaultStationBeaconChapel
   entities:
   - uid: 20543
@@ -53366,6 +53415,13 @@ entities:
     - type: Transform
       pos: 49.5,21.5
       parent: 30
+- proto: DefaultStationBeaconDorms
+  entities:
+  - uid: 20690
+    components:
+    - type: Transform
+      pos: 21.5,36.5
+      parent: 30
 - proto: DefaultStationBeaconEngineering
   entities:
   - uid: 20553
@@ -53380,6 +53436,18 @@ entities:
     - type: Transform
       pos: -52.5,36.5
       parent: 30
+  - uid: 20691
+    components:
+    - type: Transform
+      pos: 25.5,42.5
+      parent: 30
+- proto: DefaultStationBeaconEvac
+  entities:
+  - uid: 20692
+    components:
+    - type: Transform
+      pos: -51.5,16.5
+      parent: 30
 - proto: DefaultStationBeaconEVAStorage
   entities:
   - uid: 20552
@@ -53387,6 +53455,13 @@ entities:
     - type: Transform
       pos: -1.5,23.5
       parent: 30
+- proto: DefaultStationBeaconGravGen
+  entities:
+  - uid: 20693
+    components:
+    - type: Transform
+      pos: 11.5,41.5
+      parent: 30
 - proto: DefaultStationBeaconHOPOffice
   entities:
   - uid: 20554
@@ -53422,18 +53497,27 @@ entities:
     - type: Transform
       pos: -51.5,31.5
       parent: 30
-- proto: DefaultStationBeaconMedbay
+- proto: DefaultStationBeaconLibrary
   entities:
-  - uid: 8026
+  - uid: 20684
     components:
     - type: Transform
-      pos: -22.5,-9.5
+      pos: -62.5,-62.5
       parent: 30
+- proto: DefaultStationBeaconMedbay
+  entities:
   - uid: 20559
     components:
     - type: Transform
       pos: -11.5,-3.5
       parent: 30
+- proto: DefaultStationBeaconMedical
+  entities:
+  - uid: 13319
+    components:
+    - type: Transform
+      pos: -22.5,-9.5
+      parent: 30
 - proto: DefaultStationBeaconMorgue
   entities:
   - uid: 20560
@@ -53448,6 +53532,13 @@ entities:
     - type: Transform
       pos: -48.5,64.5
       parent: 30
+- proto: DefaultStationBeaconPowerBank
+  entities:
+  - uid: 20695
+    components:
+    - type: Transform
+      pos: -8.5,-44.5
+      parent: 30
 - proto: DefaultStationBeaconQMRoom
   entities:
   - uid: 20563
@@ -53483,6 +53574,13 @@ entities:
     - type: Transform
       pos: 31.5,-10.5
       parent: 30
+- proto: DefaultStationBeaconScience
+  entities:
+  - uid: 20696
+    components:
+    - type: Transform
+      pos: 14.5,15.5
+      parent: 30
 - proto: DefaultStationBeaconSecurityCheckpoint
   entities:
   - uid: 7064
@@ -53490,6 +53588,11 @@ entities:
     - type: Transform
       pos: -18.5,-0.5
       parent: 30
+  - uid: 20697
+    components:
+    - type: Transform
+      pos: 13.5,22.5
+      parent: 30
 - proto: DefaultStationBeaconServerRoom
   entities:
   - uid: 20568
@@ -53497,6 +53600,20 @@ entities:
     - type: Transform
       pos: 32.5,14.5
       parent: 30
+- proto: DefaultStationBeaconService
+  entities:
+  - uid: 20698
+    components:
+    - type: Transform
+      pos: -10.5,14.5
+      parent: 30
+- proto: DefaultStationBeaconSingularity
+  entities:
+  - uid: 20694
+    components:
+    - type: Transform
+      pos: -17.5,-50.5
+      parent: 30
 - proto: DefaultStationBeaconSolars
   entities:
   - uid: 20441
@@ -53528,6 +53645,20 @@ entities:
     - type: Transform
       pos: 4.5,22.5
       parent: 30
+- proto: DefaultStationBeaconTEG
+  entities:
+  - uid: 20699
+    components:
+    - type: Transform
+      pos: 0.5,-47.5
+      parent: 30
+- proto: DefaultStationBeaconTelecoms
+  entities:
+  - uid: 20700
+    components:
+    - type: Transform
+      pos: -13.5,-29.5
+      parent: 30
 - proto: DefaultStationBeaconToolRoom
   entities:
   - uid: 20574
@@ -59654,28 +59785,27 @@ entities:
     - type: Transform
       pos: -32.550377,-19.499231
       parent: 30
-- proto: Emitter
+- proto: EmitterFlatpack
   entities:
-  - uid: 10654
+  - uid: 16130
     components:
     - type: Transform
-      pos: -13.5,-60.5
+      pos: -17.734718,-34.28877
       parent: 30
-  - uid: 13319
+  - uid: 18861
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-74.5
+      pos: -17.74916,-34.519756
       parent: 30
-  - uid: 18861
+  - uid: 19414
     components:
     - type: Transform
-      pos: -19.5,-34.5
+      pos: -17.315872,-34.317642
       parent: 30
-  - uid: 19416
+  - uid: 20701
     components:
     - type: Transform
-      pos: -19.5,-35.5
+      pos: -17.330315,-34.519756
       parent: 30
 - proto: ExosuitFabricator
   entities:
@@ -74035,17 +74165,6 @@ entities:
       parent: 30
     - type: AtmosPipeColor
       color: '#FF0000FF'
-  - uid: 8933
-    components:
-    - type: Transform
-      anchored: False
-      pos: 7.5,-22.5
-      parent: 30
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 8934
     components:
     - type: Transform
@@ -75216,17 +75335,6 @@ entities:
       parent: 30
     - type: AtmosPipeColor
       color: '#FF0000FF'
-  - uid: 9980
-    components:
-    - type: Transform
-      anchored: False
-      pos: 5.5,-22.5
-      parent: 30
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 9982
     components:
     - type: Transform
@@ -105495,6 +105603,11 @@ entities:
     - type: Transform
       pos: -38.5,-29.5
       parent: 30
+  - uid: 20534
+    components:
+    - type: Transform
+      pos: -17.5,-34.5
+      parent: 30
   - uid: 20968
     components:
     - type: Transform
@@ -106472,6 +106585,11 @@ entities:
     - type: Transform
       pos: 35.5,32.5
       parent: 30
+  - uid: 19416
+    components:
+    - type: Transform
+      pos: -70.5,-58.5
+      parent: 30
 - proto: RandomVendingSnacks
   entities:
   - uid: 747
@@ -106504,6 +106622,11 @@ entities:
     - type: Transform
       pos: -48.5,21.5
       parent: 30
+  - uid: 19417
+    components:
+    - type: Transform
+      pos: -69.5,-58.5
+      parent: 30
 - proto: RCD
   entities:
   - uid: 10545
@@ -115280,16 +115403,6 @@ entities:
       parent: 30
 - proto: SpawnVendingMachineRestockFoodDrink
   entities:
-  - uid: 11463
-    components:
-    - type: Transform
-      pos: -69.5,-58.5
-      parent: 30
-  - uid: 16130
-    components:
-    - type: Transform
-      pos: -70.5,-58.5
-      parent: 30
   - uid: 22422
     components:
     - type: Transform
diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml
index 473cbbb3a8d..82ab0632da6 100644
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
@@ -10635,7 +10635,7 @@ entities:
       pos: -42.5,29.5
       parent: 5350
     - type: Door
-      secondsUntilStateChange: -99.68158
+      secondsUntilStateChange: -206.70142
       state: Opening
     - type: DeviceLinkSink
       invokeCounter: 2
@@ -62288,6 +62288,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 19.5,-38.5
       parent: 5350
+- proto: ComputerRoboticsControl
+  entities:
+  - uid: 24793
+    components:
+    - type: Transform
+      pos: 21.5,-34.5
+      parent: 5350
 - proto: ComputerSalvageExpedition
   entities:
   - uid: 1504
diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml
index 2691ed2a787..ac6404412c4 100644
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -89,7 +89,7 @@ entities:
           version: 6
         1,-3:
           ind: 1,-3
-          tiles: egAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAAAWwAAAAACWwAAAAABWwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAAAHQAAAAAAewAAAAAAHQAAAAACewAAAAAAewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAABHQAAAAABewAAAAAAHQAAAAAAWwAAAAAAWwAAAAADewAAAAAAWwAAAAABHQAAAAAAewAAAAAAHQAAAAADWwAAAAAAewAAAAAAWwAAAAACWwAAAAACewAAAAAAHQAAAAADHQAAAAABewAAAAAAHQAAAAACWwAAAAACWwAAAAAAWwAAAAACWwAAAAACHQAAAAABewAAAAAAHQAAAAACWwAAAAACewAAAAAAWwAAAAADWwAAAAAAewAAAAAAHQAAAAAAHQAAAAACewAAAAAAHQAAAAACWwAAAAADWwAAAAABWwAAAAAAWwAAAAADHQAAAAABewAAAAAAHQAAAAABWwAAAAABWwAAAAACWwAAAAAAWwAAAAAAewAAAAAAHQAAAAABHQAAAAABewAAAAAAHQAAAAACWwAAAAABWwAAAAACewAAAAAAWwAAAAACWwAAAAABWwAAAAACWwAAAAADWwAAAAADewAAAAAAWwAAAAAAWwAAAAAAewAAAAAAHQAAAAAAHQAAAAABHQAAAAAAHQAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAACWwAAAAADWwAAAAADWwAAAAADWwAAAAAAWwAAAAACWwAAAAACWwAAAAAAWwAAAAADWwAAAAACWwAAAAACWwAAAAAAWwAAAAACWwAAAAAAWwAAAAACWwAAAAADWwAAAAADWwAAAAAAWwAAAAACWwAAAAABWwAAAAABWwAAAAABWwAAAAABWwAAAAAAWwAAAAADWwAAAAABWwAAAAADWwAAAAAAWwAAAAACWwAAAAABWwAAAAADWwAAAAAAWwAAAAACWwAAAAACWwAAAAACWwAAAAABWwAAAAADWwAAAAAAWwAAAAACWwAAAAACewAAAAAAewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAADWwAAAAADWwAAAAAAWwAAAAADewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAewAAAAAAewAAAAAAWwAAAAACewAAAAAAWwAAAAADWwAAAAADewAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAA
+          tiles: egAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAAAWwAAAAACWwAAAAABWwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAAAHQAAAAAAewAAAAAAHQAAAAACewAAAAAAewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAABHQAAAAABewAAAAAAHQAAAAAAWwAAAAAAWwAAAAABewAAAAAAWwAAAAAAHQAAAAACewAAAAAAHQAAAAADWwAAAAAAewAAAAAAWwAAAAACWwAAAAACewAAAAAAHQAAAAADHQAAAAABewAAAAAAHQAAAAACWwAAAAACWwAAAAADWwAAAAACWwAAAAAAHQAAAAABewAAAAAAHQAAAAACWwAAAAACewAAAAAAWwAAAAADWwAAAAAAewAAAAAAHQAAAAAAHQAAAAACewAAAAAAHQAAAAACWwAAAAADWwAAAAADWwAAAAAAWwAAAAAAHQAAAAABewAAAAAAHQAAAAABWwAAAAABWwAAAAACWwAAAAACWwAAAAAAewAAAAAAHQAAAAABHQAAAAABewAAAAAAHQAAAAACWwAAAAABWwAAAAACewAAAAAAWwAAAAACWwAAAAABWwAAAAACWwAAAAADWwAAAAADewAAAAAAWwAAAAAAWwAAAAAAewAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAACWwAAAAADWwAAAAADWwAAAAADWwAAAAAAWwAAAAACWwAAAAACWwAAAAAAWwAAAAADWwAAAAACWwAAAAACWwAAAAAAWwAAAAACWwAAAAAAWwAAAAACWwAAAAADWwAAAAADWwAAAAAAWwAAAAACWwAAAAABWwAAAAABWwAAAAABWwAAAAABWwAAAAAAWwAAAAADWwAAAAABWwAAAAADWwAAAAAAWwAAAAACWwAAAAABWwAAAAADWwAAAAAAWwAAAAACWwAAAAACWwAAAAACWwAAAAABWwAAAAADWwAAAAAAWwAAAAACWwAAAAACewAAAAAAewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAADWwAAAAADWwAAAAAAWwAAAAADewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAewAAAAAAewAAAAAAWwAAAAACewAAAAAAWwAAAAADWwAAAAADewAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAA
           version: 6
         2,-2:
           ind: 2,-2
@@ -97,7 +97,7 @@ entities:
           version: 6
         2,-3:
           ind: 2,-3
-          tiles: ewAAAAAAewAAAAAAagAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAewAAAAAAewAAAAAAagAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAewAAAAAAewAAAAAATwAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAHQAAAAACewAAAAAATwAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAHQAAAAACewAAAAAATwAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAABewAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAewAAAAAAegAAAAAAegAAAAAAHQAAAAADewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAACWwAAAAABWwAAAAACWwAAAAADWwAAAAABWwAAAAADWwAAAAADWwAAAAAAewAAAAAAHQAAAAAAawAAAAAAewAAAAAAewAAAAAAewAAAAAAawAAAAAAWwAAAAABWwAAAAAAWwAAAAABWwAAAAACWwAAAAACWwAAAAADWwAAAAABWwAAAAAAWwAAAAABewAAAAAAHQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAABWwAAAAACWwAAAAACWwAAAAACTwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAewAAAAAAHQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAawAAAAAAawAAAAAAawAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAewAAAAAAWwAAAAACewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWwAAAAADewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAATQAAAAAATQAAAAAATQAAAAAAZAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAA
+          tiles: ewAAAAAAewAAAAAAagAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAewAAAAAAewAAAAAAagAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAewAAAAAAewAAAAAATwAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAHQAAAAACewAAAAAATwAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAHQAAAAACewAAAAAATwAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAABewAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAewAAAAAAegAAAAAAegAAAAAAHQAAAAADewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAACWwAAAAABWwAAAAACWwAAAAADWwAAAAABWwAAAAADWwAAAAADWwAAAAAAewAAAAAAHQAAAAABawAAAAAAewAAAAAAewAAAAAAewAAAAAAawAAAAAAWwAAAAADWwAAAAAAWwAAAAABWwAAAAACWwAAAAACWwAAAAADWwAAAAABWwAAAAAAWwAAAAABewAAAAAAHQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAAAWwAAAAAAWwAAAAABWwAAAAADTwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAewAAAAAAHQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAawAAAAAAawAAAAAAawAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAewAAAAAAWwAAAAACewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWwAAAAADewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAATQAAAAAATQAAAAAATQAAAAAAZAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAA
           version: 6
         1,1:
           ind: 1,1
@@ -1811,31 +1811,31 @@ entities:
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            1073: -12,-14
-            1074: -19,-14
+            1028: -12,-14
+            1029: -19,-14
         - node:
             angle: -3.141592653589793 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            1159: -5,0
-            1160: -3,0
-            1519: 24,23
-            2421: 58,-2
-            2422: 60,-2
+            1114: -5,0
+            1115: -3,0
+            1474: 24,23
+            2376: 58,-2
+            2377: 60,-2
         - node:
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            798: 21,-16
-            1071: -13,-12
-            1072: -20,-12
+            753: 21,-16
+            1026: -13,-12
+            1027: -20,-12
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            1629: 36,18
+            1584: 36,18
         - node:
             color: '#FED83DFF'
             id: Bot
@@ -1851,53 +1851,53 @@ entities:
             200: 3,-7
             243: 51,9
             244: 49,9
-            409: 42,-39
-            410: 42,-38
-            411: 43,-38
-            412: 43,-39
-            413: 44,-39
-            414: 44,-38
-            415: 45,-39
-            416: 45,-38
-            465: 22,-35
-            466: 20,-35
-            467: 19,-35
-            1218: 15,-2
-            1219: 14,-2
-            1220: 13,-2
-            1267: 13,26
-            1268: 11,26
-            1269: 10,26
-            1270: 11,24
-            1271: 12,24
-            1272: 13,24
-            1273: 7,25
-            1368: 12,26
-            1511: 22,22
-            1512: 22,23
-            1513: 22,24
-            1514: 22,25
-            1515: 23,25
-            1626: 37,17
-            1627: 38,17
-            1628: 39,17
-            1840: 10,24
-            2130: 52,17
-            2131: 52,18
-            2244: 68,13
-            2245: 66,13
-            2246: 67,13
-            2609: 46,-46
-            2610: 46,-49
-            2611: 47,-49
-            2612: 48,-49
-            2613: 49,-49
-            2619: 44,-43
-            2620: 43,-43
-            2621: 42,-43
-            2622: 41,-43
-            2623: 38,-43
-            2624: 37,-43
+            405: 42,-39
+            406: 42,-38
+            407: 43,-38
+            408: 43,-39
+            409: 44,-39
+            410: 44,-38
+            411: 45,-39
+            412: 45,-38
+            453: 22,-35
+            454: 20,-35
+            455: 19,-35
+            1173: 15,-2
+            1174: 14,-2
+            1175: 13,-2
+            1222: 13,26
+            1223: 11,26
+            1224: 10,26
+            1225: 11,24
+            1226: 12,24
+            1227: 13,24
+            1228: 7,25
+            1323: 12,26
+            1466: 22,22
+            1467: 22,23
+            1468: 22,24
+            1469: 22,25
+            1470: 23,25
+            1581: 37,17
+            1582: 38,17
+            1583: 39,17
+            1795: 10,24
+            2085: 52,17
+            2086: 52,18
+            2199: 68,13
+            2200: 66,13
+            2201: 67,13
+            2564: 46,-46
+            2565: 46,-49
+            2566: 47,-49
+            2567: 48,-49
+            2568: 49,-49
+            2574: 44,-43
+            2575: 43,-43
+            2576: 42,-43
+            2577: 41,-43
+            2578: 38,-43
+            2579: 37,-43
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -1909,161 +1909,155 @@ entities:
             color: '#FFFFFFFF'
             id: BotGreyscale
           decals:
-            1593: 14,39
-            1594: 13,40
-            1595: 14,41
-            1596: 15,40
-            1744: 28,44
-            1745: 26,44
+            1548: 14,39
+            1549: 13,40
+            1550: 14,41
+            1551: 15,40
+            1699: 28,44
+            1700: 26,44
         - node:
             color: '#FFFFFFFF'
             id: BotLeft
           decals:
             399: 10,-36
             400: 10,-37
-            461: 22,-43
-            1918: 10,-6
-            1919: 11,-6
-            1920: 12,-6
-            2241: 68,16
-            2242: 67,16
-            2243: 66,16
+            450: 22,-43
+            1873: 10,-6
+            1874: 11,-6
+            1875: 12,-6
+            2196: 68,16
+            2197: 67,16
+            2198: 66,16
         - node:
             color: '#FFFFFFFF'
             id: BotLeftGreyscale
           decals:
-            1589: 15,41
-            1590: 13,39
-            1914: 8,-10
-            1915: 8,-9
+            1544: 15,41
+            1545: 13,39
+            1869: 8,-10
+            1870: 8,-9
         - node:
             color: '#FFFFFFFF'
             id: BotRight
           decals:
-            460: 20,-43
-            1921: 10,-9
-            1922: 11,-9
-            1923: 12,-9
+            449: 20,-43
+            1876: 10,-9
+            1877: 11,-9
+            1878: 12,-9
         - node:
             color: '#FFFFFFFF'
             id: BotRightGreyscale
           decals:
-            1591: 13,41
-            1592: 15,39
-            1916: 8,-8
-            1917: 8,-6
+            1546: 13,41
+            1547: 15,39
+            1871: 8,-8
+            1872: 8,-6
         - node:
             color: '#FFFFFFFF'
             id: Box
           decals:
-            459: 21,-43
+            448: 21,-43
         - node:
             color: '#FFFFFFFF'
             id: BoxGreyscale
           decals:
-            804: 16,-43
-            805: 17,-43
-            806: 25,-43
-            807: 26,-43
-            1597: 14,40
+            759: 16,-43
+            760: 17,-43
+            761: 25,-43
+            762: 26,-43
+            1552: 14,40
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
           decals:
-            1826: 22,-13
-            1827: 22,-12
-            1828: 22,-11
-            1829: 22,-10
+            1781: 22,-13
+            1782: 22,-12
+            1783: 22,-11
+            1784: 22,-10
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelEndN
           decals:
-            2472: 77,9
-            2473: 78,9
+            2427: 77,9
+            2428: 78,9
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelEndS
           decals:
-            2474: 77,7
-            2475: 78,7
+            2429: 77,7
+            2430: 78,7
         - node:
             color: '#D381C996'
             id: BrickTileSteelLineE
           decals:
-            2237: 71,13
-            2238: 71,14
-            2239: 71,15
-            2240: 71,16
+            2192: 71,13
+            2193: 71,14
+            2194: 71,15
+            2195: 71,16
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineE
           decals:
-            2476: 77,8
-            2477: 78,8
+            2431: 77,8
+            2432: 78,8
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineN
           decals:
-            462: 30,-39
-            463: 29,-39
-            464: 28,-39
-            880: 46,-9
-            881: 47,-9
+            451: 30,-39
+            452: 28,-39
+            835: 46,-9
+            836: 47,-9
         - node:
             color: '#D381C996'
             id: BrickTileSteelLineW
           decals:
-            2233: 69,13
-            2234: 69,14
-            2235: 69,15
-            2236: 69,16
+            2188: 69,13
+            2189: 69,14
+            2190: 69,15
+            2191: 69,16
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineW
           decals:
-            2478: 78,8
-            2479: 77,8
+            2433: 78,8
+            2434: 77,8
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteCornerNe
           decals:
-            1889: 17,-4
+            1844: 17,-4
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerNe
           decals:
-            1492: 20,24
+            1447: 20,24
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNe
           decals:
-            1619: 39,19
+            1574: 39,19
         - node:
             color: '#EFCC4193'
             id: BrickTileWhiteCornerNe
           decals:
             371: 27,-28
             389: 13,-34
-        - node:
-            color: '#EFCC4582'
-            id: BrickTileWhiteCornerNe
-          decals:
-            406: 41,-39
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteCornerNw
           decals:
-            1894: 14,-4
+            1849: 14,-4
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerNw
           decals:
-            1491: 17,24
+            1446: 17,24
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNw
           decals:
-            1618: 36,19
+            1573: 36,19
         - node:
             color: '#EFCC4193'
             id: BrickTileWhiteCornerNw
@@ -2074,22 +2068,22 @@ entities:
             color: '#334E6DC8'
             id: BrickTileWhiteCornerSe
           decals:
-            1888: 17,-6
+            1843: 17,-6
         - node:
             color: '#9FED583B'
             id: BrickTileWhiteCornerSe
           decals:
-            850: 47,-8
+            805: 47,-8
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerSe
           decals:
-            1496: 20,20
+            1451: 20,20
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSe
           decals:
-            1621: 39,17
+            1576: 39,17
         - node:
             color: '#EFCC4193'
             id: BrickTileWhiteCornerSe
@@ -2100,22 +2094,22 @@ entities:
             color: '#334E6DC8'
             id: BrickTileWhiteCornerSw
           decals:
-            1890: 14,-6
+            1845: 14,-6
         - node:
             color: '#9FED583B'
             id: BrickTileWhiteCornerSw
           decals:
-            854: 41,-8
+            809: 41,-8
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerSw
           decals:
-            1497: 17,20
+            1452: 17,20
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSw
           decals:
-            1620: 36,17
+            1575: 36,17
         - node:
             color: '#EFCC4193'
             id: BrickTileWhiteCornerSw
@@ -2126,89 +2120,89 @@ entities:
             color: '#9FED5847'
             id: BrickTileWhiteEndE
           decals:
-            861: 45,-6
+            816: 45,-6
         - node:
             color: '#9FED5847'
             id: BrickTileWhiteEndN
           decals:
-            879: 47,-4
+            834: 47,-4
         - node:
             color: '#9FED5847'
             id: BrickTileWhiteEndW
           decals:
-            862: 43,-6
+            817: 43,-6
         - node:
             color: '#9FED5847'
             id: BrickTileWhiteInnerNe
           decals:
-            871: 41,-8
+            826: 41,-8
         - node:
             color: '#D381C996'
             id: BrickTileWhiteInnerNe
           decals:
-            2134: 51,20
+            2089: 51,20
         - node:
             color: '#EFCC4582'
             id: BrickTileWhiteInnerNe
           decals:
-            408: 41,-40
+            404: 41,-40
         - node:
             color: '#9FED5847'
             id: BrickTileWhiteInnerNw
           decals:
-            870: 47,-8
+            825: 47,-8
         - node:
             color: '#D381C996'
             id: BrickTileWhiteInnerNw
           decals:
-            2133: 53,20
+            2088: 53,20
         - node:
             color: '#D381C996'
             id: BrickTileWhiteInnerSe
           decals:
-            2129: 50,19
+            2084: 50,19
         - node:
             color: '#D381C996'
             id: BrickTileWhiteInnerSw
           decals:
-            2128: 54,19
+            2083: 54,19
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineE
           decals:
-            1891: 17,-5
+            1846: 17,-5
         - node:
             color: '#9FED583B'
             id: BrickTileWhiteLineE
           decals:
-            851: 47,-7
-            852: 47,-6
-            853: 47,-5
+            806: 47,-7
+            807: 47,-6
+            808: 47,-5
         - node:
             color: '#9FED5847'
             id: BrickTileWhiteLineE
           decals:
-            872: 41,-7
-            873: 41,-6
-            874: 41,-5
-            875: 41,-4
+            827: 41,-7
+            828: 41,-6
+            829: 41,-5
+            830: 41,-4
         - node:
             color: '#A4610696'
             id: BrickTileWhiteLineE
           decals:
-            1493: 20,23
-            1494: 20,22
-            1495: 20,21
+            1448: 20,23
+            1449: 20,22
+            1450: 20,21
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineE
           decals:
-            2121: 50,17
-            2122: 50,18
-            2135: 51,21
-            2136: 56,17
-            2137: 56,19
-            2138: 56,20
+            2076: 50,17
+            2077: 50,18
+            2090: 51,21
+            2091: 56,17
+            2092: 56,19
+            2093: 56,20
         - node:
             color: '#EFCC4193'
             id: BrickTileWhiteLineE
@@ -2218,71 +2212,68 @@ entities:
             color: '#EFCC4582'
             id: BrickTileWhiteLineE
           decals:
-            490: 17,-42
-            491: 17,-41
-            494: 26,-42
-            495: 26,-41
-            496: 26,-40
+            472: 26,-42
+            473: 26,-41
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineN
           decals:
-            1892: 16,-4
-            1893: 15,-4
+            1847: 16,-4
+            1848: 15,-4
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineN
           decals:
-            1163: -13,-12
-            1164: -20,-12
-            1989: 32,36
+            1118: -13,-12
+            1119: -20,-12
+            1944: 32,36
         - node:
             color: '#9FED5847'
             id: BrickTileWhiteLineN
           decals:
-            863: 44,-6
-            865: 46,-8
-            866: 45,-8
-            867: 44,-8
-            868: 43,-8
-            869: 42,-8
-            882: 47,-9
-            883: 46,-9
+            818: 44,-6
+            820: 46,-8
+            821: 45,-8
+            822: 44,-8
+            823: 43,-8
+            824: 42,-8
+            837: 47,-9
+            838: 46,-9
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineN
           decals:
-            2265: 80,-4
-            2266: 77,-4
+            2220: 80,-4
+            2221: 77,-4
         - node:
             color: '#A4610696'
             id: BrickTileWhiteLineN
           decals:
-            1503: 18,24
-            1504: 19,24
-            1991: 30,36
+            1458: 18,24
+            1459: 19,24
+            1946: 30,36
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineN
           decals:
-            1990: 31,36
-            2101: 52,14
-            2102: 51,14
-            2103: 50,14
-            2104: 49,14
-            2105: 48,14
-            2132: 52,20
-            2227: 66,15
-            2228: 67,15
-            2229: 68,15
+            1945: 31,36
+            2056: 52,14
+            2057: 51,14
+            2058: 50,14
+            2059: 49,14
+            2060: 48,14
+            2087: 52,20
+            2182: 66,15
+            2183: 67,15
+            2184: 68,15
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineN
           decals:
-            1161: -3,1
-            1162: -5,1
-            1622: 38,19
-            1623: 37,19
+            1116: -3,1
+            1117: -5,1
+            1577: 38,19
+            1578: 37,19
         - node:
             color: '#EFCC4193'
             id: BrickTileWhiteLineN
@@ -2293,79 +2284,76 @@ entities:
             color: '#EFCC4582'
             id: BrickTileWhiteLineN
           decals:
-            403: 38,-39
-            404: 39,-39
-            405: 40,-39
-            407: 42,-40
-            421: 43,-40
-            422: 44,-40
-            423: 45,-40
-            424: 46,-40
+            403: 42,-40
+            417: 43,-40
+            418: 44,-40
+            419: 45,-40
+            420: 46,-40
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineN
           decals:
-            2084: 50,13
-            2085: 49,13
-            2089: 51,13
+            2039: 50,13
+            2040: 49,13
+            2044: 51,13
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineS
           decals:
-            1896: 16,-6
-            1897: 15,-6
-            1986: 32,35
+            1851: 16,-6
+            1852: 15,-6
+            1941: 32,35
         - node:
             color: '#9FED583B'
             id: BrickTileWhiteLineS
           decals:
-            846: 46,-8
-            847: 45,-8
-            848: 44,-8
-            849: 43,-8
+            801: 46,-8
+            802: 45,-8
+            803: 44,-8
+            804: 43,-8
         - node:
             color: '#9FED5847'
             id: BrickTileWhiteLineS
           decals:
-            864: 44,-6
+            819: 44,-6
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineS
           decals:
-            2264: 77,-6
+            2219: 77,-6
         - node:
             color: '#A4610696'
             id: BrickTileWhiteLineS
           decals:
-            1498: 19,20
-            1499: 18,20
+            1453: 19,20
+            1454: 18,20
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineS
           decals:
-            2096: 49,14
-            2097: 50,14
-            2098: 51,14
-            2099: 52,14
-            2100: 48,14
-            2123: 51,19
-            2124: 52,19
-            2125: 53,19
-            2230: 68,14
-            2231: 67,14
-            2232: 66,14
+            2051: 49,14
+            2052: 50,14
+            2053: 51,14
+            2054: 52,14
+            2055: 48,14
+            2078: 51,19
+            2079: 52,19
+            2080: 53,19
+            2185: 68,14
+            2186: 67,14
+            2187: 66,14
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineS
           decals:
-            1624: 38,17
-            1625: 37,17
-            1987: 31,35
+            1579: 38,17
+            1580: 37,17
+            1942: 31,35
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineS
           decals:
-            1988: 30,35
+            1943: 30,35
         - node:
             color: '#EFCC4193'
             id: BrickTileWhiteLineS
@@ -2377,53 +2365,53 @@ entities:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineS
           decals:
-            2086: 51,15
-            2087: 50,15
-            2088: 49,15
+            2041: 51,15
+            2042: 50,15
+            2043: 49,15
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineW
           decals:
-            1895: 14,-5
+            1850: 14,-5
         - node:
             color: '#9FED583B'
             id: BrickTileWhiteLineW
           decals:
-            855: 41,-7
-            856: 41,-6
-            857: 41,-5
+            810: 41,-7
+            811: 41,-6
+            812: 41,-5
         - node:
             color: '#9FED5847'
             id: BrickTileWhiteLineW
           decals:
-            876: 47,-7
-            877: 47,-6
-            878: 47,-5
+            831: 47,-7
+            832: 47,-6
+            833: 47,-5
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineW
           decals:
-            2271: 78,-2
-            2272: 78,-1
+            2226: 78,-2
+            2227: 78,-1
         - node:
             color: '#A4610696'
             id: BrickTileWhiteLineW
           decals:
-            1500: 17,21
-            1501: 17,22
-            1502: 17,23
-            1505: 22,20
-            1506: 22,21
-            1507: 22,22
-            1508: 22,23
-            1509: 22,24
-            1510: 22,25
+            1455: 17,21
+            1456: 17,22
+            1457: 17,23
+            1460: 22,20
+            1461: 22,21
+            1462: 22,22
+            1463: 22,23
+            1464: 22,24
+            1465: 22,25
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineW
           decals:
-            2126: 54,17
-            2127: 54,18
+            2081: 54,17
+            2082: 54,18
         - node:
             color: '#EFCC4193'
             id: BrickTileWhiteLineW
@@ -2434,28 +2422,28 @@ entities:
             color: '#EFCC4582'
             id: BrickTileWhiteLineW
           decals:
-            492: 25,-42
-            493: 25,-41
-            497: 16,-41
-            498: 16,-40
+            470: 25,-42
+            471: 25,-41
+            474: 16,-41
+            475: 16,-40
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineW
           decals:
-            2269: 78,-2
-            2270: 78,-1
+            2224: 78,-2
+            2225: 78,-1
         - node:
             color: '#FFFFFFFF'
             id: Caution
           decals:
-            1138: -6,-18
-            1409: 9,27
+            1093: -6,-18
+            1364: 9,27
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Caution
           decals:
-            1408: 9,27
+            1363: 9,27
         - node:
             color: '#52B4E996'
             id: CheckerNESW
@@ -2523,99 +2511,99 @@ entities:
             color: '#9FED5896'
             id: CheckerNESW
           decals:
-            2273: 80,-3
-            2274: 80,-2
-            2275: 81,-2
-            2276: 81,-3
-            2277: 81,-1
-            2278: 80,-1
-            2279: 76,-9
-            2280: 77,-9
-            2281: 77,-8
-            2282: 76,-8
-            2283: 76,-7
-            2284: 77,-7
+            2228: 80,-3
+            2229: 80,-2
+            2230: 81,-2
+            2231: 81,-3
+            2232: 81,-1
+            2233: 80,-1
+            2234: 76,-9
+            2235: 77,-9
+            2236: 77,-8
+            2237: 76,-8
+            2238: 76,-7
+            2239: 77,-7
         - node:
             color: '#D4D4D428'
             id: CheckerNESW
           decals:
-            962: 19,13
-            963: 19,14
-            964: 20,14
-            965: 20,13
-            966: 21,13
-            967: 21,14
-            968: 22,14
-            969: 22,13
+            917: 19,13
+            918: 19,14
+            919: 20,14
+            920: 20,13
+            921: 21,13
+            922: 21,14
+            923: 22,14
+            924: 22,13
         - node:
             color: '#F9801D73'
             id: CheckerNESW
           decals:
-            928: 20,9
-            929: 20,10
+            883: 20,9
+            884: 20,10
         - node:
             color: '#9FED5822'
             id: CheckerNWSE
           decals:
-            890: 42,-11
-            891: 42,-10
-            892: 43,-11
-            893: 43,-10
-            894: 44,-11
-            895: 44,-10
+            845: 42,-11
+            846: 42,-10
+            847: 43,-11
+            848: 43,-10
+            849: 44,-11
+            850: 44,-10
         - node:
             color: '#9FED5896'
             id: CheckerNWSE
           decals:
-            2267: 77,-2
-            2268: 77,-1
+            2222: 77,-2
+            2223: 77,-1
         - node:
             color: '#A4610696'
             id: CheckerNWSE
           decals:
-            1256: 13,30
-            1257: 13,31
-            1258: 12,31
-            1259: 12,30
-            1260: 11,30
-            1261: 11,31
+            1211: 13,30
+            1212: 13,31
+            1213: 12,31
+            1214: 12,30
+            1215: 11,30
+            1216: 11,31
         - node:
             color: '#D381C996'
             id: CheckerNWSE
           decals:
-            2081: 58,9
-            2082: 58,10
-            2083: 58,11
+            2036: 58,9
+            2037: 58,10
+            2038: 58,11
         - node:
             color: '#EFCC4593'
             id: CheckerNWSE
           decals:
-            802: 18,-18
-            803: 18,-17
+            757: 18,-18
+            758: 18,-17
         - node:
             color: '#FFFFFF93'
             id: CheckerNWSE
           decals:
-            808: 33,-10
-            809: 33,-11
-            810: 33,-12
-            811: 33,-13
-            812: 34,-13
-            813: 34,-12
-            814: 34,-11
-            815: 34,-10
-            816: 35,-10
-            817: 35,-11
-            818: 35,-12
-            819: 35,-13
-            820: 36,-13
-            821: 36,-12
-            822: 36,-11
-            823: 36,-10
-            824: 37,-10
-            825: 37,-11
-            826: 37,-12
-            827: 37,-13
+            763: 33,-10
+            764: 33,-11
+            765: 33,-12
+            766: 33,-13
+            767: 34,-13
+            768: 34,-12
+            769: 34,-11
+            770: 34,-10
+            771: 35,-10
+            772: 35,-11
+            773: 35,-12
+            774: 35,-13
+            775: 36,-13
+            776: 36,-12
+            777: 36,-11
+            778: 36,-10
+            779: 37,-10
+            780: 37,-11
+            781: 37,-12
+            782: 37,-13
         - node:
             color: '#FFFFFFFF'
             id: Delivery
@@ -2629,61 +2617,61 @@ entities:
             241: 51,8
             242: 49,8
             385: 5,-7
-            417: 46,-39
-            418: 46,-38
-            419: 39,-41
-            420: 41,-41
-            455: 16,-39
-            456: 17,-39
-            457: 25,-39
-            458: 26,-39
-            1049: 25,-3
-            1050: 26,-3
-            1051: 27,-3
-            1062: 24,13
-            1063: 24,14
-            1064: 19,11
-            1065: 18,11
-            1066: 25,16
-            1067: 26,16
-            1068: 27,16
-            1069: 33,-2
-            1070: 35,-2
-            1142: -8,-15
-            1143: -8,-14
-            1144: -8,-13
-            1165: 2,-2
-            1166: 2,-1
-            1167: 2,0
-            1224: 16,-2
-            1225: 17,-1
-            1226: 17,0
-            1227: 17,1
-            1274: 7,24
-            1275: 7,26
-            1739: 40,12
-            1740: 41,12
-            1741: 42,12
-            1816: 39,-1
-            1817: 39,0
-            1818: 39,1
-            1819: 40,2
-            1820: 41,2
-            1821: 42,2
-            1981: 7,9
-            1982: 7,10
-            1983: 38,13
-            1984: 38,14
-            1985: 38,15
-            2106: 53,13
-            2107: 53,14
-            2108: 53,15
-            2141: 58,16
-            2142: 59,16
-            2143: 60,16
-            2144: 58,21
-            2145: 59,21
-            2146: 60,21
+            413: 46,-39
+            414: 46,-38
+            415: 39,-41
+            416: 41,-41
+            445: 16,-39
+            446: 17,-39
+            447: 25,-39
+            1004: 25,-3
+            1005: 26,-3
+            1006: 27,-3
+            1017: 24,13
+            1018: 24,14
+            1019: 19,11
+            1020: 18,11
+            1021: 25,16
+            1022: 26,16
+            1023: 27,16
+            1024: 33,-2
+            1025: 35,-2
+            1097: -8,-15
+            1098: -8,-14
+            1099: -8,-13
+            1120: 2,-2
+            1121: 2,-1
+            1122: 2,0
+            1179: 16,-2
+            1180: 17,-1
+            1181: 17,0
+            1182: 17,1
+            1229: 7,24
+            1230: 7,26
+            1694: 40,12
+            1695: 41,12
+            1696: 42,12
+            1771: 39,-1
+            1772: 39,0
+            1773: 39,1
+            1774: 40,2
+            1775: 41,2
+            1776: 42,2
+            1936: 7,9
+            1937: 7,10
+            1938: 38,13
+            1939: 38,14
+            1940: 38,15
+            2061: 53,13
+            2062: 53,14
+            2063: 53,15
+            2096: 58,16
+            2097: 59,16
+            2098: 60,16
+            2099: 58,21
+            2100: 59,21
+            2101: 60,21
+            2599: 26,-39
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -2705,147 +2693,145 @@ entities:
             color: '#FFFFFFFF'
             id: DeliveryGreyscale
           decals:
-            2109: 52,14
-            2110: 48,14
+            2064: 52,14
+            2065: 48,14
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Dirt
           decals:
-            442: 41,-39
-            443: 39,-39
-            444: 46,-40
-            445: 45,-40
-            446: 44,-40
-            447: 44,-41
-            448: 43,-41
-            449: 42,-38
-            450: 43,-39
-            736: 30,-31
-            737: 29,-31
-            738: 30,-32
-            739: 30,-33
-            740: 29,-33
-            741: 29,-32
-            742: 28,-32
-            743: 31,-32
-            744: 32,-31
-            745: 27,-34
-            746: 27,-33
-            747: 26,-33
-            748: 25,-34
-            749: 24,-32
-            750: 23,-32
-            751: 22,-31
-            752: 22,-33
-            753: 24,-33
-            896: 43,-11
-            897: 42,-10
-            898: 30,-13
-            899: 29,-11
-            1060: 21,-31
-            1061: 21,-31
-            1196: -4,-6
-            1197: -4,-5
-            1198: -4,-4
-            1199: -4,-5
-            1279: 6,30
-            1280: 7,31
-            1281: 6,32
-            1282: 9,30
-            1283: 9,29
-            1391: 15,20
-            1392: 14,20
-            1393: 13,23
-            1394: 12,23
-            1395: 11,23
-            1396: 7,22
-            1397: 7,21
-            1398: 10,25
-            1399: 9,27
-            1400: 7,28
-            1401: 13,28
-            1402: 11,28
-            1403: 15,24
-            1404: 12,24
-            1405: 7,24
-            1406: 5,24
-            1407: 7,23
-            1416: 8,17
-            1417: 7,16
-            1418: 5,16
-            1419: 8,18
-            1484: 11,24
-            1485: 10,26
-            1486: 7,25
-            1526: 17,21
-            1527: 18,22
-            1528: 18,23
-            1529: 19,20
-            1564: 22,20
-            1565: 22,25
-            1566: 24,20
-            1567: 24,23
-            1568: 23,24
-            1569: 23,22
-            1570: 23,23
-            1571: 23,21
-            1572: 15,23
-            1573: 14,23
-            1574: 13,24
-            1598: 39,30
-            1599: 40,31
-            1600: 39,33
-            1601: 38,33
-            1602: 37,35
-            1603: 39,35
-            1604: 41,33
-            1605: 40,33
-            1668: 32,17
-            1669: 32,18
-            1670: 33,17
-            1671: 35,20
-            1672: 35,21
-            1673: 33,23
-            1674: 34,24
-            1675: 33,27
-            1676: 32,29
-            1677: 32,30
-            1678: 30,23
-            1679: 30,18
-            1680: 29,17
-            1681: 29,20
-            1682: 30,20
-            1698: 25,18
-            1699: 25,19
-            1700: 25,20
-            1701: 25,22
-            1702: 27,20
-            1703: 25,23
-            1704: 25,24
-            1705: 26,24
-            1706: 27,23
-            1707: 25,25
-            1708: 27,26
-            1844: 8,21
-            1845: 9,21
-            1846: 9,22
-            1847: 9,23
-            1848: 10,23
-            1849: 10,22
-            1850: 8,24
-            1851: 9,24
-            2301: 55,-16
-            2302: 55,-16
-            2303: 56,-16
-            2304: 56,-15
-            2315: 55,-14
-            2316: 57,-16
-            2317: 57,-15
-            2350: 32,-18
-            2351: 33,-17
-            2352: 31,-16
-            2353: 29,-17
+            434: 46,-40
+            435: 45,-40
+            436: 44,-40
+            437: 44,-41
+            438: 43,-41
+            439: 42,-38
+            440: 43,-39
+            691: 30,-31
+            692: 29,-31
+            693: 30,-32
+            694: 30,-33
+            695: 29,-33
+            696: 29,-32
+            697: 28,-32
+            698: 31,-32
+            699: 32,-31
+            700: 27,-34
+            701: 27,-33
+            702: 26,-33
+            703: 25,-34
+            704: 24,-32
+            705: 23,-32
+            706: 22,-31
+            707: 22,-33
+            708: 24,-33
+            851: 43,-11
+            852: 42,-10
+            853: 30,-13
+            854: 29,-11
+            1015: 21,-31
+            1016: 21,-31
+            1151: -4,-6
+            1152: -4,-5
+            1153: -4,-4
+            1154: -4,-5
+            1234: 6,30
+            1235: 7,31
+            1236: 6,32
+            1237: 9,30
+            1238: 9,29
+            1346: 15,20
+            1347: 14,20
+            1348: 13,23
+            1349: 12,23
+            1350: 11,23
+            1351: 7,22
+            1352: 7,21
+            1353: 10,25
+            1354: 9,27
+            1355: 7,28
+            1356: 13,28
+            1357: 11,28
+            1358: 15,24
+            1359: 12,24
+            1360: 7,24
+            1361: 5,24
+            1362: 7,23
+            1371: 8,17
+            1372: 7,16
+            1373: 5,16
+            1374: 8,18
+            1439: 11,24
+            1440: 10,26
+            1441: 7,25
+            1481: 17,21
+            1482: 18,22
+            1483: 18,23
+            1484: 19,20
+            1519: 22,20
+            1520: 22,25
+            1521: 24,20
+            1522: 24,23
+            1523: 23,24
+            1524: 23,22
+            1525: 23,23
+            1526: 23,21
+            1527: 15,23
+            1528: 14,23
+            1529: 13,24
+            1553: 39,30
+            1554: 40,31
+            1555: 39,33
+            1556: 38,33
+            1557: 37,35
+            1558: 39,35
+            1559: 41,33
+            1560: 40,33
+            1623: 32,17
+            1624: 32,18
+            1625: 33,17
+            1626: 35,20
+            1627: 35,21
+            1628: 33,23
+            1629: 34,24
+            1630: 33,27
+            1631: 32,29
+            1632: 32,30
+            1633: 30,23
+            1634: 30,18
+            1635: 29,17
+            1636: 29,20
+            1637: 30,20
+            1653: 25,18
+            1654: 25,19
+            1655: 25,20
+            1656: 25,22
+            1657: 27,20
+            1658: 25,23
+            1659: 25,24
+            1660: 26,24
+            1661: 27,23
+            1662: 25,25
+            1663: 27,26
+            1799: 8,21
+            1800: 9,21
+            1801: 9,22
+            1802: 9,23
+            1803: 10,23
+            1804: 10,22
+            1805: 8,24
+            1806: 9,24
+            2256: 55,-16
+            2257: 55,-16
+            2258: 56,-16
+            2259: 56,-15
+            2270: 55,-14
+            2271: 57,-16
+            2272: 57,-15
+            2305: 32,-18
+            2306: 33,-17
+            2307: 31,-16
+            2308: 29,-17
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -2856,26 +2842,25 @@ entities:
             288: 28,-34
             289: 28,-33
             290: 31,-33
-            431: 40,-41
-            432: 40,-40
-            433: 38,-39
-            434: 41,-40
-            508: 24,-37
-            509: 30,-37
-            510: 31,-36
-            663: 18,-31
-            664: 19,-29
-            1284: 8,29
-            1285: 8,31
-            1369: 12,22
-            1370: 8,20
-            1420: 7,17
-            1421: 8,16
-            1422: 9,19
-            1530: 18,21
-            1552: 23,23
-            1606: 39,32
-            2305: 55,-15
+            426: 40,-41
+            427: 40,-40
+            428: 41,-40
+            482: 24,-37
+            483: 30,-37
+            484: 31,-36
+            618: 18,-31
+            619: 19,-29
+            1239: 8,29
+            1240: 8,31
+            1324: 12,22
+            1325: 8,20
+            1375: 7,17
+            1376: 8,16
+            1377: 9,19
+            1485: 18,21
+            1507: 23,23
+            1561: 39,32
+            2260: 55,-15
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -2888,300 +2873,293 @@ entities:
             295: 23,-31
             296: 23,-33
             297: 31,-31
-            435: 41,-39
-            436: 38,-40
-            437: 42,-41
-            438: 42,-40
-            439: 46,-41
-            440: 44,-39
-            441: 43,-40
-            500: 19,-42
-            501: 19,-41
-            502: 21,-39
-            511: 31,-37
-            515: 32,-36
-            516: 32,-35
-            517: 29,-36
-            518: 29,-37
-            519: 27,-37
-            520: 27,-36
-            521: 25,-37
-            522: 25,-36
-            523: 24,-36
-            524: 23,-37
-            525: 22,-37
-            526: 20,-37
-            527: 17,-36
-            528: 18,-35
-            529: 18,-34
-            530: 16,-42
-            531: 17,-42
-            665: 18,-29
-            666: 19,-28
-            667: 20,-29
-            668: 22,-29
-            669: 21,-29
-            670: 22,-28
-            671: 20,-27
-            672: 21,-26
-            673: 21,-27
-            674: 20,-26
-            675: 14,-27
-            676: 15,-26
-            677: 13,-25
-            678: 15,-27
-            679: 15,-28
-            680: 15,-28
-            681: 16,-29
-            682: 16,-25
-            683: 26,-29
-            684: 26,-28
-            685: 27,-29
-            686: 15,-37
-            687: 16,-37
-            688: 15,-34
-            1290: 9,31
-            1291: 7,32
-            1292: 9,32
-            1293: 6,31
-            1294: 8,29
-            1295: 9,28
-            1296: 10,27
-            1297: 10,28
-            1377: 13,25
-            1378: 11,25
-            1379: 12,27
-            1380: 11,26
-            1381: 12,22
-            1382: 13,23
-            1383: 14,24
-            1384: 15,23
-            1385: 15,22
-            1386: 15,21
-            1387: 14,22
-            1388: 15,21
-            1389: 15,20
-            1390: 14,21
-            1425: 7,16
-            1426: 9,17
-            1427: 9,16
-            1428: 9,15
-            1429: 7,15
-            1430: 9,18
-            1431: 7,19
-            1432: 7,19
-            1433: 8,18
-            1434: 9,17
-            1435: 9,16
-            1537: 18,24
-            1538: 17,23
-            1539: 19,23
-            1540: 20,21
-            1541: 20,20
-            1542: 20,20
-            1543: 17,20
-            1544: 17,21
-            1545: 18,20
-            1546: 16,20
-            1547: 16,22
-            1548: 20,20
-            1549: 21,21
-            1550: 22,20
-            1553: 23,20
-            1554: 24,21
-            1555: 22,21
-            1556: 22,22
-            1557: 24,22
-            1558: 23,24
-            1559: 24,24
-            1560: 24,25
-            1561: 23,23
-            1562: 23,22
-            1563: 22,25
-            1611: 38,35
-            1612: 36,35
-            1613: 38,36
-            1614: 37,34
-            1615: 40,32
-            1616: 40,31
-            1617: 40,30
-            1683: 30,17
-            1684: 30,21
-            1685: 33,18
-            1686: 35,19
-            1687: 34,23
-            1688: 33,25
-            1689: 35,23
-            1690: 30,24
-            1691: 29,23
-            1692: 35,28
-            1693: 34,27
-            1694: 33,30
-            1695: 33,29
-            1696: 37,30
-            1697: 36,22
-            1709: 25,21
-            1710: 26,22
-            1711: 26,23
-            1712: 27,20
-            1713: 26,19
-            1714: 25,15
-            1833: 25,27
-            1834: 26,28
-            1835: 27,30
-            1836: 25,32
-            1837: 25,33
-            1838: 26,34
-            1839: 27,34
-            1852: 9,21
-            1853: 10,22
-            1854: 7,21
-            1855: 8,22
-            1856: 8,24
-            2308: 55,-15
-            2309: 55,-14
-            2310: 54,-14
-            2311: 55,-16
-            2312: 57,-16
-            2313: 57,-15
-            2314: 57,-14
+            429: 42,-41
+            430: 42,-40
+            431: 46,-41
+            432: 44,-39
+            433: 43,-40
+            477: 21,-39
+            485: 31,-37
+            489: 32,-36
+            490: 32,-35
+            491: 29,-36
+            492: 29,-37
+            493: 27,-37
+            494: 27,-36
+            495: 25,-37
+            496: 25,-36
+            497: 24,-36
+            498: 23,-37
+            499: 22,-37
+            500: 20,-37
+            501: 17,-36
+            502: 18,-35
+            503: 18,-34
+            504: 16,-42
+            620: 18,-29
+            621: 19,-28
+            622: 20,-29
+            623: 22,-29
+            624: 21,-29
+            625: 22,-28
+            626: 20,-27
+            627: 21,-26
+            628: 21,-27
+            629: 20,-26
+            630: 14,-27
+            631: 15,-26
+            632: 13,-25
+            633: 15,-27
+            634: 15,-28
+            635: 15,-28
+            636: 16,-29
+            637: 16,-25
+            638: 26,-29
+            639: 26,-28
+            640: 27,-29
+            641: 15,-37
+            642: 16,-37
+            643: 15,-34
+            1245: 9,31
+            1246: 7,32
+            1247: 9,32
+            1248: 6,31
+            1249: 8,29
+            1250: 9,28
+            1251: 10,27
+            1252: 10,28
+            1332: 13,25
+            1333: 11,25
+            1334: 12,27
+            1335: 11,26
+            1336: 12,22
+            1337: 13,23
+            1338: 14,24
+            1339: 15,23
+            1340: 15,22
+            1341: 15,21
+            1342: 14,22
+            1343: 15,21
+            1344: 15,20
+            1345: 14,21
+            1380: 7,16
+            1381: 9,17
+            1382: 9,16
+            1383: 9,15
+            1384: 7,15
+            1385: 9,18
+            1386: 7,19
+            1387: 7,19
+            1388: 8,18
+            1389: 9,17
+            1390: 9,16
+            1492: 18,24
+            1493: 17,23
+            1494: 19,23
+            1495: 20,21
+            1496: 20,20
+            1497: 20,20
+            1498: 17,20
+            1499: 17,21
+            1500: 18,20
+            1501: 16,20
+            1502: 16,22
+            1503: 20,20
+            1504: 21,21
+            1505: 22,20
+            1508: 23,20
+            1509: 24,21
+            1510: 22,21
+            1511: 22,22
+            1512: 24,22
+            1513: 23,24
+            1514: 24,24
+            1515: 24,25
+            1516: 23,23
+            1517: 23,22
+            1518: 22,25
+            1566: 38,35
+            1567: 36,35
+            1568: 38,36
+            1569: 37,34
+            1570: 40,32
+            1571: 40,31
+            1572: 40,30
+            1638: 30,17
+            1639: 30,21
+            1640: 33,18
+            1641: 35,19
+            1642: 34,23
+            1643: 33,25
+            1644: 35,23
+            1645: 30,24
+            1646: 29,23
+            1647: 35,28
+            1648: 34,27
+            1649: 33,30
+            1650: 33,29
+            1651: 37,30
+            1652: 36,22
+            1664: 25,21
+            1665: 26,22
+            1666: 26,23
+            1667: 27,20
+            1668: 26,19
+            1669: 25,15
+            1788: 25,27
+            1789: 26,28
+            1790: 27,30
+            1791: 25,32
+            1792: 25,33
+            1793: 26,34
+            1794: 27,34
+            1807: 9,21
+            1808: 10,22
+            1809: 7,21
+            1810: 8,22
+            1811: 8,24
+            2263: 55,-15
+            2264: 55,-14
+            2265: 54,-14
+            2266: 55,-16
+            2267: 57,-16
+            2268: 57,-15
+            2269: 57,-14
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            425: 38,-41
-            426: 39,-40
-            427: 40,-39
-            428: 45,-41
-            429: 45,-39
-            430: 43,-38
-            503: 17,-41
-            504: 23,-39
-            505: 21,-37
-            506: 18,-36
-            507: 26,-36
-            512: 31,-35
-            513: 30,-36
-            514: 28,-37
-            659: 21,-28
-            660: 14,-26
-            661: 13,-25
-            662: 25,-29
-            1286: 8,30
-            1287: 7,30
-            1288: 7,31
-            1289: 8,32
-            1371: 13,22
-            1372: 13,21
-            1373: 11,22
-            1374: 8,26
-            1375: 12,25
-            1376: 11,27
-            1423: 7,18
-            1424: 8,19
-            1531: 18,20
-            1532: 19,21
-            1533: 19,22
-            1534: 17,22
-            1535: 19,23
-            1536: 17,24
-            1551: 23,21
-            1607: 39,30
-            1608: 37,33
-            1609: 37,34
-            1610: 39,34
-            2306: 56,-14
-            2307: 55,-16
+            421: 38,-41
+            422: 39,-40
+            423: 45,-41
+            424: 45,-39
+            425: 43,-38
+            478: 23,-39
+            479: 21,-37
+            480: 18,-36
+            481: 26,-36
+            486: 31,-35
+            487: 30,-36
+            488: 28,-37
+            614: 21,-28
+            615: 14,-26
+            616: 13,-25
+            617: 25,-29
+            1241: 8,30
+            1242: 7,30
+            1243: 7,31
+            1244: 8,32
+            1326: 13,22
+            1327: 13,21
+            1328: 11,22
+            1329: 8,26
+            1330: 12,25
+            1331: 11,27
+            1378: 7,18
+            1379: 8,19
+            1486: 18,20
+            1487: 19,21
+            1488: 19,22
+            1489: 17,22
+            1490: 19,23
+            1491: 17,24
+            1506: 23,21
+            1562: 39,30
+            1563: 37,33
+            1564: 37,34
+            1565: 39,34
+            2261: 56,-14
+            2262: 55,-16
         - node:
             color: '#FFFFFFFF'
             id: FlowersBRThree
           decals:
-            844: 46.966167,-9.531703
+            799: 46.966167,-9.531703
         - node:
             color: '#FFFFFFFF'
             id: FlowersBRTwo
           decals:
-            845: 46.013042,-9.281703
+            800: 46.013042,-9.281703
         - node:
             color: '#FFFFFFFF'
             id: Flowersy1
           decals:
-            843: 46.528667,-10.391078
+            798: 46.528667,-10.391078
         - node:
             color: '#FFFFFFFF'
             id: Flowersy4
           decals:
-            842: 45.934917,-10.937953
+            797: 45.934917,-10.937953
         - node:
             color: '#00000026'
             id: FullTileOverlayGreyscale
           decals:
-            994: 24,-6
-            995: 24,-6
-            996: 24,-5
-            997: 24,-5
+            949: 24,-6
+            950: 24,-6
+            951: 24,-5
+            952: 24,-5
         - node:
             color: '#0000004D'
             id: FullTileOverlayGreyscale
           decals:
-            1575: 24,17
-            1576: 24,17
-            1577: 24,18
-            1578: 24,18
+            1530: 24,17
+            1531: 24,17
+            1532: 24,18
+            1533: 24,18
         - node:
             color: '#9FED581F'
             id: FullTileOverlayGreyscale
           decals:
-            1753: 31,48
-            1754: 32,48
-            1755: 29,48
-            1756: 30,48
+            1708: 31,48
+            1709: 32,48
+            1710: 29,48
+            1711: 30,48
         - node:
             color: '#9FED5834'
             id: FullTileOverlayGreyscale
           decals:
-            860: 42,-9
-            884: 42,-11
-            885: 42,-10
-            886: 43,-10
-            887: 43,-11
-            888: 44,-11
-            889: 44,-10
+            815: 42,-9
+            839: 42,-11
+            840: 42,-10
+            841: 43,-10
+            842: 43,-11
+            843: 44,-11
+            844: 44,-10
         - node:
             color: '#9FED5896'
             id: FullTileOverlayGreyscale
           decals:
-            2344: 53,-2
-            2345: 53,0
-            2382: 68,5
-            2383: 68,6
-            2445: 68,4
-            2446: 68,3
+            2299: 53,-2
+            2300: 53,0
+            2337: 68,5
+            2338: 68,6
+            2400: 68,4
+            2401: 68,3
         - node:
             color: '#A4610696'
             id: FullTileOverlayGreyscale
           decals:
-            1277: 8,29
-            1278: 9,29
-            1487: 16,20
-            1488: 16,22
-            1489: 21,20
-            1490: 21,21
+            1232: 8,29
+            1233: 9,29
+            1442: 16,20
+            1443: 16,22
+            1444: 21,20
+            1445: 21,21
         - node:
             color: '#D4D4D40C'
             id: FullTileOverlayGreyscale
           decals:
-            1742: 28,44
-            1743: 26,44
+            1697: 28,44
+            1698: 26,44
         - node:
             color: '#DE3A3A31'
             id: FullTileOverlayGreyscale
           decals:
-            1757: 25,48
-            1758: 24,48
-            1759: 23,48
-            1760: 22,48
+            1712: 25,48
+            1713: 24,48
+            1714: 23,48
+            1715: 22,48
         - node:
             color: '#DE3A3A96'
             id: FullTileOverlayGreyscale
@@ -3194,13 +3172,13 @@ entities:
             64: 32,27
             92: 31,18
             93: 31,20
-            1658: 27,23
-            1659: 27,24
+            1613: 27,23
+            1614: 27,24
         - node:
             color: '#EFCC4125'
             id: FullTileOverlayGreyscale
           decals:
-            1059: 21,-31
+            1014: 21,-31
         - node:
             color: '#EFCC4193'
             id: FullTileOverlayGreyscale
@@ -3253,24 +3231,24 @@ entities:
             color: '#FFFFFFFF'
             id: Grassd1
           decals:
-            839: 46.966167,-10.031703
+            794: 46.966167,-10.031703
         - node:
             color: '#FFFFFFFF'
             id: Grassd3
           decals:
-            841: 46.075542,-9.266078
+            796: 46.075542,-9.266078
         - node:
             color: '#FFFFFFFF'
             id: Grasse1
           decals:
-            840: 46.950542,-9.281703
+            795: 46.950542,-9.281703
         - node:
             color: '#FFFFFFFF'
             id: Grasse3
           decals:
-            836: 46.966167,-10.891078
-            837: 46.091167,-10.859828
-            838: 46.263042,-10.062953
+            791: 46.966167,-10.891078
+            792: 46.091167,-10.859828
+            793: 46.263042,-10.062953
         - node:
             color: '#334E6DC8'
             id: HalfTileOverlayGreyscale
@@ -3278,67 +3256,67 @@ entities:
             229: 27,46
             230: 28,46
             231: 26,46
-            1768: 26,37
-            1769: 27,37
-            1770: 28,37
-            1771: 27,36
-            1772: 27,35
-            1908: 10,-6
-            1909: 11,-6
-            1910: 12,-6
+            1723: 26,37
+            1724: 27,37
+            1725: 28,37
+            1726: 27,36
+            1727: 27,35
+            1863: 10,-6
+            1864: 11,-6
+            1865: 12,-6
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale
           decals:
-            2457: 50,4
-            2495: 74,8
-            2496: 73,8
-            2497: 71,8
-            2498: 72,8
+            2412: 50,4
+            2450: 74,8
+            2451: 73,8
+            2452: 71,8
+            2453: 72,8
         - node:
             color: '#9FED5847'
             id: HalfTileOverlayGreyscale
           decals:
-            1749: 34,46
-            1750: 33,46
-            1751: 31,47
-            1752: 30,47
+            1704: 34,46
+            1705: 33,46
+            1706: 31,47
+            1707: 30,47
         - node:
             color: '#9FED5896'
             id: HalfTileOverlayGreyscale
           decals:
-            1804: 48,0
-            1805: 49,0
-            1806: 50,0
-            1807: 51,0
-            2249: 78,-4
-            2250: 79,-4
-            2251: 81,-4
-            2358: 77,5
-            2363: 79,2
-            2364: 80,2
-            2365: 81,2
-            2376: 75,2
-            2377: 74,2
-            2378: 73,2
-            2379: 72,2
-            2380: 70,2
-            2381: 69,2
-            2447: 68,2
-            2449: 57,3
-            2450: 55,3
-            2451: 54,3
+            1759: 48,0
+            1760: 49,0
+            1761: 50,0
+            1762: 51,0
+            2204: 78,-4
+            2205: 79,-4
+            2206: 81,-4
+            2313: 77,5
+            2318: 79,2
+            2319: 80,2
+            2320: 81,2
+            2331: 75,2
+            2332: 74,2
+            2333: 73,2
+            2334: 72,2
+            2335: 70,2
+            2336: 69,2
+            2402: 68,2
+            2404: 57,3
+            2405: 55,3
+            2406: 54,3
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale
           decals:
             187: 7,19
             188: 9,19
-            1240: 10,28
-            1241: 9,28
-            1242: 8,28
-            1249: 14,25
-            1253: 11,28
+            1195: 10,28
+            1196: 9,28
+            1197: 8,28
+            1204: 14,25
+            1208: 11,28
         - node:
             color: '#D0B78BFF'
             id: HalfTileOverlayGreyscale
@@ -3355,24 +3333,24 @@ entities:
             26: 62,25
             27: 63,25
             28: 64,25
-            2111: 53,11
-            2112: 52,11
-            2113: 51,11
-            2114: 50,11
-            2115: 48,11
-            2116: 49,11
-            2117: 55,11
+            2066: 53,11
+            2067: 52,11
+            2068: 51,11
+            2069: 50,11
+            2070: 48,11
+            2071: 49,11
+            2072: 55,11
         - node:
             color: '#D4D4D428'
             id: HalfTileOverlayGreyscale
           decals:
-            1045: 26,-4
+            1000: 26,-4
         - node:
             color: '#DE3A3A47'
             id: HalfTileOverlayGreyscale
           decals:
-            1762: 24,47
-            1763: 23,47
+            1717: 24,47
+            1718: 23,47
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale
@@ -3386,13 +3364,13 @@ entities:
             94: 36,31
             95: 37,31
             178: 36,24
-            1194: -2,-4
+            1149: -2,-4
         - node:
             color: '#EFB34128'
             id: HalfTileOverlayGreyscale
           decals:
-            1766: 20,46
-            1767: 21,46
+            1721: 20,46
+            1722: 21,46
         - node:
             color: '#EFCC4193'
             id: HalfTileOverlayGreyscale
@@ -3419,63 +3397,63 @@ entities:
             color: '#EFCC4582'
             id: HalfTileOverlayGreyscale
           decals:
-            477: 20,-39
-            478: 22,-39
+            463: 20,-39
+            464: 22,-39
         - node:
             color: '#334E6DC8'
             id: HalfTileOverlayGreyscale180
           decals:
-            1951: 10,-2
-            1952: 11,-2
-            1953: 12,-2
+            1906: 10,-2
+            1907: 11,-2
+            1908: 12,-2
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale180
           decals:
-            1812: 50,1
-            2482: 71,4
-            2491: 73,4
-            2492: 72,4
+            1767: 50,1
+            2437: 71,4
+            2446: 73,4
+            2447: 72,4
         - node:
             color: '#9FED5834'
             id: HalfTileOverlayGreyscale180
           decals:
-            1911: 12,-9
-            1912: 10,-9
-            1913: 11,-9
+            1866: 12,-9
+            1867: 10,-9
+            1868: 11,-9
         - node:
             color: '#9FED5837'
             id: HalfTileOverlayGreyscale180
           decals:
-            921: 46,-2
-            922: 45,-2
-            923: 44,-2
-            924: 43,-2
-            925: 42,-2
+            876: 46,-2
+            877: 45,-2
+            878: 44,-2
+            879: 43,-2
+            880: 42,-2
         - node:
             color: '#9FED5896'
             id: HalfTileOverlayGreyscale180
           decals:
-            2257: 81,-8
-            2258: 80,-8
-            2259: 79,-8
-            2348: 53,2
-            2366: 81,1
-            2367: 80,1
-            2368: 79,1
-            2369: 78,1
-            2370: 76,1
-            2371: 75,1
-            2372: 74,1
-            2373: 73,1
-            2374: 70,1
-            2375: 71,1
-            2388: 68,0
-            2389: 67,0
-            2390: 66,0
-            2391: 64,0
-            2392: 63,0
-            2404: 60,-8
+            2212: 81,-8
+            2213: 80,-8
+            2214: 79,-8
+            2303: 53,2
+            2321: 81,1
+            2322: 80,1
+            2323: 79,1
+            2324: 78,1
+            2325: 76,1
+            2326: 75,1
+            2327: 74,1
+            2328: 73,1
+            2329: 70,1
+            2330: 71,1
+            2343: 68,0
+            2344: 67,0
+            2345: 66,0
+            2346: 64,0
+            2347: 63,0
+            2359: 60,-8
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale180
@@ -3483,10 +3461,10 @@ entities:
             183: 8,15
             184: 7,15
             192: 9,15
-            1250: 12,21
-            1251: 11,21
-            1252: 10,21
-            1842: 9,21
+            1205: 12,21
+            1206: 11,21
+            1207: 10,21
+            1797: 9,21
         - node:
             color: '#D0B78BFF'
             id: HalfTileOverlayGreyscale180
@@ -3502,7 +3480,7 @@ entities:
             color: '#D4D4D428'
             id: HalfTileOverlayGreyscale180
           decals:
-            1046: 26,-2
+            1001: 26,-2
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale180
@@ -3516,7 +3494,7 @@ entities:
             91: 34,17
             96: 36,30
             99: 37,30
-            1195: -2,-6
+            1150: -2,-6
         - node:
             color: '#EFCC4193'
             id: HalfTileOverlayGreyscale180
@@ -3539,48 +3517,48 @@ entities:
             color: '#EFCC4582'
             id: HalfTileOverlayGreyscale180
           decals:
-            474: 20,-44
-            475: 21,-44
-            476: 22,-44
+            460: 20,-44
+            461: 21,-44
+            462: 22,-44
         - node:
             color: '#34A2C0B2'
             id: HalfTileOverlayGreyscale270
           decals:
-            959: 18,6
-            960: 18,7
-            961: 18,8
+            914: 18,6
+            915: 18,7
+            916: 18,8
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale270
           decals:
             102: 49,3
             103: 49,2
-            2436: 55,-6
-            2441: 55,-4
-            2484: 70,5
-            2485: 70,6
-            2486: 70,7
+            2391: 55,-6
+            2396: 55,-4
+            2439: 70,5
+            2440: 70,6
+            2441: 70,7
         - node:
             color: '#9FED5896'
             id: HalfTileOverlayGreyscale270
           decals:
-            2248: 76,-5
-            2262: 78,-7
-            2340: 52,3
-            2341: 54,-2
-            2342: 54,-1
-            2343: 54,0
-            2346: 54,1
-            2356: 76,3
-            2357: 76,4
-            2402: 59,-5
-            2403: 59,-4
-            2464: 65,3
-            2465: 65,4
-            2466: 62,3
-            2467: 62,4
-            2468: 59,3
-            2469: 59,4
+            2203: 76,-5
+            2217: 78,-7
+            2295: 52,3
+            2296: 54,-2
+            2297: 54,-1
+            2298: 54,0
+            2301: 54,1
+            2311: 76,3
+            2312: 76,4
+            2357: 59,-5
+            2358: 59,-4
+            2419: 65,3
+            2420: 65,4
+            2421: 62,3
+            2422: 62,4
+            2423: 59,3
+            2424: 59,4
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale270
@@ -3588,12 +3566,12 @@ entities:
             185: 7,16
             186: 7,17
             197: 7,18
-            1228: 7,22
-            1229: 7,23
-            1230: 7,24
-            1231: 7,25
-            1232: 7,26
-            1233: 7,27
+            1183: 7,22
+            1184: 7,23
+            1185: 7,24
+            1186: 7,25
+            1187: 7,26
+            1188: 7,27
         - node:
             color: '#D0B78BFF'
             id: HalfTileOverlayGreyscale270
@@ -3615,8 +3593,8 @@ entities:
             24: 53,24
             25: 53,23
             29: 58,18
-            2119: 47,10
-            2120: 47,9
+            2074: 47,10
+            2075: 47,9
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale270
@@ -3633,15 +3611,15 @@ entities:
             86: 32,19
             87: 32,18
             88: 32,17
-            1193: -3,-5
+            1148: -3,-5
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale270
           decals:
-            2639: 34,-49
-            2640: 34,-48
-            2641: 34,-47
-            2642: 34,-43
+            2594: 34,-49
+            2595: 34,-48
+            2596: 34,-47
+            2597: 34,-43
         - node:
             color: '#EFCC4193'
             id: HalfTileOverlayGreyscale270
@@ -3657,32 +3635,30 @@ entities:
             color: '#EFCC4582'
             id: HalfTileOverlayGreyscale270
           decals:
-            471: 19,-43
-            472: 19,-42
-            473: 19,-41
+            459: 19,-43
         - node:
             color: '#34A2C0B2'
             id: HalfTileOverlayGreyscale90
           decals:
-            956: 19,6
-            957: 19,8
-            958: 19,7
+            911: 19,6
+            912: 19,8
+            913: 19,7
         - node:
             color: '#52B4E94D'
             id: HalfTileOverlayGreyscale90
           decals:
-            998: 24,-6
-            999: 24,-5
+            953: 24,-6
+            954: 24,-5
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale90
           decals:
-            1814: 51,2
-            1815: 51,3
-            2435: 57,-5
-            2440: 57,-4
-            2493: 74,5
-            2494: 74,6
+            1769: 51,2
+            1770: 51,3
+            2390: 57,-5
+            2395: 57,-4
+            2448: 74,5
+            2449: 74,6
         - node:
             color: '#5A5A5AFF'
             id: HalfTileOverlayGreyscale90
@@ -3693,25 +3669,25 @@ entities:
             color: '#9FED5896'
             id: HalfTileOverlayGreyscale90
           decals:
-            1809: 52,-1
-            1810: 52,-2
-            2253: 82,-6
-            2254: 82,-5
-            2255: 82,-7
-            2354: 78,3
-            2355: 78,4
-            2393: 62,-1
-            2394: 62,-2
-            2395: 62,-3
-            2396: 62,-4
-            2397: 62,-5
-            2398: 62,-7
-            2458: 67,3
-            2459: 67,4
-            2460: 64,3
-            2461: 64,4
-            2462: 61,3
-            2463: 61,4
+            1764: 52,-1
+            1765: 52,-2
+            2208: 82,-6
+            2209: 82,-5
+            2210: 82,-7
+            2309: 78,3
+            2310: 78,4
+            2348: 62,-1
+            2349: 62,-2
+            2350: 62,-3
+            2351: 62,-4
+            2352: 62,-5
+            2353: 62,-7
+            2413: 67,3
+            2414: 67,4
+            2415: 64,3
+            2416: 64,4
+            2417: 61,3
+            2418: 61,4
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale90
@@ -3719,12 +3695,12 @@ entities:
             189: 9,18
             190: 9,17
             191: 9,16
-            1243: 13,27
-            1244: 13,26
-            1245: 15,24
-            1246: 15,23
-            1247: 15,22
-            1248: 15,21
+            1198: 13,27
+            1199: 13,26
+            1200: 15,24
+            1201: 15,23
+            1202: 15,22
+            1203: 15,21
         - node:
             color: '#D0B78BFF'
             id: HalfTileOverlayGreyscale90
@@ -3760,18 +3736,18 @@ entities:
             56: 34,29
             57: 34,30
             179: 36,23
-            1192: -1,-5
-            1645: 27,17
-            1646: 27,18
-            1647: 27,19
-            1648: 27,20
-            1649: 27,21
-            1650: 27,26
-            1651: 27,27
-            1652: 27,28
-            1653: 27,29
-            1654: 27,30
-            1655: 27,31
+            1147: -1,-5
+            1600: 27,17
+            1601: 27,18
+            1602: 27,19
+            1603: 27,20
+            1604: 27,21
+            1605: 27,26
+            1606: 27,27
+            1607: 27,28
+            1608: 27,29
+            1609: 27,30
+            1610: 27,31
         - node:
             color: '#EFCC4193'
             id: HalfTileOverlayGreyscale90
@@ -3788,42 +3764,42 @@ entities:
             color: '#EFCC4582'
             id: HalfTileOverlayGreyscale90
           decals:
-            468: 23,-43
-            469: 23,-42
-            470: 23,-41
+            456: 23,-43
+            457: 23,-42
+            458: 23,-41
         - node:
             angle: -3.141592653589793 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            1643: 39,24
-            1644: 40,24
+            1598: 39,24
+            1599: 40,24
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            1276: 9,26
-            1518: 23,25
-            1666: 31,18
-            1667: 31,20
-            2339: 52,0
+            1231: 9,26
+            1473: 23,25
+            1621: 31,18
+            1622: 31,20
+            2294: 52,0
         - node:
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            1516: 22,23
-            1517: 22,24
+            1471: 22,23
+            1472: 22,24
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            1221: 13,-2
-            1222: 14,-2
-            1223: 15,-2
-            1841: 9,24
-            2338: 52,-2
+            1176: 13,-2
+            1177: 14,-2
+            1178: 15,-2
+            1796: 9,24
+            2293: 52,-2
         - node:
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
@@ -3834,7 +3810,7 @@ entities:
             color: '#FFFFFFFF'
             id: North
           decals:
-            1200: -17,-14
+            1155: -17,-14
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale
@@ -3847,48 +3823,48 @@ entities:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale
           decals:
-            2541: 105,-19
-            2542: 106,-18
-            2543: 107,-19
-            2544: 103,-19
-            2545: 103,-17
-            2546: 106,-17
-            2547: 107,-20
-            2548: 106,-17
-            2549: 104,-16
-            2550: 104,-19
-            2551: 105,-19
-            2552: 104,-17
-            2553: 104,-18
-            2554: 108,-18
-            2555: 108,-16
+            2496: 105,-19
+            2497: 106,-18
+            2498: 107,-19
+            2499: 103,-19
+            2500: 103,-17
+            2501: 106,-17
+            2502: 107,-20
+            2503: 106,-17
+            2504: 104,-16
+            2505: 104,-19
+            2506: 105,-19
+            2507: 104,-17
+            2508: 104,-18
+            2509: 108,-18
+            2510: 108,-16
         - node:
             color: '#797C8250'
             id: QuarterTileOverlayGreyscale
           decals:
-            2175: 54,15
-            2176: 54,15
-            2177: 55,15
-            2178: 55,15
-            2179: 56,15
-            2180: 56,15
-            2181: 57,15
-            2182: 57,15
-            2183: 58,15
-            2184: 58,15
+            2130: 54,15
+            2131: 54,15
+            2132: 55,15
+            2133: 55,15
+            2134: 56,15
+            2135: 56,15
+            2136: 57,15
+            2137: 57,15
+            2138: 58,15
+            2139: 58,15
         - node:
             color: '#80C71FFF'
             id: QuarterTileOverlayGreyscale
           decals:
-            2591: 106,-19
-            2592: 107,-17
-            2593: 103,-16
-            2594: 102,-20
+            2546: 106,-19
+            2547: 107,-17
+            2548: 103,-16
+            2549: 102,-20
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale
           decals:
-            2362: 76,2
+            2317: 76,2
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale
@@ -3903,94 +3879,94 @@ entities:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale
           decals:
-            1109: -22,-13
-            1110: -21,-13
-            1111: -19,-13
-            1112: -18,-13
-            1113: -17,-13
-            1114: -16,-13
-            1115: -15,-13
-            1116: -14,-13
-            1117: -12,-13
-            1118: -11,-13
-            1119: -10,-13
-            1120: -9,-13
-            1121: -8,-13
-            1122: -7,-13
-            1123: -7,-12
-            1124: -7,-11
-            1125: -7,-10
-            1126: -7,-9
-            1127: -7,-8
-            1128: -7,-7
-            1201: 3,0
-            1202: 3,1
-            1203: 3,2
-            1204: 3,3
-            1205: 3,4
-            1206: 3,5
-            1207: 3,6
-            1208: 3,7
-            1209: 3,8
-            1210: 3,9
-            1211: 3,10
-            1212: 3,11
-            1213: 3,12
-            1214: 3,13
-            1215: 4,13
-            1216: 6,13
-            1217: 5,13
-            1579: 25,17
-            1580: 25,18
-            1581: 25,19
-            1582: 25,20
-            1583: 25,21
-            1584: 25,22
-            1585: 25,23
-            1586: 25,24
-            1587: 25,25
-            1588: 35,29
-            1798: 25,26
-            1992: 18,1
-            1993: 19,1
-            1994: 20,1
-            1995: 21,1
-            1996: 22,1
-            1997: 23,1
-            1998: 24,1
-            1999: 25,1
-            2000: 25,2
-            2001: 25,3
-            2050: 39,15
-            2051: 40,15
-            2052: 41,15
-            2053: 43,15
-            2054: 42,15
-            2055: 44,15
-            2056: 45,15
-            2057: 45,16
-            2058: 45,17
-            2059: 45,18
-            2060: 45,19
-            2061: 46,19
-            2062: 47,19
-            2063: 40,11
-            2064: 40,10
-            2065: 40,8
-            2066: 40,7
-            2067: 40,9
-            2068: 40,6
-            2069: 40,5
-            2070: 40,4
-            2071: 40,3
+            1064: -22,-13
+            1065: -21,-13
+            1066: -19,-13
+            1067: -18,-13
+            1068: -17,-13
+            1069: -16,-13
+            1070: -15,-13
+            1071: -14,-13
+            1072: -12,-13
+            1073: -11,-13
+            1074: -10,-13
+            1075: -9,-13
+            1076: -8,-13
+            1077: -7,-13
+            1078: -7,-12
+            1079: -7,-11
+            1080: -7,-10
+            1081: -7,-9
+            1082: -7,-8
+            1083: -7,-7
+            1156: 3,0
+            1157: 3,1
+            1158: 3,2
+            1159: 3,3
+            1160: 3,4
+            1161: 3,5
+            1162: 3,6
+            1163: 3,7
+            1164: 3,8
+            1165: 3,9
+            1166: 3,10
+            1167: 3,11
+            1168: 3,12
+            1169: 3,13
+            1170: 4,13
+            1171: 6,13
+            1172: 5,13
+            1534: 25,17
+            1535: 25,18
+            1536: 25,19
+            1537: 25,20
+            1538: 25,21
+            1539: 25,22
+            1540: 25,23
+            1541: 25,24
+            1542: 25,25
+            1543: 35,29
+            1753: 25,26
+            1947: 18,1
+            1948: 19,1
+            1949: 20,1
+            1950: 21,1
+            1951: 22,1
+            1952: 23,1
+            1953: 24,1
+            1954: 25,1
+            1955: 25,2
+            1956: 25,3
+            2005: 39,15
+            2006: 40,15
+            2007: 41,15
+            2008: 43,15
+            2009: 42,15
+            2010: 44,15
+            2011: 45,15
+            2012: 45,16
+            2013: 45,17
+            2014: 45,18
+            2015: 45,19
+            2016: 46,19
+            2017: 47,19
+            2018: 40,11
+            2019: 40,10
+            2020: 40,8
+            2021: 40,7
+            2022: 40,9
+            2023: 40,6
+            2024: 40,5
+            2025: 40,4
+            2026: 40,3
         - node:
             color: '#D5188DFF'
             id: QuarterTileOverlayGreyscale
           decals:
-            2579: 103,-18
-            2580: 106,-16
-            2581: 108,-20
-            2582: 103,-21
+            2534: 103,-18
+            2535: 106,-16
+            2536: 108,-20
+            2537: 103,-21
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale
@@ -4000,48 +3976,48 @@ entities:
             61: 32,30
             72: 33,24
             100: 36,30
-            784: 24,-25
-            785: 24,-24
-            1000: 27,5
-            1001: 26,5
-            1002: 25,5
-            1003: 25,6
-            1004: 26,6
-            1005: 26,6
-            1006: 25,6
-            1007: 25,5
-            1008: 26,5
-            1009: 27,5
-            1010: 27,6
-            1011: 27,6
-            1012: 27,7
-            1013: 27,7
-            1014: 26,7
-            1015: 26,7
-            1016: 25,7
-            1017: 25,7
-            1018: 25,8
-            1019: 25,8
-            1020: 26,8
-            1021: 26,8
-            1022: 27,8
-            1023: 27,8
-            1152: -7,0
-            1153: -6,0
-            1154: -2,0
-            1155: -1,0
-            1156: 0,0
-            1157: 1,0
-            1158: 2,0
-            1634: 38,24
-            1635: 38,23
+            739: 24,-25
+            740: 24,-24
+            955: 27,5
+            956: 26,5
+            957: 25,5
+            958: 25,6
+            959: 26,6
+            960: 26,6
+            961: 25,6
+            962: 25,5
+            963: 26,5
+            964: 27,5
+            965: 27,6
+            966: 27,6
+            967: 27,7
+            968: 27,7
+            969: 26,7
+            970: 26,7
+            971: 25,7
+            972: 25,7
+            973: 25,8
+            974: 25,8
+            975: 26,8
+            976: 26,8
+            977: 27,8
+            978: 27,8
+            1107: -7,0
+            1108: -6,0
+            1109: -2,0
+            1110: -1,0
+            1111: 0,0
+            1112: 1,0
+            1113: 2,0
+            1589: 38,24
+            1590: 38,23
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale
           decals:
-            1944: 12,-8
-            1946: 11,-8
-            1947: 10,-8
+            1899: 12,-8
+            1901: 11,-8
+            1902: 10,-8
         - node:
             color: '#EFCC4193'
             id: QuarterTileOverlayGreyscale
@@ -4052,99 +4028,99 @@ entities:
             color: '#0E7F1BFF'
             id: QuarterTileOverlayGreyscale180
           decals:
-            2583: 102,-21
-            2584: 104,-20
-            2585: 107,-16
-            2586: 108,-18
-            2587: 102,-16
+            2538: 102,-21
+            2539: 104,-20
+            2540: 107,-16
+            2541: 108,-18
+            2542: 102,-16
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale180
           decals:
-            1950: 9,-2
-            2556: 104,-19
+            1905: 9,-2
+            2511: 104,-19
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale180
           decals:
-            786: 28,-25
-            787: 28,-24
-            2499: 74,7
+            741: 28,-25
+            742: 28,-24
+            2454: 74,7
         - node:
             color: '#797979AB'
             id: QuarterTileOverlayGreyscale180
           decals:
-            1024: 27,5
-            1025: 26,5
-            1026: 25,5
-            1027: 25,6
-            1028: 26,6
-            1029: 27,6
-            1030: 27,7
-            1031: 26,7
-            1032: 25,7
-            1033: 25,8
-            1034: 26,8
-            1035: 27,8
+            979: 27,5
+            980: 26,5
+            981: 25,5
+            982: 25,6
+            983: 26,6
+            984: 27,6
+            985: 27,7
+            986: 26,7
+            987: 25,7
+            988: 25,8
+            989: 26,8
+            990: 27,8
         - node:
             color: '#797C8250'
             id: QuarterTileOverlayGreyscale180
           decals:
-            2147: 60,13
-            2148: 60,13
-            2149: 59,13
-            2150: 59,13
-            2151: 58,13
-            2152: 58,13
-            2153: 58,12
-            2154: 58,12
-            2155: 58,8
-            2156: 58,8
-            2185: 64,13
-            2186: 64,13
-            2187: 64,14
-            2188: 64,14
-            2195: 60,17
-            2196: 60,17
-            2197: 60,18
-            2198: 60,18
-            2199: 60,19
-            2200: 60,19
-            2201: 60,20
-            2202: 60,20
-            2219: 54,22
-            2220: 54,22
-            2221: 55,22
-            2222: 55,22
-            2223: 56,22
-            2224: 56,22
-            2225: 57,22
-            2226: 57,22
+            2102: 60,13
+            2103: 60,13
+            2104: 59,13
+            2105: 59,13
+            2106: 58,13
+            2107: 58,13
+            2108: 58,12
+            2109: 58,12
+            2110: 58,8
+            2111: 58,8
+            2140: 64,13
+            2141: 64,13
+            2142: 64,14
+            2143: 64,14
+            2150: 60,17
+            2151: 60,17
+            2152: 60,18
+            2153: 60,18
+            2154: 60,19
+            2155: 60,19
+            2156: 60,20
+            2157: 60,20
+            2174: 54,22
+            2175: 54,22
+            2176: 55,22
+            2177: 55,22
+            2178: 56,22
+            2179: 56,22
+            2180: 57,22
+            2181: 57,22
         - node:
             color: '#80C71FFF'
             id: QuarterTileOverlayGreyscale180
           decals:
-            2595: 108,-20
-            2596: 103,-21
+            2550: 108,-20
+            2551: 103,-21
         - node:
             color: '#951710FF'
             id: QuarterTileOverlayGreyscale180
           decals:
-            2588: 107,-20
+            2543: 107,-20
         - node:
             color: '#9FED5837'
             id: QuarterTileOverlayGreyscale180
           decals:
-            927: 41,-2
+            882: 41,-2
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale180
           decals:
-            2386: 69,1
-            2400: 62,0
-            2524: 105,-17
-            2525: 106,-18
-            2526: 103,-19
+            2341: 69,1
+            2355: 62,0
+            2479: 105,-17
+            2480: 106,-18
+            2481: 103,-19
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale180
@@ -4160,85 +4136,85 @@ entities:
             id: QuarterTileOverlayGreyscale180
           decals:
             33: 61,13
-            2576: 106,-19
-            2577: 108,-17
-            2578: 108,-19
+            2531: 106,-19
+            2532: 108,-17
+            2533: 108,-19
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale180
           decals:
-            985: 27,-13
-            986: 27,-12
-            987: 27,-11
-            988: 27,-10
-            989: 27,-9
-            990: 27,-8
-            991: 27,-7
-            992: 27,-6
-            993: 27,-5
-            1168: -6,-14
-            1169: -6,-13
-            1170: -6,-12
-            1171: -6,-11
-            1172: -6,-10
-            1173: -6,-9
-            1174: -6,-8
-            1175: -6,-7
-            1176: -6,-6
-            1177: -6,-5
-            1178: -6,-4
-            1179: -6,-3
-            1180: -6,-2
-            1181: -5,-2
-            1182: -4,-2
-            1183: -3,-2
-            1184: -2,-2
-            1185: -1,-2
-            1186: 0,-2
-            1187: 1,-2
-            1799: 27,33
-            1800: 27,34
-            1801: 28,34
-            1802: 28,35
-            1803: 28,36
-            2016: 38,-1
-            2017: 37,-1
-            2018: 36,-1
-            2019: 35,-1
-            2020: 34,-1
-            2021: 33,-1
-            2022: 32,-1
-            2023: 32,-1
-            2024: 31,-1
-            2025: 30,-1
-            2026: 29,-1
-            2027: 28,-1
-            2028: 27,-1
-            2037: 13,-1
-            2038: 14,-1
-            2039: 16,-1
-            2040: 15,-1
+            940: 27,-13
+            941: 27,-12
+            942: 27,-11
+            943: 27,-10
+            944: 27,-9
+            945: 27,-8
+            946: 27,-7
+            947: 27,-6
+            948: 27,-5
+            1123: -6,-14
+            1124: -6,-13
+            1125: -6,-12
+            1126: -6,-11
+            1127: -6,-10
+            1128: -6,-9
+            1129: -6,-8
+            1130: -6,-7
+            1131: -6,-6
+            1132: -6,-5
+            1133: -6,-4
+            1134: -6,-3
+            1135: -6,-2
+            1136: -5,-2
+            1137: -4,-2
+            1138: -3,-2
+            1139: -2,-2
+            1140: -1,-2
+            1141: 0,-2
+            1142: 1,-2
+            1754: 27,33
+            1755: 27,34
+            1756: 28,34
+            1757: 28,35
+            1758: 28,36
+            1971: 38,-1
+            1972: 37,-1
+            1973: 36,-1
+            1974: 35,-1
+            1975: 34,-1
+            1976: 33,-1
+            1977: 32,-1
+            1978: 32,-1
+            1979: 31,-1
+            1980: 30,-1
+            1981: 29,-1
+            1982: 28,-1
+            1983: 27,-1
+            1992: 13,-1
+            1993: 14,-1
+            1994: 16,-1
+            1995: 15,-1
         - node:
             color: '#D4D4D496'
             id: QuarterTileOverlayGreyscale180
           decals:
-            1075: -22,-15
-            1076: -21,-15
-            1077: -20,-15
-            1078: -19,-15
-            1079: -18,-15
-            1080: -17,-15
-            1081: -16,-15
-            1082: -15,-15
-            1083: -14,-15
-            1084: -13,-15
-            1085: -12,-15
-            1086: -11,-15
-            1087: -10,-15
-            1088: -9,-15
-            1089: -8,-15
-            1090: -7,-15
-            1091: -6,-15
+            1030: -22,-15
+            1031: -21,-15
+            1032: -20,-15
+            1033: -19,-15
+            1034: -18,-15
+            1035: -17,-15
+            1036: -16,-15
+            1037: -15,-15
+            1038: -14,-15
+            1039: -13,-15
+            1040: -12,-15
+            1041: -11,-15
+            1042: -10,-15
+            1043: -9,-15
+            1044: -8,-15
+            1045: -7,-15
+            1046: -6,-15
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale180
@@ -4248,37 +4224,37 @@ entities:
             89: 32,17
             97: 37,31
             180: 36,24
-            2516: 105,-19
-            2517: 104,-18
-            2518: 106,-16
-            2519: 107,-17
-            2520: 107,-19
-            2521: 103,-17
-            2522: 102,-18
-            2523: 103,-20
+            2471: 105,-19
+            2472: 104,-18
+            2473: 106,-16
+            2474: 107,-17
+            2475: 107,-19
+            2476: 103,-17
+            2477: 102,-18
+            2478: 103,-20
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale180
           decals:
-            1945: 11,-7
-            1948: 10,-7
-            1949: 9,-7
+            1900: 11,-7
+            1903: 10,-7
+            1904: 9,-7
         - node:
             color: '#EFCC2E82'
             id: QuarterTileOverlayGreyscale180
           decals:
-            768: 27,-14
-            769: 27,-15
-            770: 27,-16
-            771: 27,-17
-            772: 27,-18
-            773: 27,-19
-            774: 27,-20
-            775: 27,-21
-            776: 27,-22
-            777: 27,-23
-            778: 27,-24
-            779: 27,-25
+            723: 27,-14
+            724: 27,-15
+            725: 27,-16
+            726: 27,-17
+            727: 27,-18
+            728: 27,-19
+            729: 27,-20
+            730: 27,-21
+            731: 27,-22
+            732: 27,-23
+            733: 27,-24
+            734: 27,-25
         - node:
             color: '#EFCC4193'
             id: QuarterTileOverlayGreyscale180
@@ -4288,115 +4264,115 @@ entities:
             color: '#EFCC4593'
             id: QuarterTileOverlayGreyscale180
           decals:
-            793: 22,-20
-            794: 22,-19
-            795: 22,-18
-            796: 22,-17
-            797: 22,-16
+            748: 22,-20
+            749: 22,-19
+            750: 22,-18
+            751: 22,-17
+            752: 22,-16
         - node:
             color: '#FED83DFF'
             id: QuarterTileOverlayGreyscale180
           decals:
-            2557: 105,-16
-            2558: 106,-17
-            2559: 105,-20
-            2560: 102,-20
-            2561: 102,-17
+            2512: 105,-16
+            2513: 106,-17
+            2514: 105,-20
+            2515: 102,-20
+            2516: 102,-17
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale270
           decals:
-            1959: 8,-2
+            1914: 8,-2
         - node:
             color: '#3C44AAFF'
             id: QuarterTileOverlayGreyscale270
           decals:
-            2566: 104,-16
-            2567: 102,-19
-            2568: 107,-17
-            2569: 108,-16
+            2521: 104,-16
+            2522: 102,-19
+            2523: 107,-17
+            2524: 108,-16
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale270
           decals:
-            1092: -22,-15
-            1093: -21,-15
-            1094: -20,-15
-            1095: -19,-15
-            1096: -18,-15
-            1097: -17,-15
-            1098: -16,-15
-            1099: -15,-15
-            1100: -14,-15
-            1101: -13,-15
-            1102: -12,-15
-            1103: -11,-15
-            1104: -10,-15
-            1105: -9,-15
-            1106: -8,-15
-            1107: -7,-15
-            1108: -6,-15
+            1047: -22,-15
+            1048: -21,-15
+            1049: -20,-15
+            1050: -19,-15
+            1051: -18,-15
+            1052: -17,-15
+            1053: -16,-15
+            1054: -15,-15
+            1055: -14,-15
+            1056: -13,-15
+            1057: -12,-15
+            1058: -11,-15
+            1059: -10,-15
+            1060: -9,-15
+            1061: -8,-15
+            1062: -7,-15
+            1063: -6,-15
         - node:
             color: '#797C8250'
             id: QuarterTileOverlayGreyscale270
           decals:
-            2157: 57,8
-            2158: 57,8
-            2159: 57,9
-            2160: 57,9
-            2161: 57,10
-            2162: 57,10
-            2163: 57,11
-            2164: 57,11
-            2165: 57,12
-            2166: 57,12
-            2167: 57,13
-            2168: 57,13
-            2169: 56,13
-            2170: 56,13
-            2171: 55,13
-            2172: 55,13
-            2173: 54,13
-            2174: 54,13
-            2203: 58,20
-            2204: 58,20
+            2112: 57,8
+            2113: 57,8
+            2114: 57,9
+            2115: 57,9
+            2116: 57,10
+            2117: 57,10
+            2118: 57,11
+            2119: 57,11
+            2120: 57,12
+            2121: 57,12
+            2122: 57,13
+            2123: 57,13
+            2124: 56,13
+            2125: 56,13
+            2126: 55,13
+            2127: 55,13
+            2128: 54,13
+            2129: 54,13
+            2158: 58,20
+            2159: 58,20
         - node:
             color: '#951710FF'
             id: QuarterTileOverlayGreyscale270
           decals:
-            2589: 103,-19
-            2590: 105,-16
+            2544: 103,-19
+            2545: 105,-16
         - node:
             color: '#9FED5837'
             id: QuarterTileOverlayGreyscale270
           decals:
-            926: 47,-2
+            881: 47,-2
         - node:
             color: '#9FED5853'
             id: QuarterTileOverlayGreyscale270
           decals:
-            1954: 5,-2
-            1955: 6,-2
-            1956: 7,-2
-            1957: 4,-2
-            1958: 3,-2
+            1909: 5,-2
+            1910: 6,-2
+            1911: 7,-2
+            1912: 4,-2
+            1913: 3,-2
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale270
           decals:
-            2261: 78,-6
-            2347: 54,2
-            2527: 106,-19
-            2528: 105,-18
-            2529: 103,-16
-            2530: 102,-17
-            2531: 103,-18
+            2216: 78,-6
+            2302: 54,2
+            2482: 106,-19
+            2483: 105,-18
+            2484: 103,-16
+            2485: 102,-17
+            2486: 103,-18
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale270
           decals:
             195: 7,19
-            1254: 13,21
+            1209: 13,21
         - node:
             color: '#D381C996'
             id: QuarterTileOverlayGreyscale270
@@ -4407,92 +4383,92 @@ entities:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale270
           decals:
-            930: 8,9
-            931: 9,9
-            932: 10,9
-            933: 11,9
-            934: 12,9
-            935: 13,9
-            936: 14,9
-            937: 15,9
-            938: 16,9
-            939: 17,9
-            940: 18,9
-            941: 19,9
-            970: 22,15
-            971: 21,15
-            972: 20,15
-            976: 25,-13
-            977: 25,-12
-            978: 25,-11
-            979: 25,-10
-            980: 25,-9
-            981: 25,-8
-            982: 25,-7
-            983: 25,-6
-            984: 25,-5
-            1129: -7,-5
-            1130: -7,-4
-            1131: -7,-3
-            1132: -7,-2
-            1133: -7,-1
-            1134: -7,0
-            1725: 37,13
-            1726: 36,13
-            1727: 35,13
-            1728: 34,13
-            1729: 33,13
-            1730: 32,13
-            1731: 31,13
-            1732: 30,13
-            1733: 29,13
-            1734: 28,13
-            1735: 25,12
-            1736: 25,13
-            1737: 25,14
-            1738: 25,15
-            1782: 17,35
-            1783: 18,35
-            1784: 19,35
-            1785: 20,35
-            1786: 21,35
-            1787: 22,35
-            1788: 23,35
-            1789: 24,35
-            1790: 25,35
-            1791: 25,34
-            1792: 25,33
-            1793: 25,32
-            1794: 25,31
-            1795: 25,30
-            1796: 25,29
-            1797: 25,28
-            2029: 25,-1
-            2030: 24,-1
-            2031: 23,-1
-            2032: 22,-1
-            2033: 21,-1
-            2034: 20,-1
-            2035: 19,-1
-            2036: 18,-1
-            2041: 39,13
-            2042: 40,13
-            2043: 41,13
-            2044: 42,13
-            2045: 43,13
-            2046: 44,13
-            2047: 45,13
-            2048: 46,13
-            2049: 47,13
-            2510: 40,-1
-            2511: 41,-1
-            2512: 41,-2
+            885: 8,9
+            886: 9,9
+            887: 10,9
+            888: 11,9
+            889: 12,9
+            890: 13,9
+            891: 14,9
+            892: 15,9
+            893: 16,9
+            894: 17,9
+            895: 18,9
+            896: 19,9
+            925: 22,15
+            926: 21,15
+            927: 20,15
+            931: 25,-13
+            932: 25,-12
+            933: 25,-11
+            934: 25,-10
+            935: 25,-9
+            936: 25,-8
+            937: 25,-7
+            938: 25,-6
+            939: 25,-5
+            1084: -7,-5
+            1085: -7,-4
+            1086: -7,-3
+            1087: -7,-2
+            1088: -7,-1
+            1089: -7,0
+            1680: 37,13
+            1681: 36,13
+            1682: 35,13
+            1683: 34,13
+            1684: 33,13
+            1685: 32,13
+            1686: 31,13
+            1687: 30,13
+            1688: 29,13
+            1689: 28,13
+            1690: 25,12
+            1691: 25,13
+            1692: 25,14
+            1693: 25,15
+            1737: 17,35
+            1738: 18,35
+            1739: 19,35
+            1740: 20,35
+            1741: 21,35
+            1742: 22,35
+            1743: 23,35
+            1744: 24,35
+            1745: 25,35
+            1746: 25,34
+            1747: 25,33
+            1748: 25,32
+            1749: 25,31
+            1750: 25,30
+            1751: 25,29
+            1752: 25,28
+            1984: 25,-1
+            1985: 24,-1
+            1986: 23,-1
+            1987: 22,-1
+            1988: 21,-1
+            1989: 20,-1
+            1990: 19,-1
+            1991: 18,-1
+            1996: 39,13
+            1997: 40,13
+            1998: 41,13
+            1999: 42,13
+            2000: 43,13
+            2001: 44,13
+            2002: 45,13
+            2003: 46,13
+            2004: 47,13
+            2465: 40,-1
+            2466: 41,-1
+            2467: 41,-2
         - node:
             color: '#D4D4D496'
             id: QuarterTileOverlayGreyscale270
           decals:
-            780: 24,-25
-            781: 24,-24
+            735: 24,-25
+            736: 24,-24
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale270
@@ -4506,18 +4482,18 @@ entities:
             color: '#EFCC2E82'
             id: QuarterTileOverlayGreyscale270
           decals:
-            756: 25,-25
-            757: 25,-24
-            758: 25,-23
-            759: 25,-22
-            760: 25,-21
-            761: 25,-20
-            762: 25,-19
-            763: 25,-18
-            764: 25,-17
-            765: 25,-16
-            766: 25,-15
-            767: 25,-14
+            711: 25,-25
+            712: 25,-24
+            713: 25,-23
+            714: 25,-22
+            715: 25,-21
+            716: 25,-20
+            717: 25,-19
+            718: 25,-18
+            719: 25,-17
+            720: 25,-16
+            721: 25,-15
+            722: 25,-14
         - node:
             color: '#EFCC4193'
             id: QuarterTileOverlayGreyscale270
@@ -4527,19 +4503,19 @@ entities:
             color: '#EFCC4593'
             id: QuarterTileOverlayGreyscale270
           decals:
-            788: 20,-20
-            789: 20,-19
-            790: 20,-18
-            791: 20,-17
-            792: 20,-16
+            743: 20,-20
+            744: 20,-19
+            745: 20,-18
+            746: 20,-17
+            747: 20,-16
         - node:
             color: '#F9801DFF'
             id: QuarterTileOverlayGreyscale270
           decals:
-            2562: 105,-17
-            2563: 104,-17
-            2564: 107,-18
-            2565: 106,-20
+            2517: 105,-17
+            2518: 104,-17
+            2519: 107,-18
+            2520: 106,-20
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale90
@@ -4552,155 +4528,155 @@ entities:
             color: '#797C8250'
             id: QuarterTileOverlayGreyscale90
           decals:
-            2189: 64,16
-            2190: 64,16
-            2191: 63,16
-            2192: 63,16
-            2193: 62,16
-            2194: 62,16
-            2205: 60,25
-            2206: 60,25
-            2207: 59,25
-            2208: 59,25
-            2209: 58,25
-            2210: 58,25
-            2211: 57,25
-            2212: 57,25
-            2213: 56,25
-            2214: 56,25
-            2215: 55,25
-            2216: 55,25
-            2217: 54,25
-            2218: 54,25
+            2144: 64,16
+            2145: 64,16
+            2146: 63,16
+            2147: 63,16
+            2148: 62,16
+            2149: 62,16
+            2160: 60,25
+            2161: 60,25
+            2162: 59,25
+            2163: 59,25
+            2164: 58,25
+            2165: 58,25
+            2166: 57,25
+            2167: 57,25
+            2168: 56,25
+            2169: 56,25
+            2170: 55,25
+            2171: 55,25
+            2172: 54,25
+            2173: 54,25
         - node:
             color: '#8932B8FF'
             id: QuarterTileOverlayGreyscale90
           decals:
-            2570: 105,-20
-            2571: 102,-16
-            2572: 107,-18
-            2573: 105,-18
+            2525: 105,-20
+            2526: 102,-16
+            2527: 107,-18
+            2528: 105,-18
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale90
           decals:
-            2361: 78,2
-            2452: 53,3
-            2470: 67,2
+            2316: 78,2
+            2407: 53,3
+            2425: 67,2
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale90
           decals:
             194: 9,15
-            1255: 13,25
+            1210: 13,25
         - node:
             color: '#D381C996'
             id: QuarterTileOverlayGreyscale90
           decals:
-            2574: 104,-19
-            2575: 104,-16
+            2529: 104,-19
+            2530: 104,-16
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale90
           decals:
-            942: 8,10
-            943: 9,10
-            944: 10,10
-            945: 11,10
-            946: 12,10
-            947: 13,10
-            948: 14,10
-            949: 15,10
-            950: 16,10
-            951: 17,10
-            952: 18,10
-            953: 19,10
-            973: 19,12
-            974: 20,12
-            975: 21,12
-            1715: 28,15
-            1716: 29,15
-            1717: 30,15
-            1718: 31,15
-            1719: 32,15
-            1720: 33,15
-            1721: 34,15
-            1722: 35,15
-            1723: 36,15
-            1724: 37,15
-            1773: 25,37
-            1774: 24,37
-            1775: 23,37
-            1776: 22,37
-            1777: 21,37
-            1778: 20,37
-            1779: 19,37
-            1780: 18,37
-            1781: 17,37
-            1960: 16,1
-            1961: 15,1
-            1962: 14,1
-            1963: 13,1
-            1964: 12,1
-            1965: 11,1
-            1966: 10,1
-            1967: 9,1
-            1968: 8,1
-            1969: 7,1
-            1970: 6,1
-            1971: 6,2
-            1972: 6,3
-            1973: 6,4
-            1974: 6,5
-            1975: 6,7
-            1976: 6,6
-            1977: 6,8
-            1978: 6,11
-            1979: 6,12
-            1980: 6,13
-            2002: 27,3
-            2003: 27,2
-            2004: 27,1
-            2005: 28,1
-            2006: 29,1
-            2007: 30,1
-            2008: 31,1
-            2009: 32,1
-            2010: 33,1
-            2011: 34,1
-            2012: 35,1
-            2013: 36,1
-            2014: 37,1
-            2015: 38,1
-            2072: 42,3
-            2073: 42,4
-            2074: 42,5
-            2075: 42,6
-            2076: 42,7
-            2077: 42,8
-            2078: 42,9
-            2079: 42,10
-            2080: 42,11
-            2503: 47,0
-            2504: 46,0
-            2505: 45,0
-            2506: 44,0
-            2507: 43,0
-            2508: 42,0
-            2509: 42,1
+            897: 8,10
+            898: 9,10
+            899: 10,10
+            900: 11,10
+            901: 12,10
+            902: 13,10
+            903: 14,10
+            904: 15,10
+            905: 16,10
+            906: 17,10
+            907: 18,10
+            908: 19,10
+            928: 19,12
+            929: 20,12
+            930: 21,12
+            1670: 28,15
+            1671: 29,15
+            1672: 30,15
+            1673: 31,15
+            1674: 32,15
+            1675: 33,15
+            1676: 34,15
+            1677: 35,15
+            1678: 36,15
+            1679: 37,15
+            1728: 25,37
+            1729: 24,37
+            1730: 23,37
+            1731: 22,37
+            1732: 21,37
+            1733: 20,37
+            1734: 19,37
+            1735: 18,37
+            1736: 17,37
+            1915: 16,1
+            1916: 15,1
+            1917: 14,1
+            1918: 13,1
+            1919: 12,1
+            1920: 11,1
+            1921: 10,1
+            1922: 9,1
+            1923: 8,1
+            1924: 7,1
+            1925: 6,1
+            1926: 6,2
+            1927: 6,3
+            1928: 6,4
+            1929: 6,5
+            1930: 6,7
+            1931: 6,6
+            1932: 6,8
+            1933: 6,11
+            1934: 6,12
+            1935: 6,13
+            1957: 27,3
+            1958: 27,2
+            1959: 27,1
+            1960: 28,1
+            1961: 29,1
+            1962: 30,1
+            1963: 31,1
+            1964: 32,1
+            1965: 33,1
+            1966: 34,1
+            1967: 35,1
+            1968: 36,1
+            1969: 37,1
+            1970: 38,1
+            2027: 42,3
+            2028: 42,4
+            2029: 42,5
+            2030: 42,6
+            2031: 42,7
+            2032: 42,8
+            2033: 42,9
+            2034: 42,10
+            2035: 42,11
+            2458: 47,0
+            2459: 46,0
+            2460: 45,0
+            2461: 44,0
+            2462: 43,0
+            2463: 42,0
+            2464: 42,1
         - node:
             color: '#D4D4D496'
             id: QuarterTileOverlayGreyscale90
           decals:
-            782: 28,-25
-            783: 28,-24
-            1145: -7,0
-            1146: -6,0
-            1147: -2,0
-            1148: -1,0
-            1149: 0,0
-            1150: 1,0
-            1151: 2,0
+            737: 28,-25
+            738: 28,-24
+            1100: -7,0
+            1101: -6,0
+            1102: -2,0
+            1103: -1,0
+            1104: 0,0
+            1105: 1,0
+            1106: 2,0
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale90
@@ -4710,20 +4686,20 @@ entities:
             59: 32,30
             98: 37,30
             177: 35,24
-            1636: 41,24
+            1591: 41,24
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale90
           decals:
-            2532: 107,-19
-            2533: 105,-19
-            2534: 103,-18
-            2535: 103,-19
-            2536: 104,-20
-            2537: 107,-17
-            2538: 104,-17
-            2539: 103,-17
-            2540: 106,-19
+            2487: 107,-19
+            2488: 105,-19
+            2489: 103,-18
+            2490: 103,-19
+            2491: 104,-20
+            2492: 107,-17
+            2493: 104,-17
+            2494: 103,-17
+            2495: 106,-19
         - node:
             color: '#EFCC4193'
             id: QuarterTileOverlayGreyscale90
@@ -4736,42 +4712,42 @@ entities:
             color: '#FFFFFFFF'
             id: Remains
           decals:
-            2515: 11,-11
+            2470: 11,-11
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign1
           decals:
-            1042: 23,0
+            997: 23,0
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign2
           decals:
-            1041: 24,0
+            996: 24,0
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign3
           decals:
-            1040: 25,0
+            995: 25,0
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign4
           decals:
-            1036: 26,0
+            991: 26,0
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign5
           decals:
-            1037: 27,0
+            992: 27,0
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign6
           decals:
-            1038: 28,0
+            993: 28,0
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign7
           decals:
-            1039: 29,0
+            994: 29,0
         - node:
             color: '#FED83DFF'
             id: StandClear
@@ -4782,57 +4758,57 @@ entities:
             color: '#FFFFFFFF'
             id: StandClear
           decals:
-            1137: -6,-17
-            1414: 8,29
-            1415: 9,29
+            1092: -6,-17
+            1369: 8,29
+            1370: 9,29
         - node:
             color: '#52B4E996'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            2455: 49,4
-            2487: 70,8
+            2410: 49,4
+            2442: 70,8
         - node:
             color: '#9FED5847'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            1746: 29,47
+            1701: 29,47
         - node:
             color: '#9FED5896'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            2263: 76,-4
-            2360: 76,5
-            2454: 52,4
+            2218: 76,-4
+            2315: 76,5
+            2409: 52,4
         - node:
             color: '#A4610696'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            1234: 7,28
+            1189: 7,28
         - node:
             color: '#D381C996'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            2118: 47,11
+            2073: 47,11
         - node:
             color: '#D4D4D428'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            1043: 25,-4
+            998: 25,-4
         - node:
             color: '#DE3A3A47'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            1764: 22,47
+            1719: 22,47
         - node:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            1189: -3,-4
+            1144: -3,-4
         - node:
             color: '#EFB34128'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            1765: 19,46
+            1720: 19,46
         - node:
             color: '#EFCC4193'
             id: ThreeQuarterTileOverlayGreyscale
@@ -4844,48 +4820,48 @@ entities:
             color: '#EFCC4582'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            482: 19,-39
+            468: 19,-39
         - node:
             color: '#34A2C0B2'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
-            955: 19,5
+            910: 19,5
         - node:
             color: '#52B4E996'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
-            1813: 51,1
-            2434: 57,-8
-            2489: 75,7
-            2490: 74,4
+            1768: 51,1
+            2389: 57,-8
+            2444: 75,7
+            2445: 74,4
         - node:
             color: '#9FED5896'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
-            2256: 82,-8
-            2387: 69,0
-            2399: 62,-8
+            2211: 82,-8
+            2342: 69,0
+            2354: 62,-8
         - node:
             color: '#A4610696'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
-            1237: 15,20
+            1192: 15,20
         - node:
             color: '#D4D4D428'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
-            1048: 27,-2
+            1003: 27,-2
         - node:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
-            1191: -1,-6
-            1657: 27,25
+            1146: -1,-6
+            1612: 27,25
         - node:
             color: '#EFCC2E82'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
-            755: 27,-26
+            710: 27,-26
         - node:
             color: '#EFCC4193'
             id: ThreeQuarterTileOverlayGreyscale180
@@ -4895,48 +4871,48 @@ entities:
             color: '#EFCC4582'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
-            479: 23,-44
+            465: 23,-44
         - node:
             color: '#34A2C0B2'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
-            954: 18,5
+            909: 18,5
         - node:
             color: '#52B4E996'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
-            1811: 49,1
-            2433: 55,-8
-            2483: 70,4
+            1766: 49,1
+            2388: 55,-8
+            2438: 70,4
         - node:
             color: '#9FED5896'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
-            2247: 76,-6
-            2260: 78,-8
-            2349: 52,2
-            2401: 59,-8
+            2202: 76,-6
+            2215: 78,-8
+            2304: 52,2
+            2356: 59,-8
         - node:
             color: '#A4610696'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
-            1235: 7,21
-            1236: 13,20
+            1190: 7,21
+            1191: 13,20
         - node:
             color: '#D4D4D428'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
-            1047: 25,-2
+            1002: 25,-2
         - node:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
-            1190: -3,-6
+            1145: -3,-6
         - node:
             color: '#EFCC2E82'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
-            754: 25,-26
+            709: 25,-26
         - node:
             color: '#EFCC4193'
             id: ThreeQuarterTileOverlayGreyscale270
@@ -4947,50 +4923,50 @@ entities:
             color: '#EFCC4582'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
-            480: 19,-44
+            466: 19,-44
         - node:
             color: '#52B4E996'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
-            2456: 51,4
-            2488: 75,8
+            2411: 51,4
+            2443: 75,8
         - node:
             color: '#9FED5847'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
-            1747: 32,47
-            1748: 35,46
+            1702: 32,47
+            1703: 35,46
         - node:
             color: '#9FED5896'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
-            1808: 52,0
-            2252: 82,-4
-            2359: 78,5
-            2448: 58,3
-            2453: 53,4
+            1763: 52,0
+            2207: 82,-4
+            2314: 78,5
+            2403: 58,3
+            2408: 53,4
         - node:
             color: '#A4610696'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
-            1238: 15,25
-            1239: 13,28
+            1193: 15,25
+            1194: 13,28
         - node:
             color: '#D4D4D428'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
-            1044: 27,-4
+            999: 27,-4
         - node:
             color: '#DE3A3A47'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
-            1761: 25,47
+            1716: 25,47
         - node:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
-            1188: -1,-4
-            1656: 27,22
+            1143: -1,-4
+            1611: 27,22
         - node:
             color: '#EFCC4193'
             id: ThreeQuarterTileOverlayGreyscale90
@@ -5002,14 +4978,14 @@ entities:
             color: '#EFCC4582'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
-            481: 23,-39
+            467: 23,-39
         - node:
             color: '#FFFFFFFF'
             id: VentSmall
           decals:
-            1830: 23,-12
-            1831: 26,-8
-            1832: 30,-11
+            1785: 23,-12
+            1786: 26,-8
+            1787: 30,-11
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -5038,154 +5014,150 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerNE
           decals:
-            1632: 40,27
-            2294: 57,-14
+            1587: 40,27
+            2249: 57,-14
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNW
           decals:
             236: 55,10
             247: 49,9
-            1631: 39,27
-            2293: 54,-14
-            2625: 36,-44
+            1586: 39,27
+            2248: 54,-14
+            2580: 36,-44
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSE
           decals:
-            1630: 40,26
-            2291: 57,-16
+            1585: 40,26
+            2246: 57,-16
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSW
           decals:
-            1633: 39,26
-            2292: 54,-16
+            1588: 39,26
+            2247: 54,-16
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallGreyscaleNE
           decals:
-            1935: 9,-7
+            1890: 9,-7
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallGreyscaleSE
           decals:
-            1936: 9,-8
+            1891: 9,-8
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNE
           decals:
-            1413: 7,28
-            1642: 38,24
-            1665: 27,21
-            2606: 39,-49
+            1368: 7,28
+            1597: 38,24
+            1620: 27,21
+            2561: 39,-49
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNW
           decals:
             237: 55,9
-            1412: 10,28
-            1641: 41,24
-            2605: 41,-49
+            1367: 10,28
+            1596: 41,24
+            2560: 41,-49
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSE
           decals:
-            1136: -7,-15
-            1664: 27,26
-            2608: 39,-45
+            1091: -7,-15
+            1619: 27,26
+            2563: 39,-45
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSW
           decals:
-            2607: 41,-45
+            2562: 41,-45
         - node:
             color: '#FFFFFFFF'
             id: WarnFull
           decals:
-            1639: 40,25
-            1640: 39,25
-            2287: 77,0
-            2290: 77,-3
+            1594: 40,25
+            1595: 39,25
+            2242: 77,0
+            2245: 77,-3
         - node:
             color: '#52B4E996'
             id: WarnFullGreyscale
           decals:
-            2481: 71,3
+            2436: 71,3
         - node:
             color: '#D381C996'
             id: WarnFullGreyscale
           decals:
-            2140: 57,18
+            2095: 57,18
         - node:
             color: '#FFFFFFFF'
             id: WarnFullGreyscale
           decals:
             402: 14,-35
-            451: 31,-38
-            452: 32,-38
-            486: 24,-40
-            487: 18,-40
-            1052: 28,-29
-            1053: 24,-29
-            1054: 31,-30
-            1055: 31,-34
-            1056: 26,-35
-            1057: 21,-34
-            1058: 21,-30
-            1262: 12,29
-            1266: 8,20
-            2471: 61,-9
+            441: 31,-38
+            442: 32,-38
+            1007: 28,-29
+            1008: 24,-29
+            1009: 31,-30
+            1010: 31,-34
+            1011: 26,-35
+            1012: 21,-34
+            1013: 21,-30
+            1217: 12,29
+            1221: 8,20
+            2426: 61,-9
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
           decals:
-            1660: 27,22
-            1661: 27,23
-            1662: 27,24
-            1663: 27,25
-            2296: 57,-15
-            2602: 39,-48
-            2603: 39,-46
-            2604: 39,-47
+            1615: 27,22
+            1616: 27,23
+            1617: 27,24
+            1618: 27,25
+            2251: 57,-15
+            2557: 39,-48
+            2558: 39,-46
+            2559: 39,-47
         - node:
             color: '#9FED5896'
             id: WarnLineGreyscaleE
           decals:
-            2406: 62,-6
+            2361: 62,-6
         - node:
             color: '#D381C996'
             id: WarnLineGreyscaleE
           decals:
-            2139: 56,18
+            2094: 56,18
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleE
           decals:
             380: 27,-29
             401: 13,-35
-            484: 23,-40
-            489: 17,-40
-            1520: 24,20
-            1521: 24,21
-            1522: 24,23
-            1523: 24,22
-            1524: 24,24
-            1525: 24,25
-            1930: 9,-9
-            1931: 9,-10
-            1932: 9,-6
-            1933: 9,-5
-            1934: 9,-4
+            1475: 24,20
+            1476: 24,21
+            1477: 24,23
+            1478: 24,22
+            1479: 24,24
+            1480: 24,25
+            1885: 9,-9
+            1886: 9,-10
+            1887: 9,-6
+            1888: 9,-5
+            1889: 9,-4
         - node:
             color: '#52B4E996'
             id: WarnLineGreyscaleN
           decals:
-            2412: 61,0
-            2413: 60,0
-            2414: 58,0
-            2415: 57,0
-            2480: 71,2
+            2367: 61,0
+            2368: 60,0
+            2369: 58,0
+            2370: 57,0
+            2435: 71,2
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleN
@@ -5194,39 +5166,39 @@ entities:
             376: 31,-35
             377: 21,-35
             378: 26,-28
-            453: 32,-39
-            454: 31,-39
-            485: 21,-39
-            1263: 12,28
-            1265: 8,19
-            1924: 10,-7
-            1925: 11,-7
-            1926: 12,-7
-            2408: 59,-4
-            2409: 60,-4
-            2410: 61,-4
-            2411: 62,-4
-            2442: 57,-4
-            2443: 56,-4
-            2444: 55,-4
+            443: 32,-39
+            444: 31,-39
+            469: 21,-39
+            1218: 12,28
+            1220: 8,19
+            1879: 10,-7
+            1880: 11,-7
+            1881: 12,-7
+            2363: 59,-4
+            2364: 60,-4
+            2365: 61,-4
+            2366: 62,-4
+            2397: 57,-4
+            2398: 56,-4
+            2399: 55,-4
         - node:
             color: '#52B4E996'
             id: WarnLineGreyscaleS
           decals:
-            2416: 61,-2
-            2417: 60,-2
-            2418: 58,-2
-            2419: 57,-2
-            2420: 59,-2
-            2439: 56,-8
+            2371: 61,-2
+            2372: 60,-2
+            2373: 58,-2
+            2374: 57,-2
+            2375: 59,-2
+            2394: 56,-8
         - node:
             color: '#9FED5896'
             id: WarnLineGreyscaleS
           decals:
-            2384: 77,1
-            2385: 72,1
-            2405: 61,-8
-            2407: 65,0
+            2339: 77,1
+            2340: 72,1
+            2360: 61,-8
+            2362: 65,0
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleS
@@ -5234,21 +5206,21 @@ entities:
             381: 21,-29
             382: 31,-37
             383: 32,-37
-            733: 38,-37
-            734: 39,-37
-            735: 40,-37
-            858: 42,-8
-            1264: 14,20
-            1843: 8,21
-            1927: 12,-8
-            1928: 11,-8
-            1929: 10,-8
+            688: 38,-37
+            689: 39,-37
+            690: 40,-37
+            813: 42,-8
+            1219: 14,20
+            1798: 8,21
+            1882: 12,-8
+            1883: 11,-8
+            1884: 10,-8
         - node:
             color: '#52B4E996'
             id: WarnLineGreyscaleW
           decals:
-            2437: 55,-7
-            2438: 55,-5
+            2392: 55,-7
+            2393: 55,-5
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleW
@@ -5257,56 +5229,54 @@ entities:
             384: 15,-35
             386: 13,-28
             387: 13,-27
-            483: 19,-40
-            488: 25,-40
-            499: 16,-42
-            859: 41,-4
-            1937: 8,-5
-            1938: 8,-4
-            1939: 8,-6
-            1940: 8,-7
-            1941: 8,-8
-            1942: 8,-9
-            1943: 8,-10
-            2500: 69,0
-            2501: 69,1
-            2502: 69,2
+            476: 16,-42
+            814: 41,-4
+            1892: 8,-5
+            1893: 8,-4
+            1894: 8,-6
+            1895: 8,-7
+            1896: 8,-8
+            1897: 8,-9
+            1898: 8,-10
+            2455: 69,0
+            2456: 69,1
+            2457: 69,2
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
           decals:
-            1135: -6,-15
-            2090: 51,13
-            2091: 50,13
-            2092: 49,13
-            2288: 78,-2
-            2289: 77,-2
-            2297: 56,-16
-            2298: 55,-16
-            2423: 61,-2
-            2424: 60,-2
-            2425: 59,-2
-            2426: 58,-2
-            2427: 57,-2
-            2597: 40,-45
+            1090: -6,-15
+            2045: 51,13
+            2046: 50,13
+            2047: 49,13
+            2243: 78,-2
+            2244: 77,-2
+            2252: 56,-16
+            2253: 55,-16
+            2378: 61,-2
+            2379: 60,-2
+            2380: 59,-2
+            2381: 58,-2
+            2382: 57,-2
+            2552: 40,-45
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
           decals:
-            2295: 54,-15
-            2598: 41,-46
-            2599: 41,-47
-            2600: 41,-48
-            2614: 46,-49
-            2615: 46,-48
-            2616: 46,-47
-            2617: 46,-46
-            2618: 46,-45
-            2634: 36,-49
-            2635: 36,-48
-            2636: 36,-47
-            2637: 36,-46
-            2638: 36,-45
+            2250: 54,-15
+            2553: 41,-46
+            2554: 41,-47
+            2555: 41,-48
+            2569: 46,-49
+            2570: 46,-48
+            2571: 46,-47
+            2572: 46,-46
+            2573: 46,-45
+            2589: 36,-49
+            2590: 36,-48
+            2591: 36,-47
+            2592: 36,-46
+            2593: 36,-45
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
@@ -5322,34 +5292,34 @@ entities:
             240: 52,9
             245: 51,9
             246: 50,9
-            799: 22,-16
-            800: 21,-16
-            801: 20,-16
-            1410: 8,28
-            1411: 9,28
-            1637: 40,24
-            1638: 39,24
-            2093: 51,15
-            2094: 50,15
-            2095: 49,15
-            2285: 77,-1
-            2286: 78,-1
-            2299: 56,-14
-            2300: 55,-14
-            2428: 61,0
-            2429: 60,0
-            2430: 59,0
-            2431: 58,0
-            2432: 57,0
-            2601: 40,-49
-            2626: 37,-44
-            2627: 38,-44
-            2628: 39,-44
-            2629: 40,-44
-            2630: 41,-44
-            2631: 42,-44
-            2632: 44,-44
-            2633: 43,-44
+            754: 22,-16
+            755: 21,-16
+            756: 20,-16
+            1365: 8,28
+            1366: 9,28
+            1592: 40,24
+            1593: 39,24
+            2048: 51,15
+            2049: 50,15
+            2050: 49,15
+            2240: 77,-1
+            2241: 78,-1
+            2254: 56,-14
+            2255: 55,-14
+            2383: 61,0
+            2384: 60,0
+            2385: 59,0
+            2386: 58,0
+            2387: 57,0
+            2556: 40,-49
+            2581: 37,-44
+            2582: 38,-44
+            2583: 39,-44
+            2584: 40,-44
+            2585: 41,-44
+            2586: 42,-44
+            2587: 44,-44
+            2588: 43,-44
         - node:
             color: '#FED83DFF'
             id: WarningLine
@@ -5383,587 +5353,564 @@ entities:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNe
           decals:
-            1903: 20,-3
+            1858: 20,-3
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNw
           decals:
-            1901: 18,-3
+            1856: 18,-3
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSe
           decals:
-            1906: 20,-6
+            1861: 20,-6
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSw
           decals:
-            1898: 18,-6
+            1853: 18,-6
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineE
           decals:
-            832: 40,-13
-            833: 40,-12
-            834: 40,-11
-            835: 40,-10
-            1822: 21,-13
-            1823: 21,-12
-            1824: 21,-11
-            1825: 21,-10
-            1904: 20,-4
-            1905: 20,-5
+            787: 40,-13
+            788: 40,-12
+            789: 40,-11
+            790: 40,-10
+            1777: 21,-13
+            1778: 21,-12
+            1779: 21,-11
+            1780: 21,-10
+            1859: 20,-4
+            1860: 20,-5
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineN
           decals:
-            1139: -2,-11
-            1140: -3,-11
-            1141: -4,-11
-            1902: 19,-3
+            1094: -2,-11
+            1095: -3,-11
+            1096: -4,-11
+            1857: 19,-3
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineS
           decals:
-            1907: 19,-6
-            2643: 36,43
+            1862: 19,-6
+            2598: 36,43
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineW
           decals:
-            828: 38,-13
-            829: 38,-12
-            830: 38,-11
-            831: 38,-10
-            1899: 18,-5
-            1900: 18,-4
+            783: 38,-13
+            784: 38,-12
+            785: 38,-11
+            786: 38,-10
+            1854: 18,-5
+            1855: 18,-4
         - node:
             cleanable: True
             angle: -4.71238898038469 rad
             color: '#00000060'
             id: footprint
           decals:
-            1319: 8.005591,29.808443
-            1320: 8.443091,30.551498
-            1321: 7.7903137,30.363998
-            1322: 7.5403137,30.107054
-            1323: 6.6653137,30.752888
-            1324: 7.7486477,31.218166
-            1325: 7.929203,31.732056
-            1326: 8.665314,31.08622
-            1327: 7.4153137,31.32233
-            1328: 8.116703,30.454277
-            1329: 8.651425,31.044556
-            1339: 7.8406677,26.12399
-            1340: 8.559418,25.93649
-            1341: 8.918793,26.452114
-            1342: 7.8875427,25.56149
+            1274: 8.005591,29.808443
+            1275: 8.443091,30.551498
+            1276: 7.7903137,30.363998
+            1277: 7.5403137,30.107054
+            1278: 6.6653137,30.752888
+            1279: 7.7486477,31.218166
+            1280: 7.929203,31.732056
+            1281: 8.665314,31.08622
+            1282: 7.4153137,31.32233
+            1283: 8.116703,30.454277
+            1284: 8.651425,31.044556
+            1294: 7.8406677,26.12399
+            1295: 8.559418,25.93649
+            1296: 8.918793,26.452114
+            1297: 7.8875427,25.56149
         - node:
             cleanable: True
             angle: -3.141592653589793 rad
             color: '#00000060'
             id: footprint
           decals:
-            1330: 7.9222584,30.25727
-            1331: 8.206981,29.875326
-            1332: 8.054203,29.31977
-            1333: 8.387536,28.916994
-            1334: 8.068091,28.375326
-            1335: 8.401425,28.000326
-            1336: 8.165314,27.666994
-            1337: 8.540314,27.41005
-            1338: 9.262536,27.312826
+            1285: 7.9222584,30.25727
+            1286: 8.206981,29.875326
+            1287: 8.054203,29.31977
+            1288: 8.387536,28.916994
+            1289: 8.068091,28.375326
+            1290: 8.401425,28.000326
+            1291: 8.165314,27.666994
+            1292: 8.540314,27.41005
+            1293: 9.262536,27.312826
         - node:
             angle: -1.5707963267948966 rad
             color: '#00000060'
             id: footprint
           decals:
-            1455: 8.091304,16.603054
-            1456: 8.320471,16.964165
-            1457: 7.820471,17.39472
-            1458: 8.362137,16.922499
-            1459: 8.091304,17.797499
-            1460: 8.132971,18.061386
-            1461: 7.834359,18.25583
-            1462: 8.382971,18.450275
-            1463: 8.445471,17.83222
+            1410: 8.091304,16.603054
+            1411: 8.320471,16.964165
+            1412: 7.820471,17.39472
+            1413: 8.362137,16.922499
+            1414: 8.091304,17.797499
+            1415: 8.132971,18.061386
+            1416: 7.834359,18.25583
+            1417: 8.382971,18.450275
+            1418: 8.445471,17.83222
         - node:
             cleanable: True
             angle: -1.5707963267948966 rad
             color: '#00000060'
             id: footprint
           decals:
-            1308: 6.5194807,30.009832
-            1309: 6.887536,30.565388
-            1310: 7.1514254,30.093164
-            1311: 7.5194807,30.676498
-            1312: 8.200036,30.113998
-            1313: 8.422258,30.940388
-            1314: 9.026425,30.315388
-            1315: 6.450036,31.676498
-            1316: 7.241703,31.891777
-            1317: 8.130591,31.03761
-            1318: 7.026425,31.35011
-            1343: 11.25042,22.296373
-            1344: 12.234795,21.765123
-            1345: 12.703545,22.343248
-            1346: 13.734795,21.671373
-            1347: 14.53167,22.202623
-            1348: 14.93792,21.390123
+            1263: 6.5194807,30.009832
+            1264: 6.887536,30.565388
+            1265: 7.1514254,30.093164
+            1266: 7.5194807,30.676498
+            1267: 8.200036,30.113998
+            1268: 8.422258,30.940388
+            1269: 9.026425,30.315388
+            1270: 6.450036,31.676498
+            1271: 7.241703,31.891777
+            1272: 8.130591,31.03761
+            1273: 7.026425,31.35011
+            1298: 11.25042,22.296373
+            1299: 12.234795,21.765123
+            1300: 12.703545,22.343248
+            1301: 13.734795,21.671373
+            1302: 14.53167,22.202623
+            1303: 14.93792,21.390123
         - node:
             color: '#00000060'
             id: footprint
           decals:
-            1472: 8.546305,22.79264
-            1473: 10.350877,23.736956
+            1427: 8.546305,22.79264
+            1428: 10.350877,23.736956
         - node:
             cleanable: True
             color: '#00000060'
             id: footprint
           decals:
-            1298: 8.831981,27.987852
-            1299: 9.005591,28.265629
-            1300: 8.769481,28.494795
-            1301: 9.054203,28.842018
-            1302: 8.755591,29.147573
-            1303: 9.109758,29.473963
-            1304: 8.762536,29.828129
-            1305: 9.088925,30.078129
-            1306: 8.755591,30.522573
-            1307: 9.081981,30.522573
-            1357: 13.708358,19.952623
-            1358: 14.145858,20.890123
-            1359: 13.630233,21.452623
-            1360: 13.739608,20.593248
-            1361: 14.130233,20.265123
-            1362: 13.661483,21.890123
-            1363: 14.036483,22.343248
-            1364: 13.458358,23.327623
-            1365: 14.020858,23.452623
-            1366: 14.005233,24.218248
-            1367: 13.645858,22.858873
-            1436: 7.237137,16.09611
-            1437: 7.7232485,16.464165
-            1438: 7.362137,16.915554
-            1439: 7.917693,17.665554
-            1440: 7.521859,18.13083
-            1441: 7.980193,18.56833
-            1442: 7.882971,19.109999
-            1474: 10.046046,23.44008
-            1475: 7.2491713,26.34633
-            1476: 8.389796,26.674456
-            1477: 13.452296,20.69008
-            1478: 13.467921,21.31508
-            1479: 8.999171,26.4967
-            1480: 8.046046,27.90295
-            1481: 8.624171,27.59045
-            1482: 8.983546,28.09045
-            1483: 8.608546,29.3092
+            1253: 8.831981,27.987852
+            1254: 9.005591,28.265629
+            1255: 8.769481,28.494795
+            1256: 9.054203,28.842018
+            1257: 8.755591,29.147573
+            1258: 9.109758,29.473963
+            1259: 8.762536,29.828129
+            1260: 9.088925,30.078129
+            1261: 8.755591,30.522573
+            1262: 9.081981,30.522573
+            1312: 13.708358,19.952623
+            1313: 14.145858,20.890123
+            1314: 13.630233,21.452623
+            1315: 13.739608,20.593248
+            1316: 14.130233,20.265123
+            1317: 13.661483,21.890123
+            1318: 14.036483,22.343248
+            1319: 13.458358,23.327623
+            1320: 14.020858,23.452623
+            1321: 14.005233,24.218248
+            1322: 13.645858,22.858873
+            1391: 7.237137,16.09611
+            1392: 7.7232485,16.464165
+            1393: 7.362137,16.915554
+            1394: 7.917693,17.665554
+            1395: 7.521859,18.13083
+            1396: 7.980193,18.56833
+            1397: 7.882971,19.109999
+            1429: 10.046046,23.44008
+            1430: 7.2491713,26.34633
+            1431: 8.389796,26.674456
+            1432: 13.452296,20.69008
+            1433: 13.467921,21.31508
+            1434: 8.999171,26.4967
+            1435: 8.046046,27.90295
+            1436: 8.624171,27.59045
+            1437: 8.983546,28.09045
+            1438: 8.608546,29.3092
         - node:
             angle: 1.5707963267948966 rad
             color: '#00000060'
             id: footprint
           decals:
-            1464: 7.966304,16.290554
-            1465: 7.626026,15.89472
-            1466: 6.952415,16.39472
-            1467: 6.9801927,15.866943
-            1468: 6.834359,17.01972
-            1469: 6.876026,17.748886
-            1470: 7.542693,18.01972
-            1471: 7.709359,19.228054
+            1419: 7.966304,16.290554
+            1420: 7.626026,15.89472
+            1421: 6.952415,16.39472
+            1422: 6.9801927,15.866943
+            1423: 6.834359,17.01972
+            1424: 6.876026,17.748886
+            1425: 7.542693,18.01972
+            1426: 7.709359,19.228054
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#00000060'
             id: footprint
           decals:
-            1349: 14.972425,21.077623
-            1350: 14.316175,21.655748
-            1351: 13.8318,21.202623
-            1352: 13.003675,21.843248
-            1353: 12.534925,21.390123
-            1354: 11.6443,21.843248
-            1355: 10.972425,21.468248
+            1304: 14.972425,21.077623
+            1305: 14.316175,21.655748
+            1306: 13.8318,21.202623
+            1307: 13.003675,21.843248
+            1308: 12.534925,21.390123
+            1309: 11.6443,21.843248
+            1310: 10.972425,21.468248
         - node:
             cleanable: True
             angle: 3.141592653589793 rad
             color: '#00000060'
             id: footprint
           decals:
-            1443: 6.8551927,16.728054
-            1444: 7.570471,17.200275
-            1445: 7.1607485,17.623886
-            1446: 8.2649145,17.76972
-            1447: 7.7857485,18.45722
-            1448: 8.2440815,18.929443
-            1449: 8.2232485,18.65861
-            1450: 8.132971,18.03361
-            1451: 7.292692,18.554443
-            1452: 7.8274145,17.075275
-            1453: 7.167692,16.964165
-            1454: 7.4732485,16.31833
+            1398: 6.8551927,16.728054
+            1399: 7.570471,17.200275
+            1400: 7.1607485,17.623886
+            1401: 8.2649145,17.76972
+            1402: 7.7857485,18.45722
+            1403: 8.2440815,18.929443
+            1404: 8.2232485,18.65861
+            1405: 8.132971,18.03361
+            1406: 7.292692,18.554443
+            1407: 7.8274145,17.075275
+            1408: 7.167692,16.964165
+            1409: 7.4732485,16.31833
         - node:
             cleanable: True
             angle: 6.283185307179586 rad
             color: '#00000060'
             id: footprint
           decals:
-            1356: 7.894642,22.655748
+            1311: 7.894642,22.655748
         - node:
             cleanable: True
             color: '#0000065D'
             id: footprint
           decals:
-            1857: 8.153207,20.861673
-            1858: 8.434457,21.127298
-            1859: 8.215707,21.486673
-            1860: 8.512582,21.892923
-            1861: 8.309457,22.142923
-            1862: 8.731332,22.627298
-            1863: 8.496957,23.517923
-            1864: 8.262582,24.096048
+            1812: 8.153207,20.861673
+            1813: 8.434457,21.127298
+            1814: 8.215707,21.486673
+            1815: 8.512582,21.892923
+            1816: 8.309457,22.142923
+            1817: 8.731332,22.627298
+            1818: 8.496957,23.517923
+            1819: 8.262582,24.096048
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#0000065D'
             id: footprint
           decals:
-            1879: 9.684457,21.892923
-            1880: 8.856332,22.736673
-            1881: 8.856332,22.721048
-            1882: 10.309457,22.674173
-            1883: 11.246957,22.017923
-            1884: 10.028207,22.033548
-            1885: 10.215707,22.627298
-            1886: 9.262582,22.174173
-            1887: 9.106332,22.221048
+            1834: 9.684457,21.892923
+            1835: 8.856332,22.736673
+            1836: 8.856332,22.721048
+            1837: 10.309457,22.674173
+            1838: 11.246957,22.017923
+            1839: 10.028207,22.033548
+            1840: 10.215707,22.627298
+            1841: 9.262582,22.174173
+            1842: 9.106332,22.221048
         - node:
             cleanable: True
             angle: 3.141592653589793 rad
             color: '#0000065D'
             id: footprint
           decals:
-            1865: 7.856332,21.033548
-            1866: 8.215707,21.408548
-            1867: 7.950082,21.892923
-            1868: 8.762582,22.283548
-            1869: 8.293832,23.142923
-            1870: 8.965707,23.392923
+            1820: 7.856332,21.033548
+            1821: 8.215707,21.408548
+            1822: 7.950082,21.892923
+            1823: 8.762582,22.283548
+            1824: 8.293832,23.142923
+            1825: 8.965707,23.392923
         - node:
             cleanable: True
             angle: 4.71238898038469 rad
             color: '#0000065D'
             id: footprint
           decals:
-            1871: 8.762582,21.236673
-            1872: 9.184457,21.986673
-            1873: 9.731332,21.486673
-            1874: 9.762582,22.346048
-            1875: 10.543832,21.799173
-            1876: 10.918832,22.111673
-            1877: 11.606332,21.705423
-            1878: 12.215707,22.096048
+            1826: 8.762582,21.236673
+            1827: 9.184457,21.986673
+            1828: 9.731332,21.486673
+            1829: 9.762582,22.346048
+            1830: 10.543832,21.799173
+            1831: 10.918832,22.111673
+            1832: 11.606332,21.705423
+            1833: 12.215707,22.096048
         - node:
             cleanable: True
             angle: -4.71238898038469 rad
             color: '#47422E3E'
             id: footprint
           decals:
-            606: 20.73215,-33.21596
-            607: 20.810274,-32.762836
-            608: 21.0759,-33.02846
-            609: 20.904024,-32.09096
-            610: 20.685274,-31.528461
-            611: 21.2634,-31.528461
-            612: 20.622774,-31.559711
-            613: 21.2009,-32.450336
-            614: 20.997774,-31.825336
+            561: 20.73215,-33.21596
+            562: 20.810274,-32.762836
+            563: 21.0759,-33.02846
+            564: 20.904024,-32.09096
+            565: 20.685274,-31.528461
+            566: 21.2634,-31.528461
+            567: 20.622774,-31.559711
+            568: 21.2009,-32.450336
+            569: 20.997774,-31.825336
         - node:
             cleanable: True
             angle: -3.141592653589793 rad
             color: '#47422E3E'
             id: footprint
           decals:
-            643: 18.380388,-29.024849
-            644: 18.271013,-28.618599
-            645: 19.052263,-28.993599
+            598: 18.380388,-29.024849
+            599: 18.271013,-28.618599
+            600: 19.052263,-28.993599
         - node:
             angle: -1.5707963267948966 rad
             color: '#47422E3E'
             id: footprint
           decals:
-            540: 18.842302,-40.29173
-            541: 19.203413,-39.833397
-            542: 19.627026,-40.31256
-            543: 20.231192,-39.784786
-            544: 20.363136,-40.22923
+            511: 19.627026,-40.31256
+            512: 20.231192,-39.784786
+            513: 20.363136,-40.22923
         - node:
             cleanable: True
             angle: -1.5707963267948966 rad
             color: '#47422E3E'
             id: footprint
           decals:
-            599: 31.110344,-32.87221
-            600: 30.782219,-32.387836
-            601: 30.672844,-32.825336
-            602: 29.954094,-32.356586
-            603: 29.922844,-32.93471
-            604: 29.204094,-32.37221
-            605: 29.235344,-33.044086
-            646: 19.366499,-28.623808
-            647: 18.387333,-29.09603
-            648: 18.706778,-28.734919
-            649: 19.366499,-29.075195
-            650: 19.838722,-28.554363
-            651: 20.41511,-28.866863
-            652: 20.310944,-28.255753
-            653: 21.019278,-28.776585
-            654: 21.470667,-28.387695
-            655: 21.998444,-28.922419
-            656: 22.352612,-28.540474
-            657: 22.92456,-29.193253
-            658: 23.306505,-28.811308
-            689: 14.771467,-35.430984
-            690: 15.127949,-35.1208
-            691: 15.553875,-35.36617
-            692: 16.271467,-34.86154
-            693: 16.544615,-35.22728
-            694: 17.183504,-34.74117
-            695: 17.502949,-35.222652
-            718: 26.49693,-36.713375
-            719: 27.137554,-36.369625
-            720: 27.46568,-36.69775
-            721: 28.02818,-36.275875
-            722: 28.668804,-36.588375
-            723: 29.15318,-36.088375
-            724: 29.856304,-36.604
-            725: 30.325054,-36.104
-            726: 30.856304,-36.604
-            727: 21.875406,-36.6665
-            728: 22.328531,-36.1665
-            729: 23.266031,-36.604
-            730: 23.500406,-36.119625
-            731: 24.422281,-36.463375
-            732: 25.219156,-36.400875
+            554: 31.110344,-32.87221
+            555: 30.782219,-32.387836
+            556: 30.672844,-32.825336
+            557: 29.954094,-32.356586
+            558: 29.922844,-32.93471
+            559: 29.204094,-32.37221
+            560: 29.235344,-33.044086
+            601: 19.366499,-28.623808
+            602: 18.387333,-29.09603
+            603: 18.706778,-28.734919
+            604: 19.366499,-29.075195
+            605: 19.838722,-28.554363
+            606: 20.41511,-28.866863
+            607: 20.310944,-28.255753
+            608: 21.019278,-28.776585
+            609: 21.470667,-28.387695
+            610: 21.998444,-28.922419
+            611: 22.352612,-28.540474
+            612: 22.92456,-29.193253
+            613: 23.306505,-28.811308
+            644: 14.771467,-35.430984
+            645: 15.127949,-35.1208
+            646: 15.553875,-35.36617
+            647: 16.271467,-34.86154
+            648: 16.544615,-35.22728
+            649: 17.183504,-34.74117
+            650: 17.502949,-35.222652
+            673: 26.49693,-36.713375
+            674: 27.137554,-36.369625
+            675: 27.46568,-36.69775
+            676: 28.02818,-36.275875
+            677: 28.668804,-36.588375
+            678: 29.15318,-36.088375
+            679: 29.856304,-36.604
+            680: 30.325054,-36.104
+            681: 30.856304,-36.604
+            682: 21.875406,-36.6665
+            683: 22.328531,-36.1665
+            684: 23.266031,-36.604
+            685: 23.500406,-36.119625
+            686: 24.422281,-36.463375
+            687: 25.219156,-36.400875
         - node:
             color: '#47422E3E'
             id: footprint
           decals:
-            545: 20.606192,-39.257008
-            546: 21.106192,-38.76395
-            547: 20.752026,-38.722286
-            548: 21.085358,-39.21534
-            549: 20.606192,-39.21534
-            550: 19.078413,-40.36812
-            551: 16.110773,-41.92628
-            552: 16.312162,-40.836002
-            553: 15.944107,-40.405445
-            554: 16.944107,-39.80128
-            555: 17.013552,-41.03739
-            556: 16.124662,-41.55128
-            557: 16.194107,-40.780445
-            558: 16.582996,-40.947113
-            559: 16.763552,-40.342945
-            572: 21.153759,-38.723778
-            573: 20.771816,-38.58489
-            574: 21.077372,-38.26544
-            575: 20.730148,-37.89044
-            576: 21.209316,-37.64739
-            577: 21.056538,-37.286278
-            578: 21.227804,-36.8777
-            579: 20.790304,-36.912422
-            580: 20.873638,-36.572144
+            514: 20.606192,-39.257008
+            515: 21.106192,-38.76395
+            516: 20.752026,-38.722286
+            517: 21.085358,-39.21534
+            518: 20.606192,-39.21534
+            519: 16.110773,-41.92628
+            520: 16.312162,-40.836002
+            521: 15.944107,-40.405445
+            522: 16.124662,-41.55128
+            523: 16.194107,-40.780445
+            527: 21.153759,-38.723778
+            528: 20.771816,-38.58489
+            529: 21.077372,-38.26544
+            530: 20.730148,-37.89044
+            531: 21.209316,-37.64739
+            532: 21.056538,-37.286278
+            533: 21.227804,-36.8777
+            534: 20.790304,-36.912422
+            535: 20.873638,-36.572144
         - node:
             cleanable: True
             color: '#47422E3E'
             id: footprint
           decals:
-            581: 20.741693,-37.148533
-            582: 21.08197,-36.669365
-            583: 21.352804,-37.419365
-            584: 20.998638,-37.009644
-            585: 20.53336,-36.822144
-            586: 21.276415,-36.558254
-            587: 21.200026,-36.23881
-            588: 20.727804,-36.07909
-            589: 20.838915,-35.481865
-            590: 20.991693,-35.842976
-            591: 21.262526,-35.099922
-            592: 25.855373,-34.212444
-            593: 26.214748,-34.056194
-            594: 25.964748,-33.868694
-            595: 26.402248,-33.54057
-            596: 25.995998,-33.337444
-            597: 25.995998,-32.72807
-            598: 26.433498,-32.88432
-            615: 21.16965,-32.87221
-            616: 21.216524,-32.262836
-            617: 20.8259,-31.512836
-            618: 21.23215,-31.059711
-            619: 30.827486,-32.65346
-            620: 31.030611,-32.044086
-            621: 31.233734,-31.387836
-            622: 31.046236,-30.919086
-            623: 30.874361,-30.903461
-            624: 30.796236,-31.653461
-            625: 30.702486,-31.387836
-            626: 21.688553,-32.68471
-            627: 17.800251,-34.731586
-            628: 17.409626,-33.87221
-            629: 17.925251,-33.075336
-            630: 17.409626,-32.606586
-            631: 18.050251,-31.887836
-            632: 17.534626,-31.450336
-            633: 30.89618,-34.87221
-            634: 30.818054,-33.231586
-            635: 31.474304,-32.606586
-            636: 31.17743,-32.106586
-            637: 21.083513,-29.290474
-            638: 20.739763,-28.759224
-            639: 21.536638,-27.946724
-            640: 20.599138,-27.556099
-            641: 21.349138,-26.587349
-            642: 20.724138,-25.931099
+            536: 20.741693,-37.148533
+            537: 21.08197,-36.669365
+            538: 21.352804,-37.419365
+            539: 20.998638,-37.009644
+            540: 20.53336,-36.822144
+            541: 21.276415,-36.558254
+            542: 21.200026,-36.23881
+            543: 20.727804,-36.07909
+            544: 20.838915,-35.481865
+            545: 20.991693,-35.842976
+            546: 21.262526,-35.099922
+            547: 25.855373,-34.212444
+            548: 26.214748,-34.056194
+            549: 25.964748,-33.868694
+            550: 26.402248,-33.54057
+            551: 25.995998,-33.337444
+            552: 25.995998,-32.72807
+            553: 26.433498,-32.88432
+            570: 21.16965,-32.87221
+            571: 21.216524,-32.262836
+            572: 20.8259,-31.512836
+            573: 21.23215,-31.059711
+            574: 30.827486,-32.65346
+            575: 31.030611,-32.044086
+            576: 31.233734,-31.387836
+            577: 31.046236,-30.919086
+            578: 30.874361,-30.903461
+            579: 30.796236,-31.653461
+            580: 30.702486,-31.387836
+            581: 21.688553,-32.68471
+            582: 17.800251,-34.731586
+            583: 17.409626,-33.87221
+            584: 17.925251,-33.075336
+            585: 17.409626,-32.606586
+            586: 18.050251,-31.887836
+            587: 17.534626,-31.450336
+            588: 30.89618,-34.87221
+            589: 30.818054,-33.231586
+            590: 31.474304,-32.606586
+            591: 31.17743,-32.106586
+            592: 21.083513,-29.290474
+            593: 20.739763,-28.759224
+            594: 21.536638,-27.946724
+            595: 20.599138,-27.556099
+            596: 21.349138,-26.587349
+            597: 20.724138,-25.931099
         - node:
             angle: 1.5707963267948966 rad
             color: '#47422E3E'
             id: footprint
           decals:
-            564: 17.188082,-40.308224
-            565: 16.083914,-42.09989
-            566: 15.889469,-41.794334
+            525: 16.083914,-42.09989
+            526: 15.889469,-41.794334
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#47422E3E'
             id: footprint
           decals:
-            696: 17.516838,-35.393948
-            697: 16.8548,-34.912464
-            698: 16.808504,-35.310616
-            699: 15.9103565,-34.88006
-            700: 15.822393,-35.71339
-            701: 14.984429,-35.2458
-            702: 15.961281,-35.704132
-            703: 16.516838,-35.61617
-            704: 16.276096,-34.875427
-            705: 17.178875,-34.60228
-            706: 17.512207,-34.14858
-            707: 17.164986,-35.583763
-            708: 18.735516,-36.577396
-            709: 18.00114,-35.858646
-            710: 19.15739,-36.421146
-            711: 19.90739,-36.858646
-            712: 20.079266,-36.608646
-            713: 18.78239,-35.983646
-            714: 19.25114,-36.702396
-            715: 20.266766,-36.03052
-            716: 21.485516,-36.56177
-            717: 20.25114,-36.514896
+            651: 17.516838,-35.393948
+            652: 16.8548,-34.912464
+            653: 16.808504,-35.310616
+            654: 15.9103565,-34.88006
+            655: 15.822393,-35.71339
+            656: 14.984429,-35.2458
+            657: 15.961281,-35.704132
+            658: 16.516838,-35.61617
+            659: 16.276096,-34.875427
+            660: 17.178875,-34.60228
+            661: 17.512207,-34.14858
+            662: 17.164986,-35.583763
+            663: 18.735516,-36.577396
+            664: 18.00114,-35.858646
+            665: 19.15739,-36.421146
+            666: 19.90739,-36.858646
+            667: 20.079266,-36.608646
+            668: 18.78239,-35.983646
+            669: 19.25114,-36.702396
+            670: 20.266766,-36.03052
+            671: 21.485516,-36.56177
+            672: 20.25114,-36.514896
         - node:
             angle: 3.141592653589793 rad
             color: '#47422E3E'
             id: footprint
           decals:
-            560: 16.563082,-41.80128
-            561: 16.215858,-41.66239
-            562: 16.806137,-40.704056
-            563: 17.250582,-39.947113
-        - node:
-            angle: 4.71238898038469 rad
-            color: '#47422E3E'
-            id: footprint
-          decals:
-            567: 17.215858,-40.42628
-            568: 17.188082,-40.572113
-            569: 17.097803,-39.933224
-            570: 16.792248,-40.336002
-            571: 16.632524,-39.933224
+            524: 16.215858,-41.66239
         - node:
             angle: -4.71238898038469 rad
             color: '#47422E8B'
             id: footprint
           decals:
-            536: 19.2243,-40.044228
-            537: 19.432632,-39.67386
-            538: 19.872448,-39.76645
-            539: 20.455782,-39.363674
+            508: 19.432632,-39.67386
+            509: 19.872448,-39.76645
+            510: 20.455782,-39.363674
         - node:
             angle: -3.141592653589793 rad
             color: '#47422E8B'
             id: footprint
           decals:
-            532: 16.144655,-41.73583
-            533: 16.436321,-41.476566
-            534: 16.311321,-41.008976
-            535: 16.644655,-40.768234
+            505: 16.144655,-41.73583
+            506: 16.436321,-41.476566
+            507: 16.311321,-41.008976
         - node:
             color: '#FFFFFFFF'
             id: ghost
           decals:
-            2513: 13,-11
+            2468: 13,-11
         - node:
             color: '#D4D4D428'
             id: guy
           decals:
-            2514: 40,-19
+            2469: 40,-19
         - node:
             cleanable: True
             color: '#DE3A3A12'
             id: splatter
           decals:
-            900: 30.439373,-12.749766
-            901: 30.454998,-12.437266
-            902: 30.751873,-12.421641
-            903: 31.048748,-12.843516
-            904: 30.501873,-12.812266
-            905: 30.361248,-12.640391
-            906: 30.376873,-13.031016
-            907: 30.611248,-12.562266
-            908: 30.908123,-12.390391
-            909: 31.142498,-12.093516
-            910: 30.658123,-11.812266
-            911: 30.454998,-11.890391
-            912: 30.439373,-12.327891
-            913: 30.361248,-12.577891
-            914: 30.017498,-12.343516
-            915: 29.861248,-11.921641
-            916: 30.376873,-11.343516
-            917: 30.876873,-11.531016
+            855: 30.439373,-12.749766
+            856: 30.454998,-12.437266
+            857: 30.751873,-12.421641
+            858: 31.048748,-12.843516
+            859: 30.501873,-12.812266
+            860: 30.361248,-12.640391
+            861: 30.376873,-13.031016
+            862: 30.611248,-12.562266
+            863: 30.908123,-12.390391
+            864: 31.142498,-12.093516
+            865: 30.658123,-11.812266
+            866: 30.454998,-11.890391
+            867: 30.439373,-12.327891
+            868: 30.361248,-12.577891
+            869: 30.017498,-12.343516
+            870: 29.861248,-11.921641
+            871: 30.376873,-11.343516
+            872: 30.876873,-11.531016
         - node:
             cleanable: True
             color: '#DE3A3A22'
             id: splatter
           decals:
-            918: 30.736248,-12.531016
-            919: 29.954998,-11.531016
-            920: 29.470623,-11.749766
+            873: 30.736248,-12.531016
+            874: 29.954998,-11.531016
+            875: 29.470623,-11.749766
         - node:
             cleanable: True
             color: '#DE3A3A34'
             id: splatter
           decals:
-            2318: 55.674343,-15.3125925
-            2319: 55.455593,-15.1407175
-            2320: 55.830593,-14.9219675
-            2321: 56.018093,-15.0313425
-            2322: 56.205593,-15.2969675
-            2323: 55.65872,-15.3594675
-            2324: 55.50247,-15.4375925
-            2325: 55.861843,-15.3125925
-            2326: 55.893093,-15.3125925
-            2327: 55.68997,-15.3282175
-            2328: 55.75247,-15.1407175
-            2329: 56.12747,-15.1563425
-            2330: 55.40872,-15.7813425
-            2331: 55.34622,-15.6719675
-            2332: 55.111843,-15.8438425
-            2333: 55.09622,-16.531342
-            2334: 55.174343,-14.3750925
-            2335: 55.549343,-14.7657175
-            2336: 56.455593,-14.1563425
-            2337: 57.111843,-16.250092
+            2273: 55.674343,-15.3125925
+            2274: 55.455593,-15.1407175
+            2275: 55.830593,-14.9219675
+            2276: 56.018093,-15.0313425
+            2277: 56.205593,-15.2969675
+            2278: 55.65872,-15.3594675
+            2279: 55.50247,-15.4375925
+            2280: 55.861843,-15.3125925
+            2281: 55.893093,-15.3125925
+            2282: 55.68997,-15.3282175
+            2283: 55.75247,-15.1407175
+            2284: 56.12747,-15.1563425
+            2285: 55.40872,-15.7813425
+            2286: 55.34622,-15.6719675
+            2287: 55.111843,-15.8438425
+            2288: 55.09622,-16.531342
+            2289: 55.174343,-14.3750925
+            2290: 55.549343,-14.7657175
+            2291: 56.455593,-14.1563425
+            2292: 57.111843,-16.250092
     - type: OccluderTree
     - type: Shuttle
     - type: GridPathfinding
@@ -6913,20 +6860,20 @@ entities:
       parent: 2
 - proto: AirlockAtmosphericsGlassLocked
   entities:
-  - uid: 4773
+  - uid: 4638
     components:
     - type: Transform
-      pos: 40.5,-37.5
+      pos: 38.5,-37.5
       parent: 2
-  - uid: 4774
+  - uid: 4639
     components:
     - type: Transform
-      pos: 39.5,-37.5
+      pos: 40.5,-37.5
       parent: 2
-  - uid: 4775
+  - uid: 4640
     components:
     - type: Transform
-      pos: 38.5,-37.5
+      pos: 39.5,-37.5
       parent: 2
   - uid: 10863
     components:
@@ -7204,20 +7151,26 @@ entities:
     - type: Transform
       pos: 48.5,27.5
       parent: 2
-  - uid: 4744
+  - uid: 4637
     components:
     - type: Transform
-      pos: 44.5,28.5
+      pos: 18.5,-39.5
       parent: 2
-  - uid: 5608
+  - uid: 4643
     components:
     - type: Transform
-      pos: 18.5,-39.5
+      pos: 24.5,-39.5
       parent: 2
-  - uid: 5609
+    - type: Door
+      secondsUntilStateChange: -191.21292
+      state: Opening
+    - type: DeviceLinkSource
+      lastSignals:
+        DoorStatus: True
+  - uid: 4744
     components:
     - type: Transform
-      pos: 24.5,-39.5
+      pos: 44.5,28.5
       parent: 2
   - uid: 5726
     components:
@@ -7294,27 +7247,17 @@ entities:
     - type: Transform
       pos: 37.5,-39.5
       parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        4391:
-        - DoorStatus: DoorBolt
   - uid: 4391
     components:
     - type: Transform
       pos: 35.5,-37.5
       parent: 2
     - type: DeviceLinkSink
-      invokeCounter: 3
+      invokeCounter: 4
     - type: DeviceLinkSource
       linkedPorts:
-        4385:
-        - DoorStatus: DoorBolt
         4392:
         - DoorStatus: DoorBolt
-        4390:
-        - DoorStatus: DoorBolt
 - proto: AirlockExternalEngineeringLocked
   entities:
   - uid: 69
@@ -7398,12 +7341,6 @@ entities:
     - type: Transform
       pos: 33.5,-39.5
       parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        4391:
-        - DoorStatus: DoorBolt
   - uid: 4392
     components:
     - type: Transform
@@ -24095,40 +24032,15 @@ entities:
     - type: Transform
       pos: 21.5,-38.5
       parent: 2
-  - uid: 4637
-    components:
-    - type: Transform
-      pos: 17.5,-42.5
-      parent: 2
-  - uid: 4638
-    components:
-    - type: Transform
-      pos: 16.5,-42.5
-      parent: 2
-  - uid: 4639
-    components:
-    - type: Transform
-      pos: 23.5,-39.5
-      parent: 2
-  - uid: 4640
-    components:
-    - type: Transform
-      pos: 24.5,-39.5
-      parent: 2
   - uid: 4641
     components:
     - type: Transform
-      pos: 25.5,-39.5
+      pos: 37.5,-39.5
       parent: 2
   - uid: 4642
     components:
     - type: Transform
-      pos: 26.5,-39.5
-      parent: 2
-  - uid: 4643
-    components:
-    - type: Transform
-      pos: 26.5,-38.5
+      pos: 21.5,-40.5
       parent: 2
   - uid: 4644
     components:
@@ -24270,6 +24182,21 @@ entities:
     - type: Transform
       pos: 29.5,-37.5
       parent: 2
+  - uid: 4773
+    components:
+    - type: Transform
+      pos: 36.5,-39.5
+      parent: 2
+  - uid: 4774
+    components:
+    - type: Transform
+      pos: 38.5,-39.5
+      parent: 2
+  - uid: 4775
+    components:
+    - type: Transform
+      pos: 38.5,-38.5
+      parent: 2
   - uid: 4875
     components:
     - type: Transform
@@ -24315,6 +24242,16 @@ entities:
     - type: Transform
       pos: 17.5,-35.5
       parent: 2
+  - uid: 5608
+    components:
+    - type: Transform
+      pos: 41.5,-38.5
+      parent: 2
+  - uid: 5609
+    components:
+    - type: Transform
+      pos: 40.5,-38.5
+      parent: 2
   - uid: 6455
     components:
     - type: Transform
@@ -24375,6 +24312,16 @@ entities:
     - type: Transform
       pos: 13.5,-46.5
       parent: 2
+  - uid: 6940
+    components:
+    - type: Transform
+      pos: 39.5,-38.5
+      parent: 2
+  - uid: 6941
+    components:
+    - type: Transform
+      pos: 21.5,-39.5
+      parent: 2
   - uid: 6955
     components:
     - type: Transform
@@ -26875,16 +26822,6 @@ entities:
     - type: Transform
       pos: 41.5,-37.5
       parent: 2
-  - uid: 9883
-    components:
-    - type: Transform
-      pos: 40.5,-37.5
-      parent: 2
-  - uid: 9884
-    components:
-    - type: Transform
-      pos: 39.5,-37.5
-      parent: 2
   - uid: 9885
     components:
     - type: Transform
@@ -28025,41 +27962,6 @@ entities:
     - type: Transform
       pos: 110.5,-14.5
       parent: 2
-  - uid: 12935
-    components:
-    - type: Transform
-      pos: 29.5,-38.5
-      parent: 2
-  - uid: 12936
-    components:
-    - type: Transform
-      pos: 29.5,-39.5
-      parent: 2
-  - uid: 12937
-    components:
-    - type: Transform
-      pos: 30.5,-39.5
-      parent: 2
-  - uid: 12938
-    components:
-    - type: Transform
-      pos: 31.5,-39.5
-      parent: 2
-  - uid: 12939
-    components:
-    - type: Transform
-      pos: 32.5,-39.5
-      parent: 2
-  - uid: 12940
-    components:
-    - type: Transform
-      pos: 33.5,-39.5
-      parent: 2
-  - uid: 12941
-    components:
-    - type: Transform
-      pos: 34.5,-39.5
-      parent: 2
   - uid: 12942
     components:
     - type: Transform
@@ -28095,46 +27997,6 @@ entities:
     - type: Transform
       pos: 37.5,-41.5
       parent: 2
-  - uid: 13143
-    components:
-    - type: Transform
-      pos: 17.5,-41.5
-      parent: 2
-  - uid: 13144
-    components:
-    - type: Transform
-      pos: 17.5,-40.5
-      parent: 2
-  - uid: 13145
-    components:
-    - type: Transform
-      pos: 17.5,-39.5
-      parent: 2
-  - uid: 13146
-    components:
-    - type: Transform
-      pos: 18.5,-39.5
-      parent: 2
-  - uid: 13147
-    components:
-    - type: Transform
-      pos: 19.5,-39.5
-      parent: 2
-  - uid: 13148
-    components:
-    - type: Transform
-      pos: 19.5,-40.5
-      parent: 2
-  - uid: 13149
-    components:
-    - type: Transform
-      pos: 19.5,-41.5
-      parent: 2
-  - uid: 13150
-    components:
-    - type: Transform
-      pos: 20.5,-41.5
-      parent: 2
   - uid: 13151
     components:
     - type: Transform
@@ -34078,6 +33940,8 @@ entities:
     - type: Transform
       pos: 28.5,-40.5
       parent: 2
+    - type: Pullable
+      prevFixedRotation: True
 - proto: CrateEngineeringCableBulk
   entities:
   - uid: 782
@@ -34192,6 +34056,8 @@ entities:
     - type: Transform
       pos: 26.5,-38.5
       parent: 2
+    - type: Pullable
+      prevFixedRotation: True
   - uid: 1674
     components:
     - type: Transform
@@ -82208,6 +82074,17 @@ entities:
       parent: 2
 - proto: WindoorSecureChemistryLocked
   entities:
+  - uid: 5139
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-4.5
+      parent: 2
+  - uid: 5140
+    components:
+    - type: Transform
+      pos: 50.5,-3.5
+      parent: 2
   - uid: 12078
     components:
     - type: Transform
@@ -82250,17 +82127,6 @@ entities:
       parent: 2
 - proto: WindoorSecureMedicalLocked
   entities:
-  - uid: 5139
-    components:
-    - type: Transform
-      pos: 50.5,-3.5
-      parent: 2
-  - uid: 5140
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 54.5,-4.5
-      parent: 2
   - uid: 9615
     components:
     - type: Transform
diff --git a/Resources/Maps/train.yml b/Resources/Maps/train.yml
index 60f562e5c77..f15e08aa884 100644
--- a/Resources/Maps/train.yml
+++ b/Resources/Maps/train.yml
@@ -74144,7 +74144,7 @@ entities:
       pos: 8.5,-176.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -141260.94
+      secondsUntilStateChange: -141291.3
       state: Closing
   - uid: 11227
     components:
@@ -86875,6 +86875,13 @@ entities:
     - type: Transform
       pos: -0.5,-62.5
       parent: 2
+- proto: SpawnPointParamedic
+  entities:
+  - uid: 16963
+    components:
+    - type: Transform
+      pos: -2.5,-165.5
+      parent: 2
 - proto: SpawnPointPassenger
   entities:
   - uid: 13362
diff --git a/Resources/Prototypes/Body/Parts/silicon.yml b/Resources/Prototypes/Body/Parts/silicon.yml
index 2f5a621ab0e..6b2b3f57d26 100644
--- a/Resources/Prototypes/Body/Parts/silicon.yml
+++ b/Resources/Prototypes/Body/Parts/silicon.yml
@@ -24,7 +24,8 @@
       Steel: 25
   - type: GuideHelp
     guides:
-      - Cyborgs
+    - Cyborgs
+    - Robotics
 
 - type: entity
   id: BaseBorgArmLeft
diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml
index 2099d0e2a8a..b4847731df8 100644
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -733,3 +733,13 @@
       tags:
       - MicrowaveMachineBoard
 
+- type: cargoBounty
+  id: BountyFlashes
+  reward: 5500
+  description: bounty-description-flashes
+  entries:
+  - name: bounty-item-flash
+    amount: 6
+    whitelist:
+      components:
+      - Flash
diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
index 6400dce5b6a..e54010429f5 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
@@ -71,7 +71,7 @@
     contents:
       - id: SyringePhalanximine
       - id: RadAutoInjector
-      - id: EmergencyMedipen
+      - id: PillCanisterPotassiumIodide
       - id: PillCanisterHyronalin
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index dd7b5376bd7..d912e883c0b 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -139,6 +139,7 @@
       - id: RubberStampDetective
       - id: HoloprojectorSecurity
       - id: BoxEvidenceMarkers
+      - id: HandLabeler
       - id: PortableSurveillanceCameraMonitor # Sunrise-edit
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
index 303b2090530..8170ba792ae 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
@@ -9,6 +9,7 @@
     RubberStampDenied: 1
     Paper: 10
     Envelope: 10
+    HandLabeler: 2
     EncryptionKeyCargo: 2
     EncryptionKeyEngineering: 2
     EncryptionKeyMedical: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
index d028c55cabc..5dbb34afa71 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
@@ -9,6 +9,7 @@
     ClothingBackpackSatchelChemistry: 2
     ClothingBackpackDuffelChemistry: 2
     ChemBag: 2
+    HandLabeler: 3
     ClothingBeltMedical: 2
     ClothingHandsGlovesLatex: 2
     ClothingHeadsetMedical: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
index b8106398d3e..3d4be0678cf 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -24,6 +24,7 @@
     ClothingHeadHatOutlawHat: 1
     ClothingHeadHatTophat: 1
     LuxuryPen: 2
+    HandLabeler: 2
   contrabandInventory:
     ClothingOuterRobesJudge: 1
     ClothingHeadHatPwig: 1
diff --git a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
index 322fd9261b5..fe1a4fe75c9 100644
--- a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
+++ b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
@@ -16,6 +16,7 @@
   - ClothingShoesChameleon
   - BarberScissors
   - ChameleonProjector
+  - AgentIDCard
 
 - type: thiefBackpackSet
   id: ToolsSet
@@ -57,9 +58,10 @@
     sprite: Objects/Specific/Syndicate/telecrystal.rsi
     state: telecrystal
   content:
-  - AgentIDCard
+  - RadioJammer
+  - TraitorCodePaper
   - Emag
-  - SyndicatePersonalAI
+  - Lighter
   - CigPackSyndicate
   - Telecrystal10 #The thief cannot use them, but it may induce communication with traitors
 
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index b6cb089935d..64cb07284b3 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -296,3 +296,9 @@
     Cellular: 0.0
     Heat: 2.5
     Caustic: 0.0
+
+# protects against radiation
+- type: damageModifierSet
+  id: PotassiumIodide
+  coefficients:
+    Radiation: 0.1
diff --git a/Resources/Prototypes/Datasets/figurines.yml b/Resources/Prototypes/Datasets/figurines.yml
new file mode 100644
index 00000000000..8ad651c1345
--- /dev/null
+++ b/Resources/Prototypes/Datasets/figurines.yml
@@ -0,0 +1,263 @@
+- type: localizedDataset
+  id: FigurinesHoP
+  values:
+    prefix: figurines-hop-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesPassenger
+  values:
+    prefix: figurines-passenger-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesGreytider
+  values:
+    prefix: figurines-greytider-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesClown
+  values:
+    prefix: figurines-clown-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesHoloClown
+  values:
+    prefix: figurines-holoclown-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesMime
+  values:
+    prefix: figurines-mime-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesMusician
+  values:
+    prefix: figurines-musician-
+    count: 2
+
+# - type: localizedDataset # TODO add something
+#   id: FigurinesBoxer
+#   values:
+#     prefix: figurines-boxer-
+#     count: 0
+
+- type: localizedDataset
+  id: FigurinesCaptain
+  values:
+    prefix: figurines-captain-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesHoS
+  values:
+    prefix: figurines-hos-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesWarden
+  values:
+    prefix: figurines-warden-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesDetective
+  values:
+    prefix: figurines-detective-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesSecurity
+  values:
+    prefix: figurines-security-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesLawyer
+  values:
+    prefix: figurines-lawyer-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesCargoTech
+  values:
+    prefix: figurines-cargotech-
+    count: 3
+
+- type: localizedDataset
+  id: FigurinesSalvage
+  values:
+    prefix: figurines-salvage-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesQM
+  values:
+    prefix: figurines-qm-
+    count: 7
+
+- type: localizedDataset
+  id: FigurinesCE
+  values:
+    prefix: figurines-ce-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesEngineer
+  values:
+    prefix: figurines-engineer-
+    count: 3
+
+- type: localizedDataset
+  id: FigurinesAtmosTech
+  values:
+    prefix: figurines-atmostech-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesRD
+  values:
+    prefix: figurines-rd-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesScientist
+  values:
+    prefix: figurines-scientist-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesCMO
+  values:
+    prefix: figurines-cmo-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesChemist
+  values:
+    prefix: figurines-chemist-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesParamedic
+  values:
+    prefix: figurines-paramedic-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesDoctor
+  values:
+    prefix: figurines-doctor-
+    count: 3
+
+- type: localizedDataset
+  id: FigurinesLibrarian
+  values:
+    prefix: figurines-librarian-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesChaplain
+  values:
+    prefix: figurines-chaplain-
+    count: 3
+
+- type: localizedDataset
+  id: FigurinesChef
+  values:
+    prefix: figurines-chef-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesBartender
+  values:
+    prefix: figurines-bartender-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesBotanist
+  values:
+    prefix: figurines-botanist-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesJanitor
+  values:
+    prefix: figurines-janitor-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesNukie
+  values:
+    prefix: figurines-nukie-
+    count: 4
+
+- type: localizedDataset
+  id: FigurinesNukieElite
+  values:
+    prefix: figurines-nukie-elite-
+    count: 3
+
+- type: localizedDataset
+  id: FigurinesNukieCommander
+  values:
+    prefix: figurines-nukie-commander-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesFootsoldier
+  values:
+    prefix: figurines-footsoldier-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesWizard
+  values:
+    prefix: figurines-wizard-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesSpaceDragon
+  values:
+    prefix: figurines-space-dragon-
+    count: 1
+
+# - type: localizedDataset # TODO add something
+#   id: FigurinesQueen
+#   values:
+#     prefix: figurines-queen-
+#     count: 0
+
+- type: localizedDataset
+  id: FigurinesRatKing
+  values:
+    prefix: figurines-rat-king-
+    count: 3
+
+- type: localizedDataset
+  id: FigurinesRatServant
+  values:
+    prefix: figurines-rat-servant-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesMouse
+  values:
+    prefix: figurines-mouse-
+    count: 7
+
+- type: localizedDataset
+  id: FigurinesSlime
+  values:
+    prefix: figurines-slime-
+    count: 3
+
+- type: localizedDataset
+  id: FigurinesHamlet
+  values:
+    prefix: figurines-hamlet-
+    count: 8
diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
index a2e18d99aa2..c5d0816b6d0 100644
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
@@ -278,7 +278,7 @@
   parent: ClothingHeadset
   id: ClothingHeadsetFreelance
   name: freelancer headset
-  description: This is used by a roaming group of freelancers
+  description: This is used by a roaming group of freelancers.
   components:
     - type: ContainerFill
       containers:
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
index d5200747445..0364d55cc59 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -180,6 +180,7 @@
   - type: GuideHelp
     guides:
     - Security
+    - Antagonists
   - type: IdentityBlocker
     coverage: EYES
 
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index f81ddfc8d02..b5d3b0ff3e8 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -62,7 +62,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatCasa
   name: casa
-  description: Cone-shaped hat
+  description: Cone-shaped hat.
   components:
     - type: Sprite
       sprite: Clothing/Head/Hats/casa.rsi
@@ -409,7 +409,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatSantahat
   name: santa hat
-  description: "A festive hat worn by Santa Claus"
+  description: A festive hat worn by Santa Claus.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/santahat.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
index 180b738e407..125d183caa6 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -525,3 +525,223 @@
     sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi
   - type: Clothing
     sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorBlack
+  noSpawn: true
+  name: black winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#3f3f3f"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#3f3f3f"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorPurple
+  noSpawn: true
+  name: purple winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#9C0DE1"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#9C0DE1"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorRed
+  noSpawn: true
+  name: red winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#940000"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#940000"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorBlue
+  noSpawn: true
+  name: blue winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#0089EF"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#0089EF"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorBrown
+  noSpawn: true
+  name: brown winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#723A02"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#723A02"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorGray
+  noSpawn: true
+  name: gray winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#999999"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#999999"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorGreen
+  noSpawn: true
+  name: green winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#5ABF2F"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#5ABF2F"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorLightBrown
+  noSpawn: true
+  name: light brown winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#C09F72"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#C09F72"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorOrange
+  noSpawn: true
+  name: orange winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#EF8100"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#EF8100"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorWhite
+  noSpawn: true
+  name: white winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#EAE8E8"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#EAE8E8"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorYellow
+  noSpawn: true
+  name: yellow winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#EBE216"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#EBE216"
+      - state: winterbits-equipped-HELMET
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index b3a76c5855a..b222ed0d5ad 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -602,7 +602,7 @@
   parent: ClothingMaskMime
   id: ClothingMaskScaredMime
   name: scared mime mask
-  description: Looks like it would scream if it wasn't a mask
+  description: Looks like it would scream if it wasn't a mask.
   components:
   - type: Sprite
     sprite: Clothing/Mask/scaredmime.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
index 0054a3645c7..eb948d299c1 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -3,7 +3,7 @@
   id: ClothingNeckPinBase
   abstract: true
   name: pin
-  description: be nothing do crime
+  description: Be nothing do crime.
   components:
   - type: Item
     size: Tiny
@@ -12,7 +12,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckLGBTPin
   name: LGBT pin
-  description: be gay do crime
+  description: Be gay do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -28,7 +28,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckAromanticPin
   name: aromantic pin
-  description: be aro do crime
+  description: Be aro do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -44,7 +44,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckAsexualPin
   name: asexual pin
-  description: be ace do crime
+  description: Be ace do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -60,7 +60,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckBisexualPin
   name: bisexual pin
-  description: be bi do crime
+  description: Be bi do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -76,7 +76,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckIntersexPin
   name: intersex pin
-  description: be intersex do crime
+  description: Be intersex do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -92,7 +92,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckLesbianPin
   name: lesbian pin
-  description: be lesbian do crime
+  description: Be lesbian do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -124,7 +124,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckPansexualPin
   name: pansexual pin
-  description: be pan do crime
+  description: Be pan do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -140,7 +140,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckTransPin
   name: transgender pin
-  description: be trans do crime
+  description: Be trans do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -156,7 +156,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckAutismPin
   name: autism pin
-  description: be autism do crime
+  description: Be autism do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/autismpin.rsi
@@ -172,7 +172,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckGoldAutismPin
   name: golden autism pin
-  description: be autism do warcrime
+  description: Be autism do warcrime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/goldautismpin.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index 6de0c78220f..413a41473bc 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -103,7 +103,7 @@
   parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
   id: ClothingOuterArmorRaid
   name: syndicate raid suit
-  description: A somewhat flexible and well-armored suit with a powerful shoulder mounted flashlight manufactured in the Gorlex Marauder's iconic blood-red color scheme, it does not protect it's wearer from space.
+  description: A somewhat flexible and well-armored suit with a powerful shoulder mounted flashlight manufactured in the Gorlex Marauder's iconic blood-red color scheme, it does not protect its wearer from space.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
index fa937c1ccc6..593ad78f72f 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -223,7 +223,7 @@
   parent: ClothingOuterStorageFoldableBase
   id: ClothingOuterCoatLabCmo
   name: chief medical officer's lab coat
-  description: Custom made blue lab coat for the Chief Medical Officer, offers improved protection against chemical spills and minor cuts
+  description: Custom made blue lab coat for the Chief Medical Officer, offers improved protection against chemical spills and minor cuts.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Coats/labcoat_cmo.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index 9b943de36a1..5007b5a194a 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -55,9 +55,20 @@
   name: atmospherics winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatatmos.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: ATMOS-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: ATMOS-inhand-left
+      right:
+      - state: ATMOS-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatatmos.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: ATMOS-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterEngineer
 
@@ -67,9 +78,20 @@
   name: bartender winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatbar.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: BAR-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: BAR-inhand-left
+      right:
+      - state: BAR-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatbar.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: BAR-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterBartender
 
@@ -79,9 +101,20 @@
   name: captain's winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatcap.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: CAP-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: CAP-inhand-left
+      right:
+      - state: CAP-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatcap.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: CAP-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterCaptain
 
@@ -91,9 +124,20 @@
   name: cargo winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatcargo.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: CARGO-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: CARGO-inhand-left
+      right:
+      - state: CARGO-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatcargo.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: CARGO-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterCargo
 
@@ -103,9 +147,20 @@
   name: chief engineer's winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatce.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: CE-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: CE-inhand-left
+      right:
+      - state: CE-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatce.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: CE-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterCE
 
@@ -115,9 +170,20 @@
   name: CentCom winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatcentcom.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: CENTCOM-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: CENTCOM-inhand-left
+      right:
+      - state: CENTCOM-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatcentcom.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: CENTCOM-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterCentcom
 
@@ -128,9 +194,20 @@
   description: A coat specifically designed for work inside cold storage, sorely needed by cold-blooded lizard chefs.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatchef.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: CHEF-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: CHEF-inhand-left
+      right:
+      - state: CHEF-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatchef.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: CHEF-equipped-OUTERCLOTHING
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
@@ -138,9 +215,20 @@
   name: chemistry winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatchem.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: CHEM-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: CHEM-inhand-left
+      right:
+      - state: CHEM-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatchem.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: CHEM-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -157,9 +245,20 @@
   name: chief medical officer's winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatcmo.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: CMO-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: CMO-inhand-left
+      right:
+      - state: CMO-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatcmo.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: CMO-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -186,9 +285,20 @@
   name: engineering winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatengi.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: ENGI-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: ENGI-inhand-left
+      right:
+      - state: ENGI-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatengi.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: ENGI-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterEngineer
 
@@ -198,9 +308,20 @@
   name: genetics winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatgen.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: GENE-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: GENE-inhand-left
+      right:
+      - state: GENE-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatgen.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: GENE-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -217,12 +338,25 @@
   name: head of personnel's winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coathop.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: HOP-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: HOP-inhand-left
+      right:
+      - state: HOP-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coathop.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: HOP-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterHOP
 
+
+##########################################################
 - type: entity
   parent: [ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable]
   id: ClothingOuterWinterHoS
@@ -235,6 +369,7 @@
     sprite: Clothing/OuterClothing/WinterCoats/coathosarmored.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterHOS
+##########################################################
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
@@ -243,9 +378,20 @@
   description: A sturdy coat, a warm coat, but not an armored coat.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coathos.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: HOS-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: HOS-inhand-left
+      right:
+      - state: HOS-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coathos.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: HOS-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterHOS
 
@@ -255,9 +401,20 @@
   name: hydroponics winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coathydro.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: HYDRO-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: HYDRO-inhand-left
+      right:
+      - state: HYDRO-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coathydro.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: HYDRO-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterHydro
 
@@ -267,9 +424,20 @@
   name: janitorial winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatjani.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: JANI-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: JANI-inhand-left
+      right:
+      - state: CHEF-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatjani.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: JANI-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -286,9 +454,20 @@
   name: medical winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatmed.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: MED-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: MED-inhand-left
+      right:
+      - state: MED-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatmed.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: MED-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -305,9 +484,20 @@
   name: mime winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatmime.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: MIME-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: MIME-inhand-left
+      right:
+      - state: MIME-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatmime.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: MIME-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterMime
 
@@ -317,9 +507,20 @@
   name: mining winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatminer.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: MINER-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: MINER-inhand-left
+      right:
+      - state: MINER-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatminer.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: MINER-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterMiner
 
@@ -329,9 +530,20 @@
   name: paramedic winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatparamed.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: PARA-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: PARA-inhand-left
+      right:
+      - state: PARA-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatparamed.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: PARA-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -348,9 +560,20 @@
   name: quartermaster's winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatqm.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: QM-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: QM-inhand-left
+      right:
+      - state: QM-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatqm.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: QM-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterQM
 
@@ -361,9 +584,20 @@
   name: research director's winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatrd.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: RD-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: RD-inhand-left
+      right:
+      - state: RD-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatrd.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: RD-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -380,9 +614,20 @@
   name: robotics winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatrobo.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: ROBO-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: ROBO-inhand-left
+      right:
+      - state: ROBO-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatrobo.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: ROBO-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterRobo
 
@@ -393,9 +638,20 @@
   name: science winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatsci.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: SCI-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: SCI-inhand-left
+      right:
+      - state: SCI-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatsci.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: SCI-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -412,9 +668,20 @@
   name: security winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatsec.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: SEC-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: SEC-inhand-left
+      right:
+      - state: SEC-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatsec.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: SEC-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterSec
 
@@ -424,9 +691,20 @@
   name: virology winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatviro.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: VIRO-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: VIRO-inhand-left
+      right:
+      - state: VIRO-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatviro.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: VIRO-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -437,6 +715,7 @@
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterSci
 
+################################################################
 - type: entity
   parent: [ClothingOuterArmorWarden, ClothingOuterWinterCoatToggleable]
   id: ClothingOuterWinterWarden
@@ -449,6 +728,7 @@
     sprite: Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterWarden
+################################################################
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
@@ -457,9 +737,20 @@
   description: A sturdy coat, a warm coat, but not an armored coat.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: WARD-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: WARD-inhand-left
+      right:
+      - state: WARD-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: WARD-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterWarden
 
@@ -470,12 +761,24 @@
   description: "The syndicate's winter coat is made of durable fabric, with gilded patterns, and coarse wool."
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: SYNDIECAP-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: SYNDIECAP-inhand-left
+      right:
+      - state: SYNDIECAP-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: SYNDIECAP-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterSyndie
 
+##############################################################
 - type: entity
   parent: ClothingOuterWinterWarden
   id: ClothingOuterWinterSyndieCapArmored
@@ -488,17 +791,29 @@
     sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterSyndie
+##############################################################
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
   id: ClothingOuterWinterSyndie
   name: syndicate's winter coat
-  description: Insulated winter coat, looks like a merch from "Syndieland"
+  description: Insulated winter coat, looks like a merch from "Syndieland".
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: SYNDIE-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: SYNDIE-inhand-left
+      right:
+      - state: SYNDIE-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: SYNDIE-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterSyndie
 
@@ -520,9 +835,20 @@
   description: Feels like the inside of a cocoon, not that this would make you less afraid of being in one.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatweb.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: WEB-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: WEB-inhand-left
+      right:
+      - state: WEB-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatweb.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: WEB-equipped-OUTERCLOTHING
   - type: Construction
     graph: WebObjects
     node: coat
@@ -540,3 +866,344 @@
           Quantity: 20
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterWeb
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorBlack
+  name: black winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#3f3f3f"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#3f3f3f"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#3f3f3f"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#1d1d1d"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorBlack
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorPurple
+  name: purple winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#9C0DE1"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#9C0DE1"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#9C0DE1"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#9C0DE1"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorPurple
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorRed
+  name: red winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#940000"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#940000"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#940000"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#940000"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorRed
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorBlue
+  name: blue winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#0089EF"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#0089EF"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#0089EF"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#0089EF"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorBlue
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorBrown
+  name: brown winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#723A02"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#723A02"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#723A02"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#723A02"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorBrown
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorGray
+  name: gray winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#999999"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#999999"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#999999"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#999999"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorGray
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorGreen
+  name: green winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#5ABF2F"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#5ABF2F"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#5ABF2F"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#5ABF2F"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorGreen
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorLightBrown
+  name: light brown winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#C09F72"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#C09F72"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#C09F72"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#C09F72"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorLightBrown
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorOrange
+  name: orange winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#EF8100"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#EF8100"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#EF8100"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#EF8100"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorOrange
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorWhite
+  name: white winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#EAE8E8"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#EAE8E8"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#EAE8E8"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#EAE8E8"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorWhite
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorYellow
+  name: yellow winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#EBE216"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#EBE216"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#EBE216"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#EBE216"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorYellow
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
index 856eb06ed7a..fb1363bf409 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -159,7 +159,7 @@
   parent: ClothingShoesBaseWinterBoots
   id: ClothingShoesBootsWinterSyndicate
   name: syndicate's winter boots
-  description: Durable heavy boots, looks like merch from "Syndieland"
+  description: Durable heavy boots, looks like merch from "Syndieland".
   components:
   - type: Sprite
     sprite: Clothing/Shoes/Boots/winterbootssyndicate.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index 529ab79a99b..d411c1bae6b 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -481,7 +481,7 @@
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtCentcomFormalDress
   name: central command formal dress
-  description: A dress for special occasions
+  description: A dress for special occasions.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index e74f5e3abde..047285532e0 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -422,7 +422,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitKimono
   name: kimono
-  description: traditional chinese clothing
+  description: Traditional chinese clothing.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi
@@ -1076,7 +1076,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitCossack
   name: cossack suit
-  description: the good old pants and brigantine.
+  description: The good old pants and brigantine.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/cossack.rsi
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
index 0107ce47022..cb06b39998f 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -851,4 +851,18 @@
       sprite: Mobs/Animals/clownspider.rsi
   - type: ConditionalSpawner
     prototypes:
-    - MobClownSpider
\ No newline at end of file
+    - MobClownSpider
+
+- type: entity
+  name: honk bot spawner
+  id: SpawnHonkBot
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: honkbot
+      sprite: Mobs/Silicon/Bots/honkbot.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobHonkBot
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/temp.yml b/Resources/Prototypes/Entities/Markers/Spawners/temp.yml
new file mode 100644
index 00000000000..aa76bb5ea7a
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/temp.yml
@@ -0,0 +1,11 @@
+- type: entity
+  id: TemporaryEntityForTimedDespawnSpawners
+  categories: [ HideSpawnMenu, Spawner ]
+  components:
+  - type: Transform
+    anchored: True
+  - type: Physics
+    bodyType: Static
+    canCollide: false
+  - type: TimedDespawn
+    # we can't declare the SpawnOnDespawnComponent because the entity is required on yml
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index fad2b70c4e9..d99359d998b 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -233,7 +233,8 @@
   - type: Emoting
   - type: GuideHelp
     guides:
-      - Cyborgs
+    - Cyborgs
+    - Robotics
   - type: StepTriggerImmune
   # Sunrise-start
   - type: TTS
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 3182563e92c..aaf49d1a028 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -788,6 +788,7 @@
   - type: GuideHelp
     guides:
     - Chef
+    - FoodRecipes
 
 - type: entity
   name: crab
@@ -1655,7 +1656,14 @@
     wilhelmProbability: 0.001
   # TODO: Remove CombatMode when Prototype Composition is added
   - type: CombatMode
-    combatToggleAction: ActionCombatModeToggleOff
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Effects/bite.ogg
+    angle: 0
+    animation: WeaponArcBite
+    damage:
+      types:
+        Piercing: 0
   - type: Bloodstream
     bloodMaxVolume: 50
   - type: CanEscapeInventory
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml
index edbfb5bf12d..7571d8c8f45 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml
@@ -3,7 +3,7 @@
   id: MobWatcherBase
   parent: [ SimpleSpaceMobBase, FlyingMobBase ]
   abstract: true
-  description: It's like its staring right through you.
+  description: It's like it's staring right through you.
   components:
   - type: NpcFactionMember
     factions:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
index e09d3917c75..7c4850fafcf 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -76,7 +76,7 @@
   - MobFlammable
   - MobCombat
   name: tomato killer
-  description: it seems today it's not you eating tomatoes, it's the tomatoes eating you.
+  description: Looks like it's not you eating tomatoes today, it's the tomatoes eating you.
   components:
   - type: Item
   - type: NpcFactionMember
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 0110eea8c67..b4bf1dea02c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -123,6 +123,8 @@
     tags:
     - CannotSuicide
     - VimPilot
+  - type: StealTarget
+    stealGroup: AnimalNamedCat
 
 - type: entity
   name: Exception
@@ -141,6 +143,8 @@
     tags:
     - CannotSuicide
     - VimPilot
+  - type: StealTarget
+    stealGroup: AnimalNamedCat
 
 - type: entity
   name: Floppa
@@ -166,6 +170,8 @@
     tags:
     - CannotSuicide
     - VimPilot
+  - type: StealTarget
+    stealGroup: AnimalNamedCat
 
 - type: entity
   name: Bandito
@@ -237,7 +243,7 @@
     - CannotSuicide
     - VimPilot
   - type: StealTarget
-    stealGroup: AnimalBingus
+    stealGroup: AnimalNamedCat
 
 - type: entity
   name: McGriff
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 0b52df78592..d7730a4f8ab 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -324,7 +324,7 @@
   - StripableInventoryBase
   id: MobMimeBot
   name: mimebot
-  description: Why not give mimebot a friendly wave.
+  description: Why not give the mimebot a friendly wave?
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index 4936d883e57..41545aef894 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -26,6 +26,8 @@
     - TemporaryBlindness
     - Pacified
     - Flashed
+    - RadiationProtection
+    - Drowsiness
   - type: Buckle
   - type: StandingState
   - type: Tag
@@ -91,16 +93,18 @@
     baseDecayRate: 0.04
   - type: StatusEffects
     allowed:
-      - Stun
-      - KnockedDown
-      - SlowedDown
-      - Stutter
-      - Electrocution
-      - ForcedSleep
-      - TemporaryBlindness
-      - Pacified
-      - StaminaModifier
-      - Flashed
+    - Stun
+    - KnockedDown
+    - SlowedDown
+    - Stutter
+    - Electrocution
+    - ForcedSleep
+    - TemporaryBlindness
+    - Pacified
+    - StaminaModifier
+    - Flashed
+    - RadiationProtection
+    - Drowsiness
   - type: Bloodstream
     bloodMaxVolume: 150
   - type: MobPrice
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 86e5daf2d21..de7a50ff832 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -164,7 +164,7 @@
 - type: entity
   id: ActionAGhostShowStationRecords
   name: Station Records Interface
-  description: View a station records Interface
+  description: View a station records Interface.
   components:
   - type: InstantAction
     icon: _Sunrise/Interface/AdminActions/records.png
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index a687009fc2b..20cf743d5e2 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -162,7 +162,7 @@
   categories: [ HideSpawnMenu ]
   id: DragonsBreathGun
   name: dragon's lung
-  description: For dragon's breathing
+  description: For dragon's breathing.
   components:
   - type: RechargeBasicEntityAmmo
     rechargeCooldown: 5
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index eececb70da5..b21f19edd3c 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -148,7 +148,7 @@
   name: Ifrit
   parent: MobGuardianBase
   id: MobIfritGuardian
-  description: A corrupted jinn, ripped from fitra to serve the wizard's petty needs. It stands wicked, tuning into it's owner's life to sustain itself.
+  description: A corrupted jinn, ripped from fitra to serve the wizard's petty needs. It stands wicked, tuning into its owner's life to sustain itself.
   components:
     - type: GhostRole
       allowMovement: true
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 3036a555543..e009ac679e7 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -137,6 +137,8 @@
     - Pacified
     - StaminaModifier
     - Flashed
+    - RadiationProtection
+    - Drowsiness
     - LoveEffect  # Sunrise-Aphrodesiac
   - type: Body
     prototype: Human
@@ -246,7 +248,6 @@
       groups:
         Brute: -0.07
   - type: Fingerprint
-
   - type: Blindable
   # Other
   - type: Temperature
@@ -260,6 +261,11 @@
     heatDamage:
       types:
         Heat: 1.5 #per second, scales with temperature & other constants
+  - type: TemperatureSpeed
+    thresholds:
+      293: 0.8
+      280: 0.6
+      260: 0.4
   - type: ThermalRegulator
     metabolismHeat: 800
     radiatedHeat: 100
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index f58daadc624..7d5e361b636 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -64,6 +64,11 @@
     heatDamage:
       types:
         Heat : 3 #per second, scales with temperature & other constants
+  - type: TemperatureSpeed
+    thresholds:
+      289: 0.8
+      275: 0.6
+      250: 0.4
   - type: Sprite # sprite again because we want different layer ordering
     noRot: true
     drawdepth: Mobs
diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
index 1c9eaa2ec62..c023dc1c252 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -59,6 +59,11 @@
     heatDamage:
       types:
         Heat : 1.5 #per second, scales with temperature & other constants
+  - type: TemperatureSpeed
+    thresholds:
+      301: 0.8
+      295: 0.6
+      285: 0.4
   - type: Wagging
   - type: Inventory
     speciesId: reptilian
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index a51a9a19306..c435e6c98fe 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -2141,7 +2141,7 @@
   parent: DrinkGlassBase
   id: DrinkWaterJug
   name: water jug
-  description: Stay hydrated
+  description: Stay hydrated.
   components:
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index f894b170f4f..a5f72b85460 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -752,7 +752,7 @@
   id: DrinkSugarJug
   name: sugar jug
   suffix: For Drinks, Full
-  description: some people put this in their coffee...
+  description: Some people put this in their coffee...
   components:
   - type: SolutionContainerManager
     solutions:
@@ -767,7 +767,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkLemonLimeJug
   name: lemon lime jug
-  description: a dual citrus sensation.
+  description: A dual citrus sensation.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -784,7 +784,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkMeadJug
   name: mead jug
-  description: storing mead in a plastic jug should be a crime.
+  description: Storing mead in a plastic jug should be a crime.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -801,7 +801,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkIceJug
   name: ice jug
-  description: stubborn water. pretty cool.
+  description: Stubborn water. Pretty cool.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -835,7 +835,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkCoffeeJug
   name: coffee jug
-  description: wake up juice, of the heated kind.
+  description: Wake up juice, of the heated kind.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -852,7 +852,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkTeaJug
   name: tea jug
-  description: the drink of choice for the Bri'ish and hipsters.
+  description: The drink of choice for the Bri'ish and hipsters.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -869,7 +869,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkGreenTeaJug
   name: green tea jug
-  description: its like tea... but green! great for settling the stomach.
+  description: It's like tea... but green! great for settling the stomach.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -886,7 +886,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkIcedTeaJug
   name: iced tea jug
-  description: for when the regular tea is too hot for you boohoo
+  description: For when the regular tea is too hot for you boohoo.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -903,7 +903,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkDrGibbJug
   name: dr gibb. jug
-  description: yeah I don't know either...
+  description: Yeah I don't know either...
   components:
   - type: SolutionContainerManager
     solutions:
@@ -920,7 +920,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkRootBeerJug
   name: root beer jug
-  description: this drink makes Australians giggle
+  description: This drink makes Australians giggle.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -937,7 +937,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkWaterMelonJuiceJug
   name: watermelon juice jug
-  description: May include leftover seeds
+  description: May include leftover seeds.
   components:
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
index 0b2af4c97f4..1c90e719792 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
@@ -23,7 +23,7 @@
   parent: FlaskBase
   id: DrinkMREFlask
   name: MRE flask
-  description: An old military flask, filled with the finest contents for soldiers
+  description: An old military flask, filled with the finest contents for soldiers.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mreflask.rsi
@@ -58,7 +58,7 @@
   parent: FlaskBase
   id: DrinkFlask
   name: captain's flask
-  description: A metal flask belonging to the captain
+  description: A metal flask belonging to the captain.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/flask.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index 604ae28fb30..dfb6ac31c03 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -72,7 +72,7 @@
   parent: DrinkGlassBase
   id: DrinkJar
   name: jar
-  description: The hipster's cup
+  description: The hipster's cup.
   components:
   - type: Drink
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index b9a5cc42e45..bbf02fdb881 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -292,7 +292,7 @@
   name: lemoon cake
   parent: FoodCakeBase
   id: FoodCakeLemoon
-  description: A cake that represents the moon of earth
+  description: A cake that represents the moon of earth.
   components:
   - type: Sprite
     state: lemoon
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
index e8efb194356..c7e46d9a94a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
@@ -296,7 +296,7 @@
   name: stonk-pocket
   parent: FoodDonkpocketBase
   id: FoodDonkpocketStonk
-  description: Tasty, but a sad reminder of the great crash of '24
+  description: Tasty, but a sad reminder of the great crash of '24.
   components:
   - type: FlavorProfile
     flavors:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
index 55bf7f994ab..20b03fcb67a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -319,11 +319,9 @@
         maxVol: 50
         reagents:
         - ReagentId: Nutriment
-          Quantity: 25
-        - ReagentId: Vitamin
-          Quantity: 5
-        - ReagentId: DoctorsDelight
-          Quantity: 6
+          Quantity: 20
+        - ReagentId: THC
+          Quantity: 30
 
 - type: entity
   name: slice of dank pizza
@@ -346,11 +344,9 @@
         maxVol: 10
         reagents:
         - ReagentId: Nutriment
-          Quantity: 4.2
-        - ReagentId: Vitamin
-          Quantity: 0.8
-        - ReagentId: DoctorsDelight
-          Quantity: 1
+          Quantity: 3.5
+        - ReagentId: THC
+          Quantity: 5
 # Tastes like crust, tomato, cheese, meat, satisfaction.
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index bb0f05c1814..59b1db17820 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -361,7 +361,7 @@
   name: dragon flesh
   parent: FoodMeatBase
   id: FoodMeatDragon
-  description: The dense meat of the space-era apex predator is oozing with it's mythical ichor. Ironically, best eaten raw.
+  description: The dense meat of the space-era apex predator is oozing with its mythical ichor. Ironically, best eaten raw.
   components:
   - type: Tag
     tags:
@@ -447,6 +447,8 @@
     tags:
     - Raw
     - Meat
+    - Trash
+    - Recyclable
   - type: Sprite
     state: rotten
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 75ed63a4ce2..88a30150d8d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -1277,7 +1277,7 @@
   name: poppy
   parent: FoodProduceBase
   id: FoodPoppy
-  description: A flower with extracts often used in the production of medicine
+  description: A flower with extracts often used in the production of medicine.
   components:
   - type: Clothing
     slots:
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
index f35d222d39c..6f4baf2785d 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -548,7 +548,7 @@
   parent: BaseTree
   id: LightTree01
   name: glowing tree
-  description: a marvelous tree filled with strange energy.
+  description: A marvelous tree filled with strange energy.
   components:
   - type: PointLight
     radius: 2.0
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
index e4bde7ab84f..4b7a0ee55a3 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
@@ -4,7 +4,7 @@
   id: ShuttleGunSvalinnMachineGunCircuitboard
   parent: BaseMachineCircuitboard
   name: LSE-400c "Svalinn machine gun" machine board
-  description: A machine printed circuit board for an LSE-400c "Svalinn machine gun"
+  description: A machine printed circuit board for an LSE-400c "Svalinn machine gun".
   suffix: DO NOT MAP, Machine Board
   components:
   - type: Sprite
@@ -21,7 +21,7 @@
   id: ShuttleGunPerforatorCircuitboard
   parent: BaseMachineCircuitboard
   name: LSE-1200c "Perforator" machine board
-  description: A machine printed circuit board for an LSE-1200c "Perforator"
+  description: A machine printed circuit board for an LSE-1200c "Perforator".
   suffix: DO NOT MAP, Machine Board
   components:
   - type: Sprite
@@ -38,7 +38,7 @@
   id: ShuttleGunFriendshipCircuitboard
   parent: BaseMachineCircuitboard
   name: EXP-320g "Friendship" machine board
-  description: A machine printed circuit board for an EXP-320g "Friendship"
+  description: A machine printed circuit board for an EXP-320g "Friendship".
   suffix: DO NOT MAP, Machine Board
   components:
   - type: Sprite
@@ -55,7 +55,7 @@
   id: ShuttleGunDusterCircuitboard
   parent: BaseMachineCircuitboard
   name: EXP-2100g "Duster" machine board
-  description: A machine printed circuit board for an EXP-2100g "Duster"
+  description: A machine printed circuit board for an EXP-2100g "Duster".
   suffix: DO NOT MAP, Machine Board
   components:
   - type: Sprite
@@ -73,7 +73,7 @@
   id: ShuttleGunKineticCircuitboard
   parent: BaseMachineCircuitboard
   name: PTK-800 "Matter Dematerializer" machine board
-  description: A machine printed circuit board for an PTK-800 "Matter Dematerializer"
+  description: A machine printed circuit board for an PTK-800 "Matter Dematerializer".
   suffix: DO NOT MAP, Machine Board
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
index a1260f07c0c..f1b03f97c23 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
@@ -2,7 +2,7 @@
   id: MachineParticleAcceleratorEndCapCircuitboard
   parent: BaseMachineCircuitboard
   name: PA end cap board
-  description: A machine board for a particle accelerator end cap
+  description: A machine board for a particle accelerator end cap.
   components:
     - type: Sprite
       state: engineering
@@ -16,7 +16,7 @@
   id: MachineParticleAcceleratorFuelChamberCircuitboard
   parent: BaseMachineCircuitboard
   name: PA fuel chamber board
-  description: A machine board for a particle accelerator fuel chamber
+  description: A machine board for a particle accelerator fuel chamber.
   components:
     - type: Sprite
       state: engineering
@@ -34,7 +34,7 @@
   id: MachineParticleAcceleratorPowerBoxCircuitboard
   parent: BaseMachineCircuitboard
   name: PA power box board
-  description: A machine board for a particle accelerator power box
+  description: A machine board for a particle accelerator power box.
   components:
     - type: Sprite
       state: engineering
@@ -50,7 +50,7 @@
   id: MachineParticleAcceleratorEmitterStarboardCircuitboard
   parent: BaseMachineCircuitboard
   name: PA starboard emitter board
-  description: A machine board for a particle accelerator left emitter
+  description: A machine board for a particle accelerator left emitter.
   components:
     - type: Sprite
       state: engineering
@@ -64,7 +64,7 @@
   id: MachineParticleAcceleratorEmitterForeCircuitboard
   parent: BaseMachineCircuitboard
   name: PA fore emitter board
-  description: A machine board for a particle accelerator center emitter
+  description: A machine board for a particle accelerator center emitter.
   components:
     - type: Sprite
       state: engineering
@@ -78,7 +78,7 @@
   id: MachineParticleAcceleratorEmitterPortCircuitboard
   parent: BaseMachineCircuitboard
   name: PA port emitter board
-  description: A machine board for a particle accelerator right emitter
+  description: A machine board for a particle accelerator right emitter.
   components:
     - type: Sprite
       state: engineering
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index b25c394f825..2e3df6e754a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -2,7 +2,7 @@
   id: AutolatheMachineCircuitboard
   parent: BaseMachineCircuitboard
   name: autolathe machine board
-  description: A machine printed circuit board for an autolathe
+  description: A machine printed circuit board for an autolathe.
   components:
     - type: MachineBoard
       prototype: Autolathe
@@ -15,7 +15,7 @@
   parent: BaseMachineCircuitboard
   id: AutolatheHyperConvectionMachineCircuitboard
   name: hyper convection autolathe machine board
-  description: A machine printed circuit board for a hyper convection autolathe
+  description: A machine printed circuit board for a hyper convection autolathe.
   components:
   - type: MachineBoard
     prototype: AutolatheHyperConvection
@@ -95,7 +95,7 @@
   id: AmmoTechFabCircuitboard
   parent: BaseMachineCircuitboard
   name: ammo techfab circuit board
-  description: A machine printed circuit board for an ammo techfab
+  description: A machine printed circuit board for an ammo techfab.
   components:
     - type: Sprite
       state: security
@@ -1253,3 +1253,16 @@
       Steel: 2
       Glass: 5
       Cable: 2
+
+- type: entity
+  parent: BaseMachineCircuitboard
+  id: CutterMachineCircuitboard
+  name: cutter machine board
+  components:
+  - type: MachineBoard
+    prototype: CutterMachine
+    stackRequirements:
+      Steel: 2
+      Capacitor: 1
+      Manipulator: 1
+      Cable: 1
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml
index 838ec637d33..0fea9b72279 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml
@@ -2,7 +2,7 @@
   id: AirAlarmElectronics
   parent: BaseElectronics
   name: air alarm electronics
-  description: An electronics board used in air alarms
+  description: An electronics board used in air alarms.
   components:
   - type: Sprite
     sprite: Objects/Misc/module.rsi
@@ -17,7 +17,7 @@
   id: FireAlarmElectronics
   parent: BaseElectronics
   name: fire alarm electronics
-  description: An electronics board used in fire alarms
+  description: An electronics board used in fire alarms.
   components:
   - type: Item
     storedRotation: 0
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml
index 7c2f2a6fda0..4e57705417c 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml
@@ -2,7 +2,7 @@
   id: MailingUnitElectronics
   parent: BaseElectronics
   name: mailing unit electronics
-  description: An electronics board used in mailing units
+  description: An electronics board used in mailing units.
   components:
     - type: Sprite
       sprite: Objects/Misc/module.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
index a832bea7414..5ca355ec71b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
@@ -2,7 +2,7 @@
   id: DoorElectronics
   parent: BaseElectronics
   name: door electronics
-  description: An electronics board used in doors and airlocks
+  description: An electronics board used in doors and airlocks.
   components:
     - type: Sprite
       sprite: Objects/Misc/module.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml
index 3446a3ba4f9..c1a8a9d70bf 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml
@@ -2,7 +2,7 @@
   id: IntercomElectronics
   parent: BaseElectronics
   name: intercom electronics
-  description: An electronics board used in intercoms
+  description: An electronics board used in intercoms.
   components:
   - type: Sprite
     sprite: Objects/Misc/module.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
index 2cb9b5233d0..acc82abebe4 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
@@ -59,7 +59,7 @@
   parent: BaseItem
   id: VoiceTrigger
   name: voice trigger
-  description: Adds a machine link that is triggered by vocal keywords
+  description: Adds a machine link that is triggered by vocal keywords.
   components:
   - type: Sprite
     sprite: Objects/Devices/voice.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml
index 0b1769a3dad..823ee828625 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml
@@ -36,7 +36,7 @@
   name: holoparasite box
   parent: BoxCardboard
   id: BoxHoloparasite
-  description: A box containing a holoparasite injector
+  description: A box containing a holoparasite injector.
   components:
   - type: StorageFill
     contents:
@@ -52,7 +52,7 @@
   name: holoclown box
   parent: BoxCardboard
   id: BoxHoloclown
-  description: A box containing a holoclown injector
+  description: A box containing a holoclown injector.
   components:
   - type: StorageFill
     contents:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
index 0563826a570..f9581149e21 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
@@ -2,7 +2,7 @@
   parent: BaseItem
   id: NotekeeperCartridge
   name: notekeeper cartridge
-  description: A program for keeping notes
+  description: A program for keeping notes.
   components:
   - type: Sprite
     sprite: Objects/Devices/cartridge.rsi
@@ -20,7 +20,7 @@
   parent: BaseItem
   id: NewsReaderCartridge
   name: news cartridge
-  description: A program for reading news
+  description: A program for reading news.
   components:
   - type: Sprite
     sprite: Objects/Devices/cartridge.rsi
@@ -38,7 +38,7 @@
   parent: BaseItem
   id: CrewManifestCartridge
   name: crew manifest cartridge
-  description: A program for listing your fellow crewmembers
+  description: A program for listing your fellow crewmembers.
   components:
     - type: Sprite
       sprite: Objects/Devices/cartridge.rsi
@@ -56,7 +56,7 @@
   parent: BaseItem
   id: NetProbeCartridge
   name: NetProbe cartridge
-  description: A program for getting the address and frequency of network devices
+  description: A program for getting the address and frequency of network devices.
   components:
     - type: Sprite
       sprite: Objects/Devices/cartridge.rsi
@@ -74,7 +74,7 @@
   parent: BaseItem
   id: LogProbeCartridge
   name: LogProbe cartridge
-  description: A program for getting access logs from devices
+  description: A program for getting access logs from devices.
   components:
     - type: Sprite
       sprite: Objects/Devices/cartridge.rsi
@@ -92,4 +92,4 @@
     - type: LogProbeCartridge
     - type: GuideHelp
       guides:
-        - Forensics
+      - Forensics
diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
index 75cca712214..08260acb88d 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
@@ -233,7 +233,7 @@
   parent: EncryptionKey
   id: EncryptionKeyFreelance
   name: freelancer encryption key
-  description: An encryption key used by freelancers, who may or may not have an affiliation. It looks like its worn out.
+  description: An encryption key used by freelancers, who may or may not have an affiliation. It looks like it's worn out.
   components:
     - type: EncryptionKey
       channels:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
index a0ada5ebe34..fbb477de64b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
@@ -26,7 +26,7 @@
   - type: ForensicScanner
   - type: GuideHelp
     guides:
-      - Forensics
+    - Forensics
   - type: StealTarget
     stealGroup: ForensicScanner
 
@@ -34,7 +34,7 @@
   name: forensic scanner report
   parent: Paper
   id: ForensicReportPaper
-  description: 'Circumstantial evidence, at best'
+  description: Circumstantial evidence, at best.
   components:
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
index 6ceb5e23edc..3e2f02f8283 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
@@ -162,7 +162,7 @@
   parent: BaseHandheldInstrument
   id: GuitarlessFretsInstrument
   name: guitarless frets
-  description: who even needs a body?
+  description: Who even needs a body?
   suffix: Admeme #the sound is awful
   components:
   - type: Instrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
index 191bb75e50e..43fd0e265f6 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
@@ -148,7 +148,7 @@
     state: toms
 
 - type: entity
-  parent: [ BasePlaceableInstrument, ConstructibleMachine]
+  parent: [ BasePlaceableInstrumentRotatable, ConstructibleMachine]
   id: DawInstrument
   name: digital audio workstation
   description: Cutting edge music technology, straight from the 90s.
diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
index 31fd4fd8e27..dfcb0c68f1e 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: dart
-  description: light throwing dart for playing darts. Don't get in the eye!
+  description: Light throwing dart for playing darts. Don't get in the eye!
   parent: BaseItem
   id: Dart
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
index ce83f66cb37..0ab95ce0430 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -19,6 +19,10 @@
     - Figurine
   - type: StealTarget
     stealGroup: Figurines
+  - type: UseDelay
+    delay: 10
+  - type: Speech
+    speechSounds: Pai # it just sounds better
 
 - type: entity
   parent: BaseFigurine
@@ -28,6 +32,8 @@
   components:
   - type: Sprite
     state: hop
+  - type: SpeakOnUse
+    pack: FigurinesHoP
 
 - type: entity
   parent: BaseFigurine
@@ -37,6 +43,8 @@
   components:
   - type: Sprite
     state: passenger
+  - type: SpeakOnUse
+    pack: FigurinesPassenger
 
 - type: entity
   parent: BaseFigurine
@@ -46,6 +54,8 @@
   components:
   - type: Sprite
     state: passenger_greytide
+  - type: SpeakOnUse
+    pack: FigurinesGreytider
 
 - type: entity
   parent: BaseFigurine
@@ -55,6 +65,8 @@
   components:
   - type: Sprite
     state: clown
+  - type: SpeakOnUse
+    pack: FigurinesClown
 
 - type: entity
   parent: BaseFigurine
@@ -64,7 +76,8 @@
   components:
   - type: Sprite
     state: holoclown
-
+  - type: SpeakOnUse
+    pack: FigurinesHoloClown
 
 - type: entity
   parent: BaseFigurine
@@ -74,6 +87,8 @@
   components:
   - type: Sprite
     state: mime
+  - type: SpeakOnUse
+    pack: FigurinesMime
 
 - type: entity
   parent: BaseFigurine
@@ -83,6 +98,8 @@
   components:
   - type: Sprite
     state: musician
+  - type: SpeakOnUse
+    pack: FigurinesMusician
 
 - type: entity
   parent: BaseFigurine
@@ -92,6 +109,8 @@
   components:
   - type: Sprite
     state: boxer
+  # - type: SpeakOnUse # TODO add something
+  #   pack: FigurinesBoxer
 
 - type: entity
   parent: BaseFigurine
@@ -101,6 +120,8 @@
   components:
   - type: Sprite
     state: captain
+  - type: SpeakOnUse
+    pack: FigurinesCaptain
 
 - type: entity
   parent: BaseFigurine
@@ -110,6 +131,8 @@
   components:
   - type: Sprite
     state: hos
+  - type: SpeakOnUse
+    pack: FigurinesHoS
 
 - type: entity
   parent: BaseFigurine
@@ -119,6 +142,8 @@
   components:
   - type: Sprite
     state: warden
+  - type: SpeakOnUse
+    pack: FigurinesWarden
 
 - type: entity
   parent: BaseFigurine
@@ -128,6 +153,8 @@
   components:
   - type: Sprite
     state: detective
+  - type: SpeakOnUse
+    pack: FigurinesDetective
 
 - type: entity
   parent: BaseFigurine
@@ -137,6 +164,8 @@
   components:
   - type: Sprite
     state: security
+  - type: SpeakOnUse
+    pack: FigurinesSecurity
 
 - type: entity
   parent: BaseFigurine
@@ -146,6 +175,8 @@
   components:
   - type: Sprite
     state: lawyer
+  - type: SpeakOnUse
+    pack: FigurinesLawyer
 
 - type: entity
   parent: BaseFigurine
@@ -155,6 +186,8 @@
   components:
   - type: Sprite
     state: cargotech
+  - type: SpeakOnUse
+    pack: FigurinesCargoTech
 
 - type: entity
   parent: BaseFigurine
@@ -164,6 +197,8 @@
   components:
   - type: Sprite
     state: salvage
+  - type: SpeakOnUse
+    pack: FigurinesSalvage
 
 - type: entity
   parent: BaseFigurine
@@ -173,6 +208,8 @@
   components:
   - type: Sprite
     state: qm
+  - type: SpeakOnUse
+    pack: FigurinesQM
 
 - type: entity
   parent: BaseFigurine
@@ -182,6 +219,8 @@
   components:
   - type: Sprite
     state: ce
+  - type: SpeakOnUse
+    pack: FigurinesCE
 
 - type: entity
   parent: BaseFigurine
@@ -191,6 +230,8 @@
   components:
   - type: Sprite
     state: engineer
+  - type: SpeakOnUse
+    pack: FigurinesEngineer
 
 - type: entity
   parent: BaseFigurine
@@ -200,6 +241,8 @@
   components:
   - type: Sprite
     state: atmos
+  - type: SpeakOnUse
+    pack: FigurinesAtmosTech
 
 - type: entity
   parent: BaseFigurine
@@ -209,6 +252,8 @@
   components:
   - type: Sprite
     state: rd
+  - type: SpeakOnUse
+    pack: FigurinesRD
 
 - type: entity
   parent: BaseFigurine
@@ -218,6 +263,8 @@
   components:
   - type: Sprite
     state: scientist
+  - type: SpeakOnUse
+    pack: FigurinesScientist
 
 - type: entity
   parent: BaseFigurine
@@ -227,6 +274,8 @@
   components:
   - type: Sprite
     state: cmo
+  - type: SpeakOnUse
+    pack: FigurinesCMO
 
 - type: entity
   parent: BaseFigurine
@@ -236,6 +285,8 @@
   components:
   - type: Sprite
     state: chemist
+  - type: SpeakOnUse
+    pack: FigurinesChemist
 
 - type: entity
   parent: BaseFigurine
@@ -245,6 +296,8 @@
   components:
   - type: Sprite
     state: paramedic
+  - type: SpeakOnUse
+    pack: FigurinesParamedic
 
 - type: entity
   parent: BaseFigurine
@@ -254,6 +307,8 @@
   components:
   - type: Sprite
     state: medical
+  - type: SpeakOnUse
+    pack: FigurinesDoctor
 
 - type: entity
   parent: BaseFigurine
@@ -263,6 +318,8 @@
   components:
   - type: Sprite
     state: librarian
+  - type: SpeakOnUse
+    pack: FigurinesLibrarian
 
 - type: entity
   parent: BaseFigurine
@@ -272,6 +329,8 @@
   components:
   - type: Sprite
     state: chaplain
+  - type: SpeakOnUse
+    pack: FigurinesChaplain
 
 - type: entity
   parent: BaseFigurine
@@ -281,6 +340,8 @@
   components:
   - type: Sprite
     state: chef
+  - type: SpeakOnUse
+    pack: FigurinesChef
 
 - type: entity
   parent: BaseFigurine
@@ -290,6 +351,8 @@
   components:
   - type: Sprite
     state: bartender
+  - type: SpeakOnUse
+    pack: FigurinesBartender
 
 - type: entity
   parent: BaseFigurine
@@ -299,6 +362,8 @@
   components:
   - type: Sprite
     state: botanist
+  - type: SpeakOnUse
+    pack: FigurinesBotanist
 
 - type: entity
   parent: BaseFigurine
@@ -308,6 +373,8 @@
   components:
   - type: Sprite
     state: janitor
+  - type: SpeakOnUse
+    pack: FigurinesJanitor
 
 - type: entity
   parent: BaseFigurine
@@ -317,6 +384,8 @@
   components:
   - type: Sprite
     state: nukie
+  - type: SpeakOnUse
+    pack: FigurinesNukie
 
 - type: entity
   parent: BaseFigurine
@@ -326,6 +395,8 @@
   components:
   - type: Sprite
     state: nukie_elite
+  - type: SpeakOnUse
+    pack: FigurinesNukieElite
 
 - type: entity
   parent: BaseFigurine
@@ -335,6 +406,8 @@
   components:
   - type: Sprite
     state: nukie_commander
+  - type: SpeakOnUse
+    pack: FigurinesNukieCommander
 
 - type: entity
   parent: BaseFigurine
@@ -344,6 +417,8 @@
   components:
   - type: Sprite
     state: footsoldier
+  - type: SpeakOnUse
+    pack: FigurinesFootsoldier
 
 - type: entity
   parent: BaseFigurine
@@ -353,6 +428,8 @@
   components:
   - type: Sprite
     state: wizard
+  - type: SpeakOnUse
+    pack: FigurinesWizard
 
 - type: entity
   parent: BaseFigurine
@@ -362,6 +439,8 @@
   components:
   - type: Sprite
     state: wizard_fake
+  - type: SpeakOnUse
+    pack: FigurinesWizard
 
 #Nonhuman Figurines
 
@@ -373,6 +452,8 @@
   components:
   - type: Sprite
     state: spacedragon
+  - type: SpeakOnUse
+    pack: FigurinesSpaceDragon
 
 - type: entity
   parent: BaseFigurine
@@ -382,6 +463,8 @@
   components:
   - type: Sprite
     state: queen
+  # - type: SpeakOnUse # TODO add something
+  #   pack: FigurinesQueen
 
 - type: entity
   parent: BaseFigurine
@@ -391,6 +474,8 @@
   components:
   - type: Sprite
     state: ratking
+  - type: SpeakOnUse
+    pack: FigurinesRatKing
 
 - type: entity
   parent: BaseFigurine
@@ -400,6 +485,8 @@
   components:
   - type: Sprite
     state: ratservant
+  - type: SpeakOnUse
+    pack: FigurinesRatServant
 
 - type: entity
   parent: BaseFigurine
@@ -409,6 +496,8 @@
   components:
   - type: Sprite
     state: mouse
+  - type: SpeakOnUse
+    pack: FigurinesMouse
 
 - type: entity
   parent: BaseFigurine
@@ -418,6 +507,8 @@
   components:
   - type: Sprite
     state: slime
+  - type: SpeakOnUse
+    pack: FigurinesSlime
 
 - type: entity
   parent: BaseFigurine
@@ -427,6 +518,8 @@
   components:
   - type: Sprite
     state: hamlet
+  - type: SpeakOnUse
+    pack: FigurinesHamlet
 
 #TODO: Convert these to the new figurine sprite template and rename their sprite name.
 #Yes, these are humanoids, but they need to be updated first.
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 20c92b09016..ad304a5bce8 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -211,7 +211,7 @@
   parent: BasePlushie
   id: PlushieRouny
   name: rouny plushie
-  description: Rouny
+  description: Rouny.
   components:
   - type: Sprite
     state: plushie_rouny
@@ -1273,7 +1273,7 @@
   parent: BasePlushie
   id: ToyAmongPequeno
   name: among pequeño
-  description: sus!
+  description: Sus!
   components:
   - type: Sprite
     sprite: Objects/Fun/pequeno.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
index d5cf78c65b9..1f1bd0b2afc 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml
@@ -108,6 +108,7 @@
     openOnActivation: true
     guides:
     - Bartender
+    - Drinks
 
 - type: entity
   id: BookHowToCookForFortySpaceman
@@ -130,6 +131,7 @@
     openOnActivation: true
     guides:
     - Chef
+    - FoodRecipes
 
 - type: entity
   id: BookLeafLoversSecret
@@ -155,6 +157,7 @@
     openOnActivation: true
     guides:
     - Botany
+    - Chemicals
 
 - type: entity
   id: BookEngineersHandbook
@@ -231,6 +234,7 @@
     openOnActivation: true
     guides:
     - Security
+    - Antagonists
 
 - type: entity
   id: BookHowToKeepStationClean
@@ -352,6 +356,7 @@
     openOnActivation: true
     guides:
     - Chemicals
+    - Chemist
 
 - type: entity
   id: BookSpaceLaw
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index e234563ab58..bd6d32121c6 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -135,7 +135,7 @@
   name: interrogator lamp
   id: LampInterrogator
   parent: BaseLamp
-  description: Ultra-bright lamp for the bad cop
+  description: Ultra-bright lamp for the bad cop.
   components:
   - type: Sprite
     sprite: Objects/Misc/Lights/lampint.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
index a502c714049..b1ccef48e87 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -26,6 +26,7 @@
   - type: GuideHelp
     guides:
     - Security
+    - Antagonists
   - type: UseDelay
     delay: 3
 
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 90d82e345d6..751911617de 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -108,7 +108,7 @@
   name: artifact analyzer printout
   parent: Paper
   id: PaperArtifactAnalyzer
-  description: 'The readout of a device forgotten to time'
+  description: The readout of a device forgotten to time.
   components:
   - type: Sprite
     layers:
@@ -223,6 +223,7 @@
   - type: GuideHelp
     guides:
     - CargoBounties
+    - Cargo
 
 - type: entity
   name: character sheet
@@ -232,7 +233,6 @@
   components:
   - type: Paper
     contentSize: 10000
-    escapeFormatting: false
     content: book-cnc-sheet
   - type: Sprite
     layers:
@@ -569,6 +569,26 @@
   - type: StealTarget
     stealGroup: BoxFolderQmClipboard
 
+- type: entity
+  parent: Paper
+  id: TraitorCodePaper
+  name: syndicate codeword
+  description: A leaked codeword to possibly get in touch with the Syndicate.
+  suffix: DO NOT MAP
+  components:
+  - type: TraitorCodePaper
+
+- type: entity
+  parent: Paper
+  id: AllTraitorCodesPaper
+  name: syndicate codewords registry
+  description: A registry of all active Syndicate codewords.
+  suffix: Admeme
+  components:
+  - type: TraitorCodePaper
+    fakeCodewords: false
+    codewordShowAll: true
+
 - type: entity
   name: envelope
   parent: BaseItem
@@ -590,7 +610,6 @@
       map: ["enum.PaperVisualLayers.Stamp"]
       visible: false
   - type: Paper
-    escapeFormatting: false
     content: envelope-default-message
   - type: PaperVisuals
     headerImagePath: "/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png"
@@ -645,4 +664,4 @@
       behaviors:
       - !type:EmptyAllContainersBehaviour
       - !type:DoActsBehavior
-        acts: [ "Destruction" ]
\ No newline at end of file
+        acts: [ "Destruction" ]
diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 7de91cbb636..1e5f2573fda 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -41,6 +41,165 @@
       types:
         Blunt: 5
 
+- type: entity
+  name: steel dark checker tile
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelCheckerDark
+  components:
+  - type: Sprite
+    state: checker-dark
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorSteelCheckerDark
+  - type: Stack
+    stackType: FloorTileSteelCheckerDark
+
+- type: entity
+  name: steel light checker tile
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelCheckerLight
+  components:
+  - type: Sprite
+    state: checker-light
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorSteelCheckerLight
+  - type: Stack
+    stackType: FloorTileSteelCheckerLight
+
+- type: entity
+  name: dark tile
+  parent: FloorTileItemBase
+  id: FloorTileItemDark
+  components:
+  - type: Sprite
+    state: dark
+  - type: Item
+    heldPrefix: dark
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDark
+  - type: Stack
+    stackType: FloorTileDark
+  - type: Construction
+    graph: TileDark
+    node: darktile
+
+- type: entity
+  name: dark steel diagonal mini tile
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkDiagonalMini
+  components:
+  - type: Sprite
+    state: dark-diagonal-mini
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkDiagonalMini
+  - type: Stack
+    stackType: FloorTileDarkDiagonalMini
+
+- type: entity
+  name: dark steel diagonal tile
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkDiagonal
+  components:
+  - type: Sprite
+    state: dark-diagonal
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkDiagonal
+  - type: Stack
+    stackType: FloorTileDarkDiagonal
+
+- type: entity
+  name: dark steel herringbone
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkHerringbone
+  components:
+  - type: Sprite
+    state: dark-herringbone
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkHerringbone
+  - type: Stack
+    stackType: FloorTileDarkHerringbone
+
+- type: entity
+  name: dark steel mini tile
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkMini
+  components:
+  - type: Sprite
+    state: dark-mini
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkMini
+  - type: Stack
+    stackType: FloorTileDarkMini
+
+- type: entity
+  name: dark steel mono tile
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkMono
+  components:
+  - type: Sprite
+    state: dark-mono
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkMono
+  - type: Stack
+    stackType: FloorTileDarkMono
+
+- type: entity
+  name: dark steel pavement
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkPavement
+  components:
+  - type: Sprite
+    state: dark-pavement
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkPavement
+  - type: Stack
+    stackType: FloorTileDarkPavement
+
+- type: entity
+  name: dark steel vertical pavement
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkPavementVertical
+  components:
+  - type: Sprite
+    state: dark-pavement-vertical
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkPavementVertical
+  - type: Stack
+    stackType: FloorTileDarkPavementVertical
+
+- type: entity
+  name: offset dark steel tile
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkOffset
+  components:
+  - type: Sprite
+    state: dark-offset
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkOffset
+  - type: Stack
+    stackType: FloorTileDarkOffset
+
 - type: entity
   name: steel tile
   parent: FloorTileItemBase
@@ -61,66 +220,116 @@
     node: steeltile
 
 - type: entity
-  name: steel dark checker tile
+  name: offset steel tile
   parent: FloorTileItemSteel
-  id: FloorTileItemSteelCheckerDark
+  id: FloorTileItemSteelOffset
   components:
   - type: Sprite
-    state: checker-dark
+    state: steel-offset
   - type: FloorTile
     outputs:
       - Plating
-      - FloorSteelCheckerDark
+      - FloorSteelOffset
+  - type: Stack
+    stackType: FloorTileSteelOffset
 
 - type: entity
-  name: steel light checker tile
+  name: steel diagonal mini tile
   parent: FloorTileItemSteel
-  id: FloorTileItemSteelCheckerLight
+  id: FloorTileItemSteelDiagonalMini
   components:
   - type: Sprite
-    state: checker-light
+    state: steel-diagonal-mini
   - type: FloorTile
     outputs:
       - Plating
-      - FloorSteelCheckerLight
+      - FloorSteelDiagonalMini
+  - type: Stack
+    stackType: FloorTileSteelDiagonalMini
 
 - type: entity
-  name: steel tile
-  parent: FloorTileItemBase
-  id: FloorTileItemMetalDiamond
+  name: steel diagonal tile
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelDiagonal
   components:
   - type: Sprite
-    state: metaldiamond
-  - type: Item
-    heldPrefix: steel
+    state: steel-diagonal
   - type: FloorTile
     outputs:
       - Plating
-      - FloorMetalDiamond
+      - FloorSteelDiagonal
   - type: Stack
-    stackType: FloorTileMetalDiamond
-#  - type: Construction
-#    graph: TileSteel
-#    node: steeltile
+    stackType: FloorTileSteelDiagonal
 
 - type: entity
-  name: wood floor
-  parent: FloorTileItemBase
-  id: FloorTileItemWood
+  name: steel herringbone
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelHerringbone
   components:
   - type: Sprite
-    state: wood
-  - type: Item
-    heldPrefix: wood
+    state: steel-herringbone
   - type: FloorTile
     outputs:
       - Plating
-      - FloorWood
+      - FloorSteelHerringbone
   - type: Stack
-    stackType: FloorTileWood
-  - type: Construction
-    graph: TileWood
-    node: woodtile
+    stackType: FloorTileSteelHerringbone
+
+- type: entity
+  name: steel mini tile
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelMini
+  components:
+  - type: Sprite
+    state: steel-mini
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorSteelMini
+  - type: Stack
+    stackType: FloorTileSteelMini
+
+- type: entity
+  name: steel mono tile
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelMono
+  components:
+  - type: Sprite
+    state: steel-mono
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorSteelMono
+  - type: Stack
+    stackType: FloorTileSteelMono
+
+- type: entity
+  name: steel pavement
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelPavement
+  components:
+  - type: Sprite
+    state: steel-pavement
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorSteelPavement
+  - type: Stack
+    stackType: FloorTileSteelPavement
+
+- type: entity
+  name: steel vertical pavement
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelPavementVertical
+  components:
+  - type: Sprite
+    state: steel-pavement-vertical
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorSteelPavementVertical
+  - type: Stack
+    stackType: FloorTileSteelPavementVertical
 
 - type: entity
   name: white tile
@@ -142,23 +351,154 @@
     node: whitetile
 
 - type: entity
-  name: dark tile
+  name: offset white steel tile
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhiteOffset
+  components:
+  - type: Sprite
+    state: white-offset
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhiteOffset
+  - type: Stack
+    stackType: FloorTileWhiteOffset
+
+- type: entity
+  name: white steel diagonal mini tile
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhiteDiagonalMini
+  components:
+  - type: Sprite
+    state: white-diagonal-mini
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhiteDiagonalMini
+  - type: Stack
+    stackType: FloorTileWhiteDiagonalMini
+
+- type: entity
+  name: white steel diagonal tile
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhiteDiagonal
+  components:
+  - type: Sprite
+    state: white-diagonal
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhiteDiagonal
+  - type: Stack
+    stackType: FloorTileWhiteDiagonal
+
+- type: entity
+  name: white steel herringbone
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhiteHerringbone
+  components:
+  - type: Sprite
+    state: white-herringbone
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhiteHerringbone
+  - type: Stack
+    stackType: FloorTileWhiteHerringbone
+
+- type: entity
+  name: white steel mini tile
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhiteMini
+  components:
+  - type: Sprite
+    state: white-mini
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhiteMini
+  - type: Stack
+    stackType: FloorTileWhiteMini
+
+- type: entity
+  name: white steel mono tile
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhiteMono
+  components:
+  - type: Sprite
+    state: white-mono
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhiteMono
+  - type: Stack
+    stackType: FloorTileWhiteMono
+
+- type: entity
+  name: white steel pavement
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhitePavement
+  components:
+  - type: Sprite
+    state: white-pavement
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhitePavement
+  - type: Stack
+    stackType: FloorTileWhitePavement
+
+- type: entity
+  name: white steel vertical pavement
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhitePavementVertical
+  components:
+  - type: Sprite
+    state: white-pavement-vertical
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhitePavementVertical
+  - type: Stack
+    stackType: FloorTileWhitePavementVertical
+
+- type: entity
+  name: steel tile
   parent: FloorTileItemBase
-  id: FloorTileItemDark
+  id: FloorTileItemMetalDiamond
   components:
   - type: Sprite
-    state: dark
+    state: metaldiamond
   - type: Item
-    heldPrefix: dark
+    heldPrefix: steel
   - type: FloorTile
     outputs:
       - Plating
-      - FloorDark
+      - FloorMetalDiamond
   - type: Stack
-    stackType: FloorTileDark
+    stackType: FloorTileMetalDiamond
+#  - type: Construction
+#    graph: TileSteel
+#    node: steeltile
+
+- type: entity
+  name: wood floor
+  parent: FloorTileItemBase
+  id: FloorTileItemWood
+  components:
+  - type: Sprite
+    state: wood
+  - type: Item
+    heldPrefix: wood
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWood
+  - type: Stack
+    stackType: FloorTileWood
   - type: Construction
-    graph: TileDark
-    node: darktile
+    graph: TileWood
+    node: woodtile
 
 - type: entity
   name: techmaint floor
@@ -522,6 +862,34 @@
   - type: Stack
     stackType: FloorTileConcrete
 
+- type: entity
+  name: concrete mono tile
+  parent: FloorTileItemConcrete
+  id: FloorTileItemConcreteMono
+  components:
+  - type: Sprite
+    state: concrete-mono
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorConcreteMono
+  - type: Stack
+    stackType: FloorTileConcreteMono
+
+- type: entity
+  name: concrete smooth
+  parent: FloorTileItemConcrete
+  id: FloorTileItemConcreteSmooth
+  components:
+  - type: Sprite
+    state: concrete-smooth
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorConcreteSmooth
+  - type: Stack
+    stackType: FloorTileConcreteSmooth
+
 - type: entity
   parent: FloorTileItemBase
   id: FloorTileItemGrayConcrete
@@ -538,6 +906,34 @@
   - type: Stack
     stackType: FloorTileGrayConcrete
 
+- type: entity
+  name: gray concrete mono tile
+  parent: FloorTileItemGrayConcrete
+  id: FloorTileItemGrayConcreteMono
+  components:
+  - type: Sprite
+    state: grayconcrete-mono
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorGrayConcreteMono
+  - type: Stack
+    stackType: FloorTileGrayConcreteMono
+
+- type: entity
+  name: gray concrete smooth
+  parent: FloorTileItemGrayConcrete
+  id: FloorTileItemGrayConcreteSmooth
+  components:
+  - type: Sprite
+    state: grayconcrete-smooth
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorGrayConcreteSmooth
+  - type: Stack
+    stackType: FloorTileGrayConcreteSmooth
+
 - type: entity
   parent: FloorTileItemBase
   id: FloorTileItemOldConcrete
@@ -554,6 +950,34 @@
   - type: Stack
     stackType: FloorTileOldConcrete
 
+- type: entity
+  name: old concrete mono tile
+  parent: FloorTileItemOldConcrete
+  id: FloorTileItemOldConcreteMono
+  components:
+  - type: Sprite
+    state: oldconcrete-mono
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorOldConcreteMono
+  - type: Stack
+    stackType: FloorTileOldConcreteMono
+
+- type: entity
+  name: old concrete smooth
+  parent: FloorTileItemOldConcrete
+  id: FloorTileItemOldConcreteSmooth
+  components:
+  - type: Sprite
+    state: oldconcrete-smooth
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorOldConcreteSmooth
+  - type: Stack
+    stackType: FloorTileOldConcreteSmooth
+
 # Carpets
 - type: entity
   name: blue arcade floor
diff --git a/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml b/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml
index e3213ac8c9e..3c553fc8124 100644
--- a/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml
@@ -2,7 +2,7 @@
   parent: Clothing
   id: PortableRecharger
   name: portable recharger
-  description: High-tech recharger adapted for portability
+  description: High-tech recharger adapted for portability.
   components:
   - type: Item
     size: Huge
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
index 58f7e015508..28d90f1a3b5 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: bible
-  description: New Interstellar Version 2340
+  description: New Interstellar Version 2340.
   parent: BaseStorageItem
   id: Bible
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/urn.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/urn.yml
index 55a58ef18a1..72d21977c6c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/urn.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/urn.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: urn
-  description: Store the Dead smart and Compact since 2300
+  description: Store the Dead smart and Compact since 2300.
   parent: BaseStorageItem
   id: Urn
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml
index 9972fad4146..6eb56f3245b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml
@@ -2,7 +2,7 @@
   name: books bag
   id: BooksBag
   parent: BaseStorageItem
-  description: A refined bag to carry your own library
+  description: A refined bag to carry your own library.
   components:
     - type: Sprite
       sprite: Objects/Specific/Library/Equipment/books_bag.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
index ab6cdfc4e3b..7c90a82d7d6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
@@ -2,7 +2,7 @@
   parent: BaseItem
   id: DiseaseSwab
   name: sterile swab
-  description: Used for taking and transfering samples. Sterile until open. Single use only.
+  description: Used for taking and transferring samples. Sterile until open. Single use only.
   components:
   - type: Item
     size: Tiny
@@ -18,6 +18,7 @@
     guides:
   # - Virology (when it's back)
     - Botany
+    - Chemicals
 
 - type: entity
   parent: BaseAmmoProvider # this is for cycling swabs out and not spawning 30 entities, trust
@@ -39,6 +40,7 @@
     guides:
   # - Virology (when it's back)
     - Botany
+    - Chemicals
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index d83a292ebee..989fd577059 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -445,6 +445,39 @@
     - id: PillHyronalin
       amount: 5
 
+- type: entity
+  name: pill
+  suffix: Potassium iodide 10u
+  parent: Pill
+  id: PillPotassiumIodide
+  components:
+  - type: Pill
+    pillType: 8
+  - type: Sprite
+    state: pill9
+  - type: Label
+    currentLabel: potassium iodide 10u
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: PotassiumIodide
+          Quantity: 10
+
+- type: entity
+  name: pill canister
+  parent: PillCanister
+  id: PillCanisterPotassiumIodide
+  suffix: Potassium iodide 10u, 5
+  components:
+  - type: Label
+    currentLabel: potassium iodide 10u
+  - type: StorageFill
+    contents:
+    - id: PillPotassiumIodide
+      amount: 5
+
 - type: entity
   name: pill
   suffix: Iron 10u
@@ -751,6 +784,10 @@
       prob: 0.10
       maxAmount: 7
       orGroup: RandomPill
+    - id: PillPotassiumIodide
+      prob: 0.10
+      maxAmount: 7
+      orGroup: RandomPill
     - id: PillIron
       prob: 0.10
       maxAmount: 7
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
index 6a396309cbe..088a81508fe 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
+    - Medical Doctor
 
 - type: entity
   id: HandheldHealthAnalyzer
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index a2f86bbe1e2..35e54075a87 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -191,7 +191,7 @@
   name: brute auto-injector
   parent: ChemicalMedipen
   id: BruteAutoInjector
-  description: A rapid dose of bicaridine and tranexamic acid, intended for combat applications
+  description: A rapid dose of bicaridine and tranexamic acid, intended for combat applications.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/medipen.rsi
@@ -223,7 +223,7 @@
   name: burn auto-injector
   parent: ChemicalMedipen
   id: BurnAutoInjector
-  description: A rapid dose of dermaline and leporazine, intended for combat applications
+  description: A rapid dose of dermaline and leporazine, intended for combat applications.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/medipen.rsi
@@ -429,6 +429,8 @@
     delay: 0.5
   - type: StaticPrice # A new shitcurity meta
     price: 75
+  - type: EmitSoundOnUse
+    handle: false # don't want the sound to stop the self-inject from triggering
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index 06566214651..578e0715871 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: BodyBag
-  parent: BaseFoldable
+  parent: BaseDeployFoldable
   name: body bag
   description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index a74993ff994..bcf9253759e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -17,7 +17,8 @@
     - BorgModuleGeneric
   - type: GuideHelp
     guides:
-      - Cyborgs
+    - Cyborgs
+    - Robotics
 
 - type: entity
   id: BaseProviderBorgModule
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
index 98f953f6824..9261e06ea2a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
@@ -223,3 +223,4 @@
   - type: GuideHelp
     guides:
     - Cyborgs
+    - Robotics
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
index bbecb819501..e0034dab4d7 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
@@ -47,7 +47,8 @@
   - type: Appearance
   - type: GuideHelp
     guides:
-      - Cyborgs
+    - Cyborgs
+    - Robotics
 
 - type: entity
   parent: MMI
@@ -117,3 +118,4 @@
     - type: GuideHelp
       guides:
       - Cyborgs
+      - Robotics
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
index ea71952c82d..278556d7c19 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BarberScissors
   name: barber scissors
-  description: is able to reshape the hairstyle of any crew cut to your liking.
+  description: Is able to reshape the hairstyle of any crew cut to your liking.
   parent: BaseItem
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
index 953c05f107e..415b59a6e54 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -460,7 +460,7 @@
   parent: BaseVendingMachineRestock
   id: VendingMachineRestockHappyHonk
   name: Happy Honk restock box
-  description: place this box full of fun into the restock slot on the Happy Honk Dispenser to begin.
+  description: Place this box full of fun into the restock slot on the Happy Honk Dispenser to begin.
   components:
   - type: VendingMachineRestock
     canRestock:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index 6d911ee29c8..a8495cef019 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -158,7 +158,7 @@
   parent: ExtendedEmergencyOxygenTank
   id: DoubleEmergencyOxygenTank
   name: double emergency oxygen tank
-  description: A high-grade dual-tank emergency life support container. It holds a decent amount of oxygen for it's small size. It can hold 2.5 L of gas.
+  description: A high-grade dual-tank emergency life support container. It holds a decent amount of oxygen for its small size. It can hold 2.5 L of gas.
   components:
   - type: Sprite
     sprite: Objects/Tanks/emergency_double.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index fba506d1f95..d420aa309d9 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -189,7 +189,7 @@
   name: multitool
   parent: BaseItem
   id: Multitool
-  description: An advanced tool to copy, store, and send electrical pulses and signals through wires and machines
+  description: An advanced tool to copy, store, and send electrical pulses and signals through wires and machines.
   components:
   - type: EmitSoundOnLand
     sound:
@@ -282,7 +282,7 @@
       price: 56
     - type: GuideHelp
       guides:
-        - NetworkConfigurator
+      - NetworkConfigurator
 
 #Power tools
 #Later on these should switch probably switch damage when changing the tool behavior.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
index c6c37d36424..8bae55e1f42 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
@@ -20,6 +20,8 @@
   - type: DeviceLinkSink
     ports:
       - Trigger
+  - type: EmitSoundOnUse
+    handle: false # don't want the sound to stop the explosion from triggering
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index 57b95cb9016..1d90fab7c2c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -9,8 +9,6 @@
     - Cartridge
     - ShellShotgun
   - type: CartridgeAmmo
-    count: 6
-    spread: 15
     soundEject:
       collection: ShellEject
   - type: Sprite
@@ -32,7 +30,6 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunBeanbag
-    count: 1
   - type: SpentAmmoVisuals
     state: "beanbag"
 
@@ -47,8 +44,6 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunSlug
-    count: 1
-    spread: 0
   - type: SpentAmmoVisuals
     state: "slug"
 
@@ -63,7 +58,6 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunFlare
-    count: 1
   - type: SpentAmmoVisuals
     state: "flare"
 
@@ -77,7 +71,7 @@
       - state: base
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
-    proto: PelletShotgun
+    proto: PelletShotgunSpread
 
 - type: entity
   id: ShellShotgunIncendiary
@@ -89,7 +83,7 @@
       - state: incendiary
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
-    proto: PelletShotgunIncendiary
+    proto: PelletShotgunIncendiarySpread
   - type: SpentAmmoVisuals
     state: "incendiary"
 
@@ -103,7 +97,7 @@
       - state: practice
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
-    proto: PelletShotgunPractice
+    proto: PelletShotgunPracticeSpread
   - type: SpentAmmoVisuals
     state: "practice"
 
@@ -118,7 +112,6 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunTranquilizer
-    count: 1
   - type: ChemicalAmmo
   - type: SolutionContainerManager
     solutions:
@@ -145,9 +138,7 @@
     graph: ImprovisedShotgunShellGraph
     node: shell
   - type: CartridgeAmmo
-    count: 10
-    spread: 45 
-    proto: PelletShotgunImprovised
+    proto: PelletShotgunImprovisedSpread
   - type: SpentAmmoVisuals
     state: "improvised"
 
@@ -161,8 +152,6 @@
         - state: depleted-uranium
           map: [ "enum.AmmoVisualLayers.Base" ]
     - type: CartridgeAmmo
-      count: 5
-      spread: 6
-      proto: PelletShotgunUranium
+      proto: PelletShotgunUraniumSpread
     - type: SpentAmmoVisuals
       state: "depleted-uranium"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index 6e4570e1a16..ce79b6f4174 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -42,6 +42,16 @@
       types:
         Piercing: 10
 
+- type: entity
+  id: PelletShotgunSpread
+  noSpawn: true
+  parent: PelletShotgun
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgun
+    count: 6
+    spread: 15
+
 - type: entity
   id: PelletShotgunIncendiary
   name: pellet (.50 incendiary)
@@ -59,6 +69,16 @@
   - type: IgnitionSource
     ignited: true
 
+- type: entity
+  id: PelletShotgunIncendiarySpread
+  noSpawn: true
+  parent: PelletShotgunIncendiary
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgunIncendiary
+    count: 6
+    spread: 15
+
 - type: entity
   id: PelletShotgunPractice
   name: pellet (.50 practice)
@@ -73,6 +93,16 @@
       types:
         Blunt: 1
 
+- type: entity
+  id: PelletShotgunPracticeSpread
+  noSpawn: true
+  parent: PelletShotgunPractice
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgunPractice
+    count: 6
+    spread: 15
+
 - type: entity
   id: PelletShotgunImprovised
   name: improvised pellet
@@ -88,6 +118,15 @@
         Piercing: 3
         Slash: 3
 
+- type: entity
+  id: PelletShotgunImprovisedSpread
+  noSpawn: true
+  parent: PelletShotgunImprovised
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgunImprovised
+    count: 10
+    spread: 45
 
 - type: entity
   id: PelletShotgunTranquilizer
@@ -178,6 +217,16 @@
         Radiation: 5
         Piercing: 5
 
+- type: entity
+  id: PelletShotgunUraniumSpread
+  noSpawn: true
+  parent: PelletShotgunUranium
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgunUranium
+    count: 5
+    spread: 6
+
 - type: entity
   id: PelletGrapeshot #tally fucking ho
   name: grapeshot pellet
@@ -196,6 +245,16 @@
         Piercing: 25
         Structural: 5
 
+- type: entity
+  id: PelletGrapeshotSpread
+  noSpawn: true
+  parent: PelletGrapeshot
+  components:
+  - type: ProjectileSpread
+    proto: PelletGrapeshot
+    count: 5
+    spread: 40
+
 - type: entity
   id: PelletGlass
   name: glass shard
@@ -215,3 +274,13 @@
     damage:
       types:
         Slash: 25
+
+- type: entity
+  id: PelletGlassSpread
+  parent: PelletGlass
+  noSpawn: true
+  components:
+  - type: ProjectileSpread
+    proto: PelletGlass
+    count: 5
+    spread: 10
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
index 152de7e92f2..04d405e8815 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
@@ -175,9 +175,7 @@
   parent: BaseCannonBall
   components:
   - type: CartridgeAmmo
-    proto: PelletGrapeshot
-    count: 5
-    spread: 40
+    proto: PelletGrapeshotSpread
     deleteOnSpawn: true
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
@@ -190,9 +188,7 @@
   parent: BaseCannonBall
   components:
   - type: CartridgeAmmo
-    proto: PelletGlass
-    count: 5
-    spread: 10
+    proto: PelletGlassSpread
     deleteOnSpawn: true
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
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 30aeef1af0e..1c3cc2711d5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -449,6 +449,7 @@
     - type: GuideHelp
       guides:
       - Security
+      - Antagonists
 
 - type: entity
   name: disabler SMG
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 819fe43b639..3a3c7ee1817 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -2,7 +2,7 @@
   name: BaseWeaponHeavyMachineGun
   parent: BaseItem
   id: BaseWeaponHeavyMachineGun
-  description: Spray and pray
+  description: Spray and pray.
   abstract: true
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index 0ecad70a64e..1b9d821e2b5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -24,7 +24,7 @@
   name: china lake
   parent: [BaseWeaponLauncher, BaseGunWieldable]
   id: WeaponLauncherChinaLake
-  description: PLOOP
+  description: PLOOP.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
@@ -360,7 +360,7 @@
   parent: WeaponLauncherMultipleRocket
   id: WeaponLauncherAdmemeMeteorLarge
   suffix: Admeme
-  description: It fires large meteors
+  description: It fires large meteors.
   components:
   - type: BallisticAmmoProvider
     whitelist:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
index 2f1edfe6972..d11f96d8752 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -179,7 +179,7 @@
   id: ProjectilePolyboltCluwne
   parent: ProjectilePolyboltBase
   name: cluwne polybolt
-  description: knoH KnoH!
+  description: KnoH KnoH!
   categories: [ HideSpawnMenu ]
   components:
   - type: PolymorphOnCollide
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
index 3468cade76b..b4e8e77c519 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
@@ -39,8 +39,11 @@
     damageContainer: Inorganic
   - type: Explosive
     explosionType: Default
-    intensitySlope: 4
+    intensitySlope: 2
     maxIntensity: 100
+    maxTileBreak: 1
+    tileBreakScale: 2
+
 
 - type: entity
   parent: BaseMeteor
@@ -99,7 +102,7 @@
         - Impassable
         - BulletImpassable
   - type: Explosive
-    totalIntensity: 100
+    totalIntensity: 50
   - type: Destructible
     thresholds:
     - trigger:
@@ -112,6 +115,11 @@
         sound:
           collection: MetalBreak
       - !type:ExplodeBehavior
+      - !type:WeightedSpawnEntityBehavior
+        weightedEntityTable: "MeteorSpawnAsteroidWallTable"
+        minSpawn: 2
+        maxSpawn: 4
+        spawnAfter: 0.5
 
 - type: entity
   parent: BaseMeteor
@@ -134,7 +142,7 @@
         - Impassable
         - BulletImpassable
   - type: Explosive
-    totalIntensity: 200
+    totalIntensity: 100
   - type: Destructible
     thresholds:
     - trigger:
@@ -147,6 +155,12 @@
         sound:
           collection: MetalBreak
       - !type:ExplodeBehavior
+      - !type:WeightedSpawnEntityBehavior
+        weightedEntityTable: "MeteorSpawnAsteroidWallTable"
+        spawnOffset: 2
+        minSpawn: 3
+        maxSpawn: 6
+        spawnAfter: 0.5
 
 - type: entity
   parent: BaseMeteor
@@ -156,7 +170,7 @@
   - type: Sprite
     state: big
   - type: Explosive
-    totalIntensity: 300
+    totalIntensity: 150
   - type: Destructible
     thresholds:
     - trigger:
@@ -169,6 +183,12 @@
         sound:
           collection: MetalBreak
       - !type:ExplodeBehavior
+      - !type:WeightedSpawnEntityBehavior
+        weightedEntityTable: "MeteorSpawnAsteroidWallTable"
+        spawnOffset: 3
+        minSpawn: 5
+        maxSpawn: 8
+        spawnAfter: 0.5
 
 - type: entity
   parent: BaseMeteor
@@ -203,4 +223,4 @@
             volume: 10
       - !type:SpillBehavior
         solution: blood
-      - !type:ExplodeBehavior
+      - !type:ExplodeBehavior
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
index 3f75faf75e1..82177478fa7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
@@ -197,7 +197,7 @@
 
 - type: entity
   name: xeno turret
-  description: Shoots 9mm acid projectiles
+  description: Shoots 9mm acid projectiles.
   parent: BaseWeaponTurret
   id: WeaponTurretXeno
   suffix: Xeno
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index f862a0f10aa..39a04120e0d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -44,6 +44,7 @@
   - type: GuideHelp
     guides:
     - Chef
+    - FoodRecipes
 
 - type: entity
   name: butcher's cleaver
@@ -70,6 +71,7 @@
   - type: GuideHelp
     guides:
     - Chef
+    - FoodRecipes
 
 - type: entity
   name: combat knife
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
index cb9defccd96..e1c98f418b2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -2,7 +2,7 @@
   name: pickaxe
   parent: BaseItem
   id: Pickaxe
-  description: Notched to perfection, for jamming it into rocks
+  description: Notched to perfection, for jamming it into rocks.
   components:
   - type: Tag
     tags:
@@ -40,7 +40,7 @@
   name: mining drill
   parent: BaseItem
   id: MiningDrill
-  description: Powerful tool used to quickly drill through rocks
+  description: Powerful tool used to quickly drill through rocks.
   components:
   - type: Item
     storedRotation: -90
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
index 608fb2544ae..d6985c018d7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -112,6 +112,11 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 1
     fillBaseName: spear
+    inHandsFillBaseName: -fill-
+    inHandsMaxFillLevels: 1
+    equippedFillBaseName: -fill-
+    equippedMaxFillLevels: 1
+
 
 - type: entity
   name: reinforced spear
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 121d89e80b1..fb14d9e28e6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -59,7 +59,7 @@
 
 - type: entity
   name: flashbang
-  description: Eeeeeeeeeeeeeeeeeeeeee
+  description: Eeeeeeeeeeeeeeeeeeeeee.
   parent: GrenadeBase
   id: GrenadeFlashBang
   components:
@@ -82,6 +82,7 @@
   - type: GuideHelp
     guides:
     - Security
+    - Antagonists
 
 - type: entity
   id: GrenadeFlashEffect
@@ -398,7 +399,7 @@
   parent: SmokeGrenade
   id: CleanerGrenade
   name: cleanade
-  description: Special grenade for janitors, releasing large cloud of space cleaner foam
+  description: Special grenade for janitors, releasing large cloud of space cleaner foam.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/janitor.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
index 769fa18a50d..dc4cc2b6d22 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -87,6 +87,7 @@
   - type: GuideHelp
     guides:
     - Security
+    - Antagonists
 
 - type: entity
   name: truncheon
@@ -123,6 +124,7 @@
   - type: GuideHelp
     guides:
     - Security
+    - Antagonists
 
 - type: entity
   name: flash
@@ -169,6 +171,7 @@
     - type: GuideHelp
       guides:
       - Security
+      - Antagonists
 
 - type: entity
   name: flash
@@ -224,3 +227,4 @@
     - type: GuideHelp
       guides:
       - Security
+      - Antagonists
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
index 7bc12ca966e..b0f238c3034 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
@@ -22,6 +22,7 @@
   - type: GuideHelp
     guides:
     - Bartender
+    - Drinks
   - type: StealTarget
     stealGroup: BoozeDispenser
 
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
index e3042c798cc..f44745cdd20 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
@@ -22,6 +22,7 @@
   - type: GuideHelp
     guides:
     - Bartender
+    - Drinks
 
 - type: entity
   parent: SodaDispenser
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index 5d27cec1815..34639e43355 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -63,6 +63,8 @@
       path: /Audio/Machines/airlock_deny.ogg
   - type: Airtight
     noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+      - South
   - type: Tag
     tags:
       - ForceNoFixRotations
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index ac5ec1e83e3..c1d767905c0 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -323,7 +323,7 @@
     node: chair
 
 - type: entity
-  parent: [SeatBase, BaseFoldable]
+  parent: [SeatBase, BaseDeployFoldable]
   id: ChairFolding
   name: folding chair
   description: If you carry six of these you become the coolest kid at church.
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
index b3cfe6ade3f..f7b1be8ecde 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: RollerBed
-  parent: [BaseItem, BaseFoldable]
+  parent: [BaseItem, BaseDeployFoldable]
   name: rollerbed
   description: Used to carry patients around without damaging them.
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 011562262df..a8cdfb0a650 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -801,6 +801,7 @@
   - type: GuideHelp
     guides:
     - CargoBounties
+    - Cargo
 
 - type: entity
   parent: BaseComputer
@@ -972,7 +973,7 @@
   id: ComputerPalletConsole
   parent: BaseComputer
   name: cargo sale computer
-  description: Used to sell goods loaded onto cargo pallets
+  description: Used to sell goods loaded onto cargo pallets.
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
index f276ce3765e..b01f70e61cd 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
@@ -50,7 +50,7 @@
     - type: GuideHelp
       openOnActivation: true
       guides:
-        - Defusal
+      - Defusal
 
 - type: entity
   parent: BaseHardBomb
@@ -147,7 +147,7 @@
   id: DebugHardBomb
   name: debug bomb
   suffix: DEBUG
-  description: Holy shit this is gonna explode
+  description: Holy shit this is gonna explode.
   components:
     - type: Defusable
       disposable: true
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 4843899726b..7ee5b75f10b 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -451,6 +451,7 @@
     - BoozeDispenserMachineCircuitboard
     - SodaDispenserMachineCircuitboard
     - SpaceHeaterMachineCircuitBoard
+    - CutterMachineCircuitboard
     dynamicRecipes:
       - ThermomachineFreezerMachineCircuitBoard
       - HellfireFreezerMachineCircuitBoard
@@ -550,7 +551,7 @@
   id: ExosuitFabricator
   parent: BaseLatheLube
   name: exosuit fabricator
-  description: Creates parts for robotics and other mechanical needs
+  description: Creates parts for robotics and other mechanical needs.
   components:
   - type: Sprite
     sprite: Structures/Machines/exosuit_fabricator.rsi
@@ -1273,3 +1274,82 @@
     staticRecipes:
     - MaterialSheetMeat
     - SheetPaper
+
+- type: entity
+  parent: BaseLathe
+  id: CutterMachine
+  name: cutter machine
+  description: This is a cutter. It cuts. Add variety to your station floor with eye-pleasing patterns! Don't stick your fingers in.
+  components:
+  - type: Transform
+    noRot: false
+  - type: Sprite
+    sprite: Structures/Machines/cuttermachine.rsi
+    snapCardinals: true
+    layers:
+    - state: icon
+      map: ["enum.LatheVisualLayers.IsRunning"]
+    - state: unlit
+      shader: unshaded
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Machine
+    board: CutterMachineCircuitboard
+  - type: Lathe
+    producingSound: /Audio/Machines/cutter.ogg
+    idleState: icon
+    runningState: building
+    staticRecipes:
+      - FloorTileItemDark
+      - FloorTileItemDarkDiagonalMini
+      - FloorTileItemDarkDiagonal
+      - FloorTileItemDarkHerringbone
+      - FloorTileItemDarkMini
+      - FloorTileItemDarkMono
+      - FloorTileItemDarkPavement
+      - FloorTileItemDarkPavementVertical
+      - FloorTileItemDarkOffset
+      - FloorTileItemSteelCheckerDark
+      - FloorTileItemSteel
+      - FloorTileItemSteelOffset
+      - FloorTileItemSteelDiagonalMini
+      - FloorTileItemSteelDiagonal
+      - FloorTileItemSteelHerringbone
+      - FloorTileItemSteelMini
+      - FloorTileItemSteelMono
+      - FloorTileItemSteelPavement
+      - FloorTileItemSteelPavementVertical
+      - FloorTileItemWhite
+      - FloorTileItemWhiteOffset
+      - FloorTileItemWhiteDiagonalMini
+      - FloorTileItemWhiteDiagonal
+      - FloorTileItemWhiteHerringbone
+      - FloorTileItemWhiteMini
+      - FloorTileItemWhiteMono
+      - FloorTileItemWhitePavement
+      - FloorTileItemWhitePavementVertical
+      - FloorTileItemSteelCheckerLight
+      - FloorTileItemGratingMaint
+      - FloorTileItemTechmaint
+      - FloorTileItemSteelMaint
+      - FloorTileItemWood
+      - FloorTileItemWoodLarge
+      - FloorTileItemWoodPattern
+      - FloorTileItemConcrete
+      - FloorTileItemConcreteMono
+      - FloorTileItemConcreteSmooth
+      - FloorTileItemGrayConcrete
+      - FloorTileItemGrayConcreteMono
+      - FloorTileItemGrayConcreteSmooth
+      - FloorTileItemOldConcrete
+      - FloorTileItemOldConcreteMono
+      - FloorTileItemOldConcreteSmooth
+  - type: MaterialStorage
+    whitelist:
+      tags:
+        - Sheet
+        - Metal
+        - Wooden
+        - RawMaterial
+        - Plastic
diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index 314a5c1ce54..18174455121 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -105,6 +105,7 @@
   - type: GuideHelp
     guides:
     - Chef
+    - FoodRecipes
 
 - type: entity
   id: SyndicateMicrowave
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 640151e39e9..9026fcb542f 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -198,6 +198,7 @@
   - type: GuideHelp
     guides:
     - Bartender
+    - Drinks
 
 - type: entity
   parent: VendingMachine
@@ -896,6 +897,7 @@
   - type: GuideHelp
     guides:
     - Security
+    - Antagonists
 
 - type: entity
   parent: VendingMachine
@@ -2131,6 +2133,7 @@
   - type: GuideHelp
     guides:
     - Chemicals
+    - Chemist
 
 - type: entity
   parent: VendingMachineChemicals
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
index 3c1334169d8..a0192b8685e 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -75,7 +75,7 @@
   id: DisposalPipeBroken
   parent: DisposalPipeBase
   name: broken disposal pipe
-  description: A BBP (big broken pipe)
+  description: A BBP (big broken pipe).
   components:
   - type: Sprite
     drawdepth: ThickPipe
diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml
index d4d43b8a2ea..675bc4dd5b3 100644
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -258,7 +258,7 @@
   id: BaseSubstationWallFrame
   categories: [ HideSpawnMenu ]
   name: wallmount substation frame
-  description: A substation frame for construction
+  description: A substation frame for construction.
   placement:
     mode: SnapgridCenter
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
index a4ab12df741..992f7a71e6f 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
@@ -13,7 +13,7 @@
   parent: BaseFlag
   id: BlankFlag
   name: blank flag
-  description: "Some piece of white cloth. Definitely not the flag of France."
+  description: Some piece of white cloth. Definitely not the flag of France.
   components:
   - type: Sprite
     state: blank_flag
@@ -22,7 +22,7 @@
   parent: BaseFlag
   id: NTFlag
   name: Nanotrasen flag
-  description: "Glory to NT! Wait, they really made a flag for a corporation?"
+  description: Glory to NT! Wait, they really made a flag for a corporation?
   components:
   - type: Sprite
     state: NT_flag
@@ -31,7 +31,7 @@
   parent: BaseFlag
   id: SyndieFlag
   name: syndicate flag
-  description: "Smells bloody. Death to NT!"
+  description: Smells bloody. Death to NT!
   components:
   - type: Sprite
     state: syndie_flag
@@ -40,7 +40,7 @@
   parent: BaseFlag
   id: LGBTQFlag
   name: LGBTQ flag
-  description: "Be gay do crime flag"
+  description: "\"Be gay do crime\" flag."
   components:
   - type: Sprite
     state: lgbtq_flag
@@ -49,7 +49,7 @@
   parent: BaseFlag
   id: PirateFlag
   name: pirate flag
-  description: "Raise the jolly roger, scallywags!"
+  description: Raise the jolly roger, scallywags!
   components:
   - type: Sprite
     state: pirate_flag
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
index ae8ed5f74fc..c5b9b24a743 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
@@ -441,7 +441,7 @@
   parent: PosterBase
   id: PosterContrabandUnreadableAnnouncement
   name: "Unreadable Announcement"
-  description: "A poster announcing something by someone, oddly enough they seem to have forgotten making it readable"
+  description: "A poster announcing something by someone, oddly enough they seem to have forgotten making it readable."
   components:
   - type: Sprite
     state: poster45_contraband
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
index 1308eff1be4..4ebeaa66ba7 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -1161,7 +1161,7 @@
   parent: BaseSign
   id: SignSmoking
   name: no smoking sign
-  description: A warning sign which reads 'NO SMOKING'
+  description: A warning sign which reads 'NO SMOKING'.
   components:
   - type: Sprite
     state: nosmoking2
@@ -1170,7 +1170,7 @@
   parent: BaseSign
   id: SignSomethingOld
   name: old sign
-  description: Technical information of some sort, shame its too worn-out to read.
+  description: Technical information of some sort, shame it's too worn-out to read.
   components:
   - type: Sprite
     state: something-old1
@@ -1179,7 +1179,7 @@
   parent: BaseSign
   id: SignSomethingOld2
   name: old sign
-  description: Looks like a planet crashing by some station above it. Its kinda scary.
+  description: Looks like a planet crashing by some station above it. It's kinda scary.
   components:
   - type: Sprite
     state: something-old2
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
index af68f5898d2..793e7211a59 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
@@ -4,7 +4,7 @@
   id: ShelfBase
   parent: BaseStructure
   name: shelf
-  description: a strange place to place, well, anything really. You feel like you shouldn't be seeing this.'
+  description: A strange place to place, well, anything really. You feel like you shouldn't be seeing this.'
   components:
   - type: Sprite
     drawdepth: WallMountedItems
@@ -189,7 +189,7 @@
   id: ShelfRWood
   parent: ShelfBaseReinforced
   name: sturdy wood shelf
-  description: A safe place to put your favorite bottle of whiskey
+  description: A safe place to put your favorite bottle of whiskey.
   components:
   - type: Sprite
     sprite: Structures/Storage/Shelfs/wood.rsi
@@ -226,7 +226,7 @@
   id: ShelfRMetal
   parent: ShelfBaseReinforced
   name: sturdy metal shelf
-  description: A strong & shiny place to keep all your vials safe
+  description: A strong & shiny place to keep all your vials safe.
   components:
   - type: Sprite
     sprite: Structures/Storage/Shelfs/metal.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
index 7be721b6f9a..84dbb92d1f1 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
@@ -92,7 +92,7 @@
   id: ClockworkGrille
   parent: Grille
   name: clockwork grille
-  description: a flimsy framework of iron rods assembled in traditional Ratvarian fashion.
+  description: A flimsy framework of iron rods assembled in traditional Ratvarian fashion.
   components:
     - type: Sprite
       drawdepth: Walls
diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
index 67a9c2fb505..60aa5a97990 100644
--- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -93,6 +93,7 @@
   - type: GuideHelp
     guides:
     - Botany
+    - Chemicals
 
 - type: entity
   parent: hydroponicsTray
diff --git a/Resources/Prototypes/Entities/Structures/meat_spike.yml b/Resources/Prototypes/Entities/Structures/meat_spike.yml
index 086066f5c26..6e2b5f0250b 100644
--- a/Resources/Prototypes/Entities/Structures/meat_spike.yml
+++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml
@@ -57,3 +57,4 @@
   - type: GuideHelp
     guides:
     - Chef
+    - FoodRecipes
diff --git a/Resources/Prototypes/Entities/Tiles/basalt.yml b/Resources/Prototypes/Entities/Tiles/basalt.yml
index 900f25d1008..73a7dc0dea3 100644
--- a/Resources/Prototypes/Entities/Tiles/basalt.yml
+++ b/Resources/Prototypes/Entities/Tiles/basalt.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BasaltOne
   name: basalt
-  description: Rock
+  description: Rock.
   placement:
     mode: SnapgridCenter
   components:
diff --git a/Resources/Prototypes/Entities/foldable.yml b/Resources/Prototypes/Entities/foldable.yml
index a0843cd1250..260cda799b4 100644
--- a/Resources/Prototypes/Entities/foldable.yml
+++ b/Resources/Prototypes/Entities/foldable.yml
@@ -13,3 +13,11 @@
         unfoldedLayer:
           True: {visible: false}
           False: {visible: true}
+
+- type: entity
+  abstract: true
+  parent: BaseFoldable
+  id: BaseDeployFoldable
+  name: "deploy foldable"
+  components:
+  - type: DeployFoldable
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 4d39823d133..51c65784c98 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -500,6 +500,7 @@
     startAudio:
       path: /Audio/Announcements/announce.ogg # Sunrise-edit
     duration: null # the rule has to last the whole round not 1 second
+    occursDuringRoundEnd: false
   - type: AlertLevelInterceptionRule
   - type: AntagSelection
     definitions:
diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml
index 666802e3d6d..984f23723b7 100644
--- a/Resources/Prototypes/GameRules/meteorswarms.yml
+++ b/Resources/Prototypes/GameRules/meteorswarms.yml
@@ -17,6 +17,20 @@
     GameRuleMeteorSwarmLarge: 5
     GameRuleUristSwarm: 0.05
 
+- type: weightedRandomEntity
+  id: MeteorSpawnAsteroidWallTable
+  weights:
+    AsteroidRock: 10
+    AsteroidRockCoal: 5
+    AsteroidRockQuartz: 5
+    AsteroidRockTin: 5
+    AsteroidRockSilver: 2
+    AsteroidRockGold: 2
+    AsteroidRockPlasma: 2
+    AsteroidRockDiamond: 2
+    AsteroidRockUranium: 0.5
+    AsteroidRockBananium: 0.5      
+
 - type: entity
   parent: BaseGameRule
   id: GameRuleMeteorSwarm
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
index 8b84afb2324..fb823fdcb9f 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
@@ -1,82 +1,44 @@
 # Head
 - type: loadout
-  id: CargoTechnicianHead
-  equipment: CargoTechnicianHead
-
-- type: startingGear
   id: CargoTechnicianHead
   equipment:
     head: ClothingHeadHatCargosoft
 
 # Jumpsuit
 - type: loadout
-  id: CargoTechnicianJumpsuit
-  equipment: CargoTechnicianJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: CargoTechnicianJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCargo
 
 - type: loadout
-  id: CargoTechnicianJumpskirt
-  equipment: CargoTechnicianJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: CargoTechnicianJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCargo
 
 # Back
 - type: loadout
-  id: CargoTechnicianBackpack
-  equipment: CargoTechnicianBackpack
-
-- type: startingGear
   id: CargoTechnicianBackpack
   equipment:
     back: ClothingBackpackCargo
 
 - type: loadout
-  id: CargoTechnicianSatchel
-  equipment: CargoTechnicianSatchel
-
-- type: startingGear
   id: CargoTechnicianSatchel
   equipment:
     back: ClothingBackpackSatchelCargo
 
 - type: loadout
-  id: CargoTechnicianDuffel
-  equipment: CargoTechnicianDuffel
-
-- type: startingGear
   id: CargoTechnicianDuffel
   equipment:
     back: ClothingBackpackDuffelCargo
 
 # OuterClothing
 - type: loadout
-  id: CargoTechnicianWintercoat
-  equipment: CargoTechnicianWintercoat
-
-- type: startingGear
   id: CargoTechnicianWintercoat
   equipment:
     outerClothing: ClothingOuterWinterCargo
 
 # Shoes
 - type: loadout
-  id: CargoWinterBoots
-  equipment: CargoWinterBoots
-
-- type: startingGear
   id: CargoWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterCargo
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
index 88db15ad90d..ecdf1e5ffee 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
@@ -1,108 +1,53 @@
 # Jumpsuit
 - type: loadout
-  id: QuartermasterJumpsuit
-  equipment: QuartermasterJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: QuartermasterJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitQM
 
 - type: loadout
-  id: QuartermasterJumpskirt
-  equipment: QuartermasterJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: QuartermasterJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtQM
 
 - type: loadout
-  id: QuartermasterTurtleneck
-  equipment: QuartermasterTurtleneck
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: QuartermasterTurtleneck
   equipment:
     jumpsuit: ClothingUniformJumpsuitQMTurtleneck
 
 - type: loadout
-  id: QuartermasterTurtleneckSkirt
-  equipment: QuartermasterTurtleneckSkirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: QuartermasterTurtleneckSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtQMTurtleneck
 
 - type: loadout
-  id: QuartermasterFormalSuit
-  equipment: QuartermasterFormalSuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: QuartermasterFormalSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitQMFormal
 
 # Head
 - type: loadout
-  id: QuartermasterHead
-  equipment: QuartermasterHead
-
-- type: startingGear
   id: QuartermasterHead
   equipment:
     head: ClothingHeadHatQMsoft
 
 - type: loadout
-  id: QuartermasterBeret
-  equipment: QuartermasterBeret
-
-- type: startingGear
   id: QuartermasterBeret
   equipment:
     head: ClothingHeadHatBeretQM
 
 # Neck
 - type: loadout
-  id: QuartermasterCloak
-  equipment: QuartermasterCloak
-
-- type: startingGear
   id: QuartermasterCloak
   equipment:
     neck: ClothingNeckCloakQm
 
 - type: loadout
-  id: QuartermasterMantle
-  equipment: QuartermasterMantle
-
-- type: startingGear
   id: QuartermasterMantle
   equipment:
     neck: ClothingNeckMantleQM
 
 # OuterClothing
 - type: loadout
-  id: QuartermasterWintercoat
-  equipment: QuartermasterWintercoat
-
-- type: startingGear
   id: QuartermasterWintercoat
   equipment:
     outerClothing: ClothingOuterWinterQM
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
index abf787d5100..5ca110b5fc6 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
@@ -1,47 +1,27 @@
 # Back
 - type: loadout
-  id: SalvageSpecialistBackpack
-  equipment: SalvageSpecialistBackpack
-
-- type: startingGear
   id: SalvageSpecialistBackpack
   equipment:
     back: ClothingBackpackSalvage
 
 - type: loadout
-  id: SalvageSpecialistSatchel
-  equipment: SalvageSpecialistSatchel
-
-- type: startingGear
   id: SalvageSpecialistSatchel
   equipment:
     back: ClothingBackpackSatchelSalvage
 
 - type: loadout
-  id: SalvageSpecialistDuffel
-  equipment: SalvageSpecialistDuffel
-
-- type: startingGear
   id: SalvageSpecialistDuffel
   equipment:
     back: ClothingBackpackDuffelSalvage
 
 # OuterClothing
 - type: loadout
-  id: SalvageSpecialistWintercoat
-  equipment: SalvageSpecialistWintercoat
-
-- type: startingGear
   id: SalvageSpecialistWintercoat
   equipment:
     outerClothing: ClothingOuterWinterMiner
 
 # Shoes
 - type: loadout
-  id: SalvageBoots
-  equipment: SalvageBoots
-
-- type: startingGear
   id: SalvageBoots
   equipment:
-    shoes: ClothingShoesBootsSalvage
\ No newline at end of file
+    shoes: ClothingShoesBootsSalvage
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
index 4b02332d467..c8c80c7895d 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
@@ -1,83 +1,42 @@
 # Head
 - type: loadout
-  id: BartenderHead
-  equipment: BartenderHead
-
-- type: startingGear
   id: BartenderHead
   equipment:
     head: ClothingHeadHatTophat
 
 - type: loadout
-  id: BartenderBowler
-  equipment: BartenderBowler
-
-- type: startingGear
   id: BartenderBowler
   equipment:
     head: ClothingHeadHatBowlerHat
 
 # Jumpsuit
 - type: loadout
-  id: BartenderJumpsuit
-  equipment: BartenderJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: BartenderJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitBartender
 
 - type: loadout
-  id: BartenderJumpskirt
-  equipment: BartenderJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: BartenderJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtBartender
 
 - type: loadout
-  id: BartenderJumpsuitPurple
-  equipment: BartenderJumpsuitPurple
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: BartenderJumpsuitPurple
   equipment:
     jumpsuit: ClothingUniformJumpsuitBartenderPurple
 
 # Outer clothing
 - type: loadout
-  id: BartenderApron
-  equipment: BartenderApron
-
-- type: startingGear
   id: BartenderApron
   equipment:
     outerClothing: ClothingOuterApronBar
 
 - type: loadout
-  id: BartenderVest
-  equipment: BartenderVest
-
-- type: startingGear
   id: BartenderVest
   equipment:
     outerClothing: ClothingOuterVest
 
 - type: loadout
-  id: BartenderWintercoat
-  equipment: BartenderWintercoat
-
-- type: startingGear
   id: BartenderWintercoat
   equipment:
     outerClothing: ClothingOuterWinterBar
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
index 3a6f11770c1..95838d72415 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
@@ -1,102 +1,53 @@
 # Head
 - type: loadout
-  id: BotanistHead
-  equipment: BotanistHead
-
-- type: startingGear
   id: BotanistHead
   equipment:
     head: ClothingHeadHatTrucker
 
 - type: loadout
-  id: BotanistBandana
-  equipment: BotanistBandana
-
-- type: startingGear
   id: BotanistBandana
   equipment:
     head: ClothingHeadBandBotany
 
 # Jumpsuit
 - type: loadout
-  id: BotanistJumpsuit
-  equipment: BotanistJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: BotanistJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitHydroponics
 
 - type: loadout
-  id: BotanistJumpskirt
-  equipment: BotanistJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: BotanistJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtHydroponics
 
 - type: loadout
-  id: BotanistOveralls
-  equipment: BotanistOveralls
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: BotanistOveralls
   equipment:
     jumpsuit: ClothingUniformOveralls
 
 # Back
 - type: loadout
-  id: BotanistBackpack
-  equipment: BotanistBackpack
-
-- type: startingGear
   id: BotanistBackpack
   equipment:
     back: ClothingBackpackHydroponics
 
 - type: loadout
-  id: BotanistSatchel
-  equipment: BotanistSatchel
-
-- type: startingGear
   id: BotanistSatchel
   equipment:
     back: ClothingBackpackSatchelHydroponics
 
 - type: loadout
-  id: BotanistDuffel
-  equipment: BotanistDuffel
-
-- type: startingGear
   id: BotanistDuffel
   equipment:
     back: ClothingBackpackDuffelHydroponics
 
 # Outer clothing
 - type: loadout
-  id: BotanistApron
-  equipment: BotanistApron
-
-- type: startingGear
   id: BotanistApron
   equipment:
     outerClothing: ClothingOuterApronBotanist
 
 - type: loadout
-  id: BotanistWintercoat
-  equipment: BotanistWintercoat
-
-- type: startingGear
   id: BotanistWintercoat
   equipment:
     outerClothing: ClothingOuterWinterHydro
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
index 42ddacdaec1..27e41e6461c 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
@@ -1,145 +1,79 @@
 # Head
 - type: loadout
-  id: ChaplainHead
-  equipment: ChaplainHead
-
-- type: startingGear
   id: ChaplainHead
   equipment:
     head: ClothingHeadHatFez
 
 - type: loadout
-  id: ChaplainNunHood
-  equipment: ChaplainNunHood
-
-- type: startingGear
   id: ChaplainNunHood
   equipment:
     head: ClothingHeadHatHoodNunHood
 
 - type: loadout
-  id: ChaplainPlagueHat
-  equipment: ChaplainPlagueHat
-
-- type: startingGear
   id: ChaplainPlagueHat
   equipment:
     head: ClothingHeadHatPlaguedoctor
 
 - type: loadout
-  id: ChaplainWitchHat
-  equipment: ChaplainWitchHat
-
-- type: startingGear
   id: ChaplainWitchHat
   equipment:
     head: ClothingHeadHatWitch
 
 - type: loadout
-  id: ChaplainWitchHatAlt
-  equipment: ChaplainWitchHatAlt
-
-- type: startingGear
   id: ChaplainWitchHatAlt
   equipment:
     head: ClothingHeadHatWitch1
 
 # Mask
 - type: loadout
-  id: ChaplainMask
-  equipment: ChaplainMask
-
-- type: startingGear
   id: ChaplainMask
   equipment:
     mask: ClothingMaskPlague
 
 # Jumpsuit
 - type: loadout
-  id: ChaplainJumpsuit
-  equipment: ChaplainJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: ChaplainJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitChaplain
 
 - type: loadout
-  id: ChaplainJumpskirt
-  equipment: ChaplainJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: ChaplainJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtChaplain
 
 - type: loadout
-  id: ChaplainRobesDark
-  equipment: ChaplainRobesDark
-
-- type: startingGear
   id: ChaplainRobesDark
   equipment:
     jumpsuit: ClothingUniformJumpsuitMonasticRobeDark
 
 - type: loadout
-  id: ChaplainRobesLight
-  equipment: ChaplainRobesLight
-
-- type: startingGear
   id: ChaplainRobesLight
   equipment:
     jumpsuit: ClothingUniformJumpsuitMonasticRobeLight
 
 # Neck
 - type: loadout
-  id: ChaplainNeck
-  equipment: ChaplainNeck
-
-- type: startingGear
   id: ChaplainNeck
   equipment:
     neck: ClothingNeckStoleChaplain
 
 # Outer clothing
 - type: loadout
-  id: ChaplainPlagueSuit
-  equipment: ChaplainPlagueSuit
-
-- type: startingGear
   id: ChaplainPlagueSuit
   equipment:
     outerClothing: ClothingOuterPlagueSuit
 
 - type: loadout
-  id: ChaplainNunRobe
-  equipment: ChaplainNunRobe
-
-- type: startingGear
   id: ChaplainNunRobe
   equipment:
     outerClothing: ClothingOuterNunRobe
 
 - type: loadout
-  id: ChaplainBlackHoodie
-  equipment: ChaplainBlackHoodie
-
-- type: startingGear
   id: ChaplainBlackHoodie
   equipment:
     outerClothing: ClothingOuterHoodieBlack
 
 - type: loadout
-  id: ChaplainHoodie
-  equipment: ChaplainHoodie
-
-- type: startingGear
   id: ChaplainHoodie
   equipment:
     outerClothing: ClothingOuterHoodieChaplain
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml
index ace0cd6cf83..5cfa76d4a73 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml
@@ -1,72 +1,38 @@
 # Head
 - type: loadout
-  id: ChefHead
-  equipment: ChefHead
-
-- type: startingGear
   id: ChefHead
   equipment:
     head: ClothingHeadHatChef
 
 # Mask
 - type: loadout
-  id: ChefMask
-  equipment: ChefMask
-
-- type: startingGear
   id: ChefMask
   equipment:
     mask: ClothingMaskItalianMoustache
 
 # Jumpsuit
 - type: loadout
-  id: ChefJumpsuit
-  equipment: ChefJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: ChefJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitChef
 
 - type: loadout
-  id: ChefJumpskirt
-  equipment: ChefJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: ChefJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtChef
 
 # Outer clothing
 - type: loadout
-  id: ChefApron
-  equipment: ChefApron
-
-- type: startingGear
   id: ChefApron
   equipment:
     outerClothing: ClothingOuterApronChef
 
 - type: loadout
-  id: ChefJacket
-  equipment: ChefJacket
-
-- type: startingGear
   id: ChefJacket
   equipment:
     outerClothing: ClothingOuterJacketChef
 
 - type: loadout
-  id: ChefWintercoat
-  equipment: ChefWintercoat
-
-- type: startingGear
   id: ChefWintercoat
   equipment:
     outerClothing: ClothingOuterWinterChef
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
index d3a3ce2e6c0..161d49c1ed7 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
@@ -1,94 +1,54 @@
 # Head
 - type: loadout
-  id: JesterHat
-  equipment: JesterHat
-
-- type: startingGear
   id: JesterHat
   equipment:
     head: ClothingHeadHatJesterAlt
 
 # Jumpsuit
 - type: loadout
-  id: ClownSuit
-  equipment: ClownSuit
-
-- type: startingGear
   id: ClownSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitClown
 
 - type: loadout
-  id: JesterSuit
-  equipment: JesterSuit
-
-- type: startingGear
   id: JesterSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitJesterAlt
 
 # Back
 - type: loadout
-  id: ClownBackpack
-  equipment: ClownBackpack
-
-- type: startingGear
   id: ClownBackpack
   equipment:
     back: ClothingBackpackClown
 
 - type: loadout
-  id: ClownSatchel
-  equipment: ClownSatchel
-
-- type: startingGear
   id: ClownSatchel
   equipment:
     back: ClothingBackpackSatchelClown
 
 - type: loadout
-  id: ClownDuffel
-  equipment: ClownDuffel
-
-- type: startingGear
   id: ClownDuffel
   equipment:
     back: ClothingBackpackDuffelClown
 
 # Shoes
 - type: loadout
-  id: ClownShoes
-  equipment: ClownShoes
-
-- type: startingGear
   id: ClownShoes
   equipment:
     shoes: ClothingShoesClown
 
 - type: loadout
-  id: JesterShoes
-  equipment: JesterShoes
-
-- type: startingGear
   id: JesterShoes
   equipment:
     shoes: ClothingShoesJester
 
 # Outer clothing
 - type: loadout
-  id: ClownRobes
-  equipment: ClownRobes
-
-- type: startingGear
   id: ClownRobes
   equipment:
     outerClothing: ClothingOuterClownPriest
 
 - type: loadout
-  id: ClownWintercoat
-  equipment: ClownWintercoat
-
-- type: startingGear
   id: ClownWintercoat
   equipment:
-    outerClothing: ClothingOuterWinterClown
\ No newline at end of file
+    outerClothing: ClothingOuterWinterClown
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
index 96aa4a7e002..a5574f9b7ad 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
@@ -20,35 +20,17 @@
 
 # Head
 - type: loadout
-  id: JanitorHead
-  equipment: JanitorHead
-
-- type: startingGear
   id: JanitorHead
   equipment:
     head: ClothingHeadHatPurplesoft
 
 # Jumpsuit
 - type: loadout
-  id: JanitorJumpsuit
-  equipment: JanitorJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: JanitorJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitJanitor
 
 - type: loadout
-  id: JanitorJumpskirt
-  equipment: JanitorJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: JanitorJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtJanitor
@@ -56,51 +38,31 @@
 # Sunrise-start
 - type: loadout
   id: MaidJumpskirt
-  equipment: MaidJumpskirt
   effects:
   - !type:GroupLoadoutEffect
     proto: MaidJanitor
-
-- type: startingGear
-  id: MaidJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtElegantMaid
 # Sunrise-end
 
 # Gloves
 - type: loadout
-  id: JanitorRubberGloves
-  equipment: JanitorRubberGloves
-
-- type: startingGear
   id: JanitorRubberGloves
   equipment:
     gloves: ClothingHandsGlovesJanitor
 
 - type: loadout
-  id: OrangeGloves
-  equipment: OrangeGloves
-
-- type: startingGear
   id: OrangeGloves
   equipment:
     gloves: ClothingHandsGlovesColorOrange
 
 - type: loadout
-  id: PurpleGloves
-  equipment: PurpleGloves
-
-- type: startingGear
   id: PurpleGloves
   equipment:
     gloves: ClothingHandsGlovesColorPurple
 
 # Outer clothing
 - type: loadout
-  id: JanitorWintercoat
-  equipment: JanitorWintercoat
-
-- type: startingGear
   id: JanitorWintercoat
   equipment:
     outerClothing: ClothingOuterWinterJani
@@ -108,13 +70,9 @@
 # Misc
 - type: loadout
   id: JanitorGoldenPlunger
-  equipment: JanitorGoldenPlunger
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorJanitorial
-
-- type: startingGear
-  id: JanitorGoldenPlunger
   storage:
     back:
     - GoldenPlunger
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
index e1aa127c048..cdc60bb61d1 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
@@ -1,130 +1,56 @@
 # Jumpsuit
 - type: loadout
-  id: LawyerJumpsuit
-  equipment: LawyerJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: LawyerJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitLawyerBlack
 
 - type: loadout
-  id: LawyerJumpskirt
-  equipment: LawyerJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: LawyerJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtLawyerBlack
 
 - type: loadout
-  id: LawyerJumpsuitBlue
-  equipment: LawyerJumpsuitBlue
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: LawyerJumpsuitBlue
   equipment:
     jumpsuit: ClothingUniformJumpsuitLawyerBlue
 
 - type: loadout
-  id: LawyerJumpskirtBlue
-  equipment: LawyerJumpskirtBlue
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: LawyerJumpskirtBlue
   equipment:
     jumpsuit: ClothingUniformJumpskirtLawyerBlue
 
 - type: loadout
-  id: LawyerJumpsuitPurple
-  equipment: LawyerJumpsuitPurple
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: LawyerJumpsuitPurple
   equipment:
     jumpsuit: ClothingUniformJumpsuitLawyerPurple
 
 - type: loadout
-  id: LawyerJumpskirtPurple
-  equipment: LawyerJumpskirtPurple
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: LawyerJumpskirtPurple
   equipment:
     jumpsuit: ClothingUniformJumpskirtLawyerPurple
 
 - type: loadout
-  id: LawyerJumpsuitRed
-  equipment: LawyerJumpsuitRed
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: LawyerJumpsuitRed
   equipment:
     jumpsuit: ClothingUniformJumpsuitLawyerRed
 
 - type: loadout
-  id: LawyerJumpskirtRed
-  equipment: LawyerJumpskirtRed
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: LawyerJumpskirtRed
   equipment:
     jumpsuit: ClothingUniformJumpskirtLawyerRed
 
 - type: loadout
-  id: LawyerJumpsuitGood
-  equipment: LawyerJumpsuitGood
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: LawyerJumpsuitGood
   equipment:
     jumpsuit: ClothingUniformJumpsuitLawyerGood
 
 - type: loadout
-  id: LawyerJumpskirtGood
-  equipment: LawyerJumpskirtGood
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: LawyerJumpskirtGood
   equipment:
     jumpsuit: ClothingUniformJumpskirtLawyerGood
 
 # Neck
 - type: loadout
-  id: LawyerNeck
-  equipment: LawyerNeck
-
-- type: startingGear
   id: LawyerNeck
   equipment:
     neck: ClothingNeckLawyerbadge
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml
index b0079efdb45..a4b58914dfa 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml
@@ -1,48 +1,20 @@
 # Jumpsuit
 - type: loadout
-  id: LibrarianJumpsuit
-  equipment: LibrarianJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: LibrarianJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitLibrarian
 
 - type: loadout
-  id: LibrarianJumpskirt
-  equipment: LibrarianJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: LibrarianJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtLibrarian
 
 - type: loadout
-  id: CuratorJumpsuit
-  equipment: CuratorJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: CuratorJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCurator
 
 - type: loadout
-  id: CuratorJumpskirt
-  equipment: CuratorJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: CuratorJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCurator
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
index 70dec49137f..0d137b488b8 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
@@ -1,118 +1,64 @@
 # Head
 - type: loadout
-  id: MimeHead
-  equipment: MimeHead
-
-- type: startingGear
   id: MimeHead
   equipment:
     head: ClothingHeadHatBeret
 
 - type: loadout
-  id: MimeFrenchBeret
-  equipment: MimeFrenchBeret
-
-- type: startingGear
   id: MimeFrenchBeret
   equipment:
     head: ClothingHeadHatBeretFrench
 
 - type: loadout
-  id: MimeCap
-  equipment: MimeCap
-
-- type: startingGear
   id: MimeCap
   equipment:
     head: ClothingHeadHatMimesoft
 
 # Mask
 - type: loadout
-  id: MimeMask
-  equipment: MimeMask
-
-- type: startingGear
   id: MimeMask
   equipment:
     mask: ClothingMaskMime
 
 - type: loadout
-  id: MimeMaskSad
-  equipment: MimeMaskSad
-
-- type: startingGear
   id: MimeMaskSad
   equipment:
     mask: ClothingMaskSadMime
 
 - type: loadout
-  id: MimeMaskScared
-  equipment: MimeMaskScared
-
-- type: startingGear
   id: MimeMaskScared
   equipment:
     mask: ClothingMaskScaredMime
 
 # Jumpsuit
 - type: loadout
-  id: MimeJumpsuit
-  equipment: MimeJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: MimeJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitMime
 
 - type: loadout
-  id: MimeJumpskirt
-  equipment: MimeJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: MimeJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtMime
 
 # Back
 - type: loadout
-  id: MimeBackpack
-  equipment: MimeBackpack
-
-- type: startingGear
   id: MimeBackpack
   equipment:
     back: ClothingBackpackMime
 
 - type: loadout
-  id: MimeSatchel
-  equipment: MimeSatchel
-
-- type: startingGear
   id: MimeSatchel
   equipment:
     back: ClothingBackpackSatchelMime
 
 - type: loadout
-  id: MimeDuffel
-  equipment: MimeDuffel
-
-- type: startingGear
   id: MimeDuffel
   equipment:
     back: ClothingBackpackDuffelMime
 
 # Outerclothing
 - type: loadout
-  id: MimeWintercoat
-  equipment: MimeWintercoat
-
-- type: startingGear
   id: MimeWintercoat
   equipment:
     outerClothing: ClothingOuterWinterMime
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
index eae05d2005d..2d3e6bd0fed 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
@@ -1,28 +1,16 @@
 # Jumpsuit
 - type: loadout
-  id: MusicianJumpsuit
-  equipment: MusicianJumpsuit
-
-- type: startingGear
   id: MusicianJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitMusician
 
 - type: loadout
-  id: MusicianJumpskirt
-  equipment: MusicianJumpskirt
-
-- type: startingGear
   id: MusicianJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtMusician
 
 # Outerclothing
 - type: loadout
-  id: MusicianWintercoat
-  equipment: MusicianWintercoat
-
-- type: startingGear
   id: MusicianWintercoat
   equipment:
     outerClothing: ClothingOuterWinterMusician
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
index 41d5c862c03..ae86a4214f7 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
@@ -11,38 +11,20 @@
 # Face
 - type: loadout
   id: PassengerFace
-  equipment: GasMask
   effects:
   - !type:GroupLoadoutEffect
     proto: GreyTider
-
-- type: startingGear
-  id: GasMask
   equipment:
     mask: ClothingMaskGas
 
 # Jumpsuits
 # Grey
 - type: loadout
-  id: GreyJumpsuit
-  equipment: GreyJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: GreyJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorGrey
 
 - type: loadout
-  id: GreyJumpskirt
-  equipment: GreyJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: GreyJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtColorGrey
@@ -50,57 +32,33 @@
 # Rainbow
 - type: loadout
   id: RainbowJumpsuit
-  equipment: RainbowJumpsuit
   effects:
   - !type:GroupLoadoutEffect
     proto: GreyTider
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
-  id: RainbowJumpsuit
   equipment:
     jumpsuit: ClothingUniformColorRainbow
 
 # Ancient
 - type: loadout
   id: AncientJumpsuit
-  equipment: AncientJumpsuit
   effects:
   - !type:GroupLoadoutEffect
     proto: GreyTider
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
-  id: AncientJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitAncient
 
 # Back
 - type: loadout
-  id: CommonBackpack
-  equipment: CommonBackpack
-
-- type: startingGear
   id: CommonBackpack
   equipment:
     back: ClothingBackpack
 
 - type: loadout
-  id: CommonSatchel
-  equipment: CommonSatchel
-
-- type: startingGear
   id: CommonSatchel
   equipment:
     back: ClothingBackpackSatchel
 
 - type: loadout
-  id: CommonDuffel
-  equipment: CommonDuffel
-
-- type: startingGear
   id: CommonDuffel
   equipment:
     back: ClothingBackpackDuffel
@@ -108,41 +66,25 @@
 # Gloves
 - type: loadout
   id: PassengerGloves
-  equipment: FingerlessInsulatedGloves
   effects:
   - !type:GroupLoadoutEffect
     proto: GreyTider
-
-- type: startingGear
-  id: FingerlessInsulatedGloves
   equipment:
     gloves: ClothingHandsGlovesFingerlessInsulated
 
 # Outerclothing
 - type: loadout
-  id: PassengerWintercoat
-  equipment: PassengerWintercoat
-
-- type: startingGear
   id: PassengerWintercoat
   equipment:
     outerClothing: ClothingOuterWinterCoat
 
 # Shoes
 - type: loadout
-  id: BlackShoes
-  equipment: BlackShoes
-
-- type: startingGear
   id: BlackShoes
   equipment:
     shoes: ClothingShoesColorBlack
 
 - type: loadout
-  id: WinterBoots
-  equipment: WinterBoots
-
-- type: startingGear
   id: WinterBoots
   equipment:
     shoes: ClothingShoesBootsWinter
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
index 07ef58f4429..f665038ff20 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
@@ -1,142 +1,74 @@
 # Jumpsuit
 - type: loadout
-  id: CaptainJumpsuit
-  equipment: CaptainJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: CaptainJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCaptain
 
 - type: loadout
-  id: CaptainJumpskirt
-  equipment: CaptainJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: CaptainJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCaptain
 
 - type: loadout
-  id: CaptainFormalSuit
-  equipment: CaptainFormalSuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: CaptainFormalSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCapFormal
 
 - type: loadout
-  id: CaptainFormalSkirt
-  equipment: CaptainFormalSkirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: CaptainFormalSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCapFormalDress
 
 # Head
 - type: loadout
-  id: CaptainHead
-  equipment: CaptainHead
-
-- type: startingGear
   id: CaptainHead
   equipment:
     head: ClothingHeadHatCaptain
 
 - type: loadout
-  id: CaptainCap
-  equipment: CaptainCap
-
-- type: startingGear
   id: CaptainCap
   equipment:
     head: ClothingHeadHatCapcap
 
 # Neck
 - type: loadout
-  id: CaptainCloak
-  equipment: CaptainCloak
-
-- type: startingGear
   id: CaptainCloak
   equipment:
     neck: ClothingNeckCloakCap
 
 - type: loadout
-  id: CaptainCloakFormal
-  equipment: CaptainCloakFormal
-
-- type: startingGear
   id: CaptainCloakFormal
   equipment:
     neck: ClothingNeckCloakCapFormal
 
 - type: loadout
-  id: CaptainMantle
-  equipment: CaptainMantle
-
-- type: startingGear
   id: CaptainMantle
   equipment:
     neck: ClothingNeckMantleCap
 
 # Back
 - type: loadout
-  id: CaptainBackpack
-  equipment: CaptainBackpack
-
-- type: startingGear
   id: CaptainBackpack
   equipment:
     back: ClothingBackpackCaptain
 
 - type: loadout
-  id: CaptainSatchel
-  equipment: CaptainSatchel
-
-- type: startingGear
   id: CaptainSatchel
   equipment:
     back: ClothingBackpackSatchelCaptain
 
 - type: loadout
-  id: CaptainDuffel
-  equipment: CaptainDuffel
-
-- type: startingGear
   id: CaptainDuffel
   equipment:
     back: ClothingBackpackDuffelCaptain
 
 # Outer clothing
 - type: loadout
-  id: CaptainOuterClothing
-  equipment: CaptainOuterClothing
-
-- type: startingGear
   id: CaptainOuterClothing
   equipment:
     outerClothing: ClothingOuterArmorCaptainCarapace
 
 - type: loadout
-  id: CaptainWintercoat
-  equipment: CaptainWintercoat
-
-- type: startingGear
   id: CaptainWintercoat
   equipment:
     outerClothing: ClothingOuterWinterCap
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
index f7eca51baf4..76c46d7d1a0 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
@@ -6,58 +6,32 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobHeadOfPersonnel
-      time: 36000 #10 hrs Sunrise-RoleTime
+      time: 54000 #15 hrs, special reward for HoP mains
 
 # Jumpsuit
 - type: loadout
-  id: HoPJumpsuit
-  equipment: HoPJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: HoPJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitHoP
 
 - type: loadout
-  id: HoPJumpskirt
-  equipment: HoPJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: HoPJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtHoP
 
 # Head
 - type: loadout
-  id: HoPHead
-  equipment: HoPHead
-
-- type: startingGear
   id: HoPHead
   equipment:
     head: ClothingHeadHatHopcap
 
 # Neck
 - type: loadout
-  id: HoPCloak
-  equipment: HoPCloak
-
-- type: startingGear
   id: HoPCloak
   equipment:
     neck: ClothingNeckCloakHop
 
 - type: loadout
-  id: HoPMantle
-  equipment: HoPMantle
-
-- type: startingGear
   id: HoPMantle
   equipment:
     neck: ClothingNeckMantleHOP
@@ -65,22 +39,14 @@
 # Back
 - type: loadout
   id: HoPBackpackIan
-  equipment: HoPBackpackIan
   effects:
   - !type:GroupLoadoutEffect
     proto: ProfessionalHoP
-
-- type: startingGear
-  id: HoPBackpackIan
   equipment:
     back: ClothingBackpackIan
 
 # Outerclothing
 - type: loadout
-  id: HoPWintercoat
-  equipment: HoPWintercoat
-
-- type: startingGear
   id: HoPWintercoat
   equipment:
     outerClothing: ClothingOuterWinterHoP
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
index f9f33d5b765..b3f1ae3cd6a 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
@@ -1,84 +1,43 @@
 # Jumpsuit
 - type: loadout
-  id: AtmosphericTechnicianJumpsuit
-  equipment: AtmosphericTechnicianJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: AtmosphericTechnicianJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitAtmos
 
 - type: loadout
-  id: AtmosphericTechnicianJumpskirt
-  equipment: AtmosphericTechnicianJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: AtmosphericTechnicianJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtAtmos
 
 - type: loadout
-  id: AtmosphericTechnicianJumpsuitCasual
-  equipment: AtmosphericTechnicianJumpsuitCasual
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: AtmosphericTechnicianJumpsuitCasual
   equipment:
     jumpsuit: ClothingUniformJumpsuitAtmosCasual
 
 # Back
 - type: loadout
-  id: AtmosphericTechnicianBackpack
-  equipment: AtmosphericTechnicianBackpack
-
-- type: startingGear
   id: AtmosphericTechnicianBackpack
   equipment:
     back: ClothingBackpackAtmospherics
 
 - type: loadout
-  id: AtmosphericTechnicianSatchel
-  equipment: AtmosphericTechnicianSatchel
-
-- type: startingGear
   id: AtmosphericTechnicianSatchel
   equipment:
     back: ClothingBackpackSatchelAtmospherics
 
 - type: loadout
-  id: AtmosphericTechnicianDuffel
-  equipment: AtmosphericTechnicianDuffel
-
-- type: startingGear
   id: AtmosphericTechnicianDuffel
   equipment:
     back: ClothingBackpackDuffelAtmospherics
 
 # OuterClothing
 - type: loadout
-  id: AtmosphericTechnicianWintercoat
-  equipment: AtmosphericTechnicianWintercoat
-
-- type: startingGear
   id: AtmosphericTechnicianWintercoat
   equipment:
     outerClothing: ClothingOuterWinterAtmos
 
 # Shoes
 - type: loadout
-  id: WhiteShoes
-  equipment: WhiteShoes
-
-- type: startingGear
   id: WhiteShoes
   equipment:
     shoes: ClothingShoesColorWhite
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
index 66f54625d42..5425c602ee3 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
@@ -1,87 +1,43 @@
 # Jumpsuit
 - type: loadout
-  id: ChiefEngineerJumpsuit
-  equipment: ChiefEngineerJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: ChiefEngineerJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitChiefEngineer
 
 - type: loadout
-  id: ChiefEngineerJumpskirt
-  equipment: ChiefEngineerJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: ChiefEngineerJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtChiefEngineer
 
 - type: loadout
-  id: ChiefEngineerTurtleneck
-  equipment: ChiefEngineerTurtleneck
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: ChiefEngineerTurtleneck
   equipment:
     jumpsuit: ClothingUniformJumpsuitChiefEngineerTurtle
 
 - type: loadout
-  id: ChiefEngineerTurtleneckSkirt
-  equipment: ChiefEngineerTurtleneckSkirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: ChiefEngineerTurtleneckSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtChiefEngineerTurtle
 
 # Neck
 - type: loadout
-  id: ChiefEngineerCloak
-  equipment: ChiefEngineerCloak
-
-- type: startingGear
   id: ChiefEngineerCloak
   equipment:
     neck: ClothingNeckCloakCe
 
 - type: loadout
-  id: ChiefEngineerMantle
-  equipment: ChiefEngineerMantle
-
-- type: startingGear
   id: ChiefEngineerMantle
   equipment:
     neck: ClothingNeckMantleCE
 
 # OuterClothing
 - type: loadout
-  id: ChiefEngineerWintercoat
-  equipment: ChiefEngineerWintercoat
-
-- type: startingGear
   id: ChiefEngineerWintercoat
   equipment:
     outerClothing: ClothingOuterWinterCE
 
 # Shoes
 - type: loadout
-  id: BrownShoes
-  equipment: BrownShoes
-
-- type: startingGear
   id: BrownShoes
   equipment:
     shoes: ClothingShoesColorBrown
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
index 95b13a7045e..29eae29329f 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
@@ -1,130 +1,74 @@
 # Head
-- type: loadout
-  id: StationEngineerHardhatYellow
-  equipment: StationEngineerHardhatYellow
-
 - type: startingGear
+  id: EngineeringBeret
+  equipment:
+    head: ClothingHeadHatBeretEngineering
+
+- type: loadout
   id: StationEngineerHardhatYellow
   equipment:
     head: ClothingHeadHatHardhatYellow
 
 - type: loadout
-  id: StationEngineerHardhatOrange
-  equipment: StationEngineerHardhatOrange
-
-- type: startingGear
   id: StationEngineerHardhatOrange
   equipment:
     head: ClothingHeadHatHardhatOrange
 
 - type: loadout
-  id: StationEngineerHardhatRed
-  equipment: StationEngineerHardhatRed
-
-- type: startingGear
   id: StationEngineerHardhatRed
   equipment:
     head: ClothingHeadHatHardhatRed
 
 # Jumpsuit
 - type: loadout
-  id: StationEngineerJumpsuit
-  equipment: StationEngineerJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: StationEngineerJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitEngineering
 
 - type: loadout
-  id: StationEngineerJumpskirt
-  equipment: StationEngineerJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: StationEngineerJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtEngineering
 
 - type: loadout
-  id: StationEngineerHazardsuit
-  equipment: StationEngineerHazardsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: StationEngineerHazardsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitEngineeringHazard
 
 # Back
 - type: loadout
-  id: StationEngineerBackpack
-  equipment: StationEngineerBackpack
-
-- type: startingGear
   id: StationEngineerBackpack
   equipment:
     back: ClothingBackpackEngineering
 
 - type: loadout
-  id: StationEngineerSatchel
-  equipment: StationEngineerSatchel
-
-- type: startingGear
   id: StationEngineerSatchel
   equipment:
     back: ClothingBackpackSatchelEngineering
 
 - type: loadout
-  id: StationEngineerDuffel
-  equipment: StationEngineerDuffel
-
-- type: startingGear
   id: StationEngineerDuffel
   equipment:
     back: ClothingBackpackDuffelEngineering
 
 # OuterClothing
 - type: loadout
-  id: StationEngineerOuterVest
-  equipment: StationEngineerOuterVest
-
-- type: startingGear
   id: StationEngineerOuterVest
   equipment:
     outerClothing: ClothingOuterVestHazard
 
 - type: loadout
-  id: StationEngineerWintercoat
-  equipment: StationEngineerWintercoat
-
-- type: startingGear
   id: StationEngineerWintercoat
   equipment:
     outerClothing: ClothingOuterWinterEngi
 
 # Shoes
 - type: loadout
-  id: WorkBoots
-  equipment: WorkBoots
-
-- type: startingGear
   id: WorkBoots
   equipment:
     shoes: ClothingShoesBootsWork
 
 - type: loadout
-  id: EngineeringWinterBoots
-  equipment: EngineeringWinterBoots
-
-- type: startingGear
   id: EngineeringWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterEngi
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml
index 6555e1f982f..2a2c16a6ddb 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml
@@ -1,24 +1,10 @@
 # Jumpsuit
 - type: loadout
-  id: YellowJumpsuit
-  equipment: YellowJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: YellowJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorYellow
 
 - type: loadout
-  id: YellowJumpskirt
-  equipment: YellowJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: YellowJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtColorYellow
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
index 661aa67e6f5..100e5eb53ab 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
@@ -1,71 +1,37 @@
 # Jumpsuit
 - type: loadout
-  id: ChemistJumpsuit
-  equipment: ChemistJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: ChemistJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitChemistry
 
 - type: loadout
-  id: ChemistJumpskirt
-  equipment: ChemistJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: ChemistJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtChemistry
 
 # Back
 - type: loadout
-  id: ChemistBackpack
-  equipment: ChemistBackpack
-
-- type: startingGear
   id: ChemistBackpack
   equipment:
     back: ClothingBackpackChemistry
 
 - type: loadout
-  id: ChemistSatchel
-  equipment: ChemistSatchel
-
-- type: startingGear
   id: ChemistSatchel
   equipment:
     back: ClothingBackpackSatchelChemistry
 
 - type: loadout
-  id: ChemistDuffel
-  equipment: ChemistDuffel
-
-- type: startingGear
   id: ChemistDuffel
   equipment:
     back: ClothingBackpackDuffelChemistry
 
 # Outer clothing
 - type: loadout
-  id: ChemistLabCoat
-  equipment: ChemistLabCoat
-
-- type: startingGear
   id: ChemistLabCoat
   equipment:
     outerClothing: ClothingOuterCoatLabChem
 
 - type: loadout
-  id: ChemistWintercoat
-  equipment: ChemistWintercoat
-
-- type: startingGear
   id: ChemistWintercoat
   equipment:
     outerClothing: ClothingOuterWinterChem
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
index eeb51e924f9..12bde1be96f 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
@@ -1,105 +1,53 @@
 # Jumpsuit
 - type: loadout
-  id: ChiefMedicalOfficerJumpsuit
-  equipment: ChiefMedicalOfficerJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: ChiefMedicalOfficerJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCMO
 
 - type: loadout
-  id: ChiefMedicalOfficerJumpskirt
-  equipment: ChiefMedicalOfficerJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: ChiefMedicalOfficerJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCMO
 
 - type: loadout
-  id: ChiefMedicalOfficerTurtleneckJumpsuit
-  equipment: ChiefMedicalOfficerTurtleneckJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: ChiefMedicalOfficerTurtleneckJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCMOTurtle
 
 - type: loadout
-  id: ChiefMedicalOfficerTurtleneckJumpskirt
-  equipment: ChiefMedicalOfficerTurtleneckJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: ChiefMedicalOfficerTurtleneckJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCMOTurtle
 
 # Head
 - type: loadout
-  id: ChiefMedicalOfficerBeret
-  equipment: ChiefMedicalOfficerBeret
-
-- type: startingGear
   id: ChiefMedicalOfficerBeret
   equipment:
     head: ClothingHeadHatBeretCmo
 
 - type: loadout
-  id: CMOMedicalHeadMirror
-  equipment: CMOMedicalHeadMirror
-
-- type: startingGear
   id: CMOMedicalHeadMirror
   equipment:
     head: ClothingHeadMirror
 
 # Neck
 - type: loadout
-  id: ChiefMedicalOfficerCloak
-  equipment: ChiefMedicalOfficerCloak
-
-- type: startingGear
   id: ChiefMedicalOfficerCloak
   equipment:
     neck: ClothingCloakCmo
 
 - type: loadout
-  id: ChiefMedicalOfficerMantle
-  equipment: ChiefMedicalOfficerMantle
-
-- type: startingGear
   id: ChiefMedicalOfficerMantle
   equipment:
     neck: ClothingNeckMantleCMO
 
 # Outer clothing
 - type: loadout
-  id: ChiefMedicalOfficerLabCoat
-  equipment: ChiefMedicalOfficerLabCoat
-
-- type: startingGear
   id: ChiefMedicalOfficerLabCoat
   equipment:
     outerClothing: ClothingOuterCoatLabCmo
 
 - type: loadout
-  id: ChiefMedicalOfficerWintercoat
-  equipment: ChiefMedicalOfficerWintercoat
-
-- type: startingGear
   id: ChiefMedicalOfficerWintercoat
   equipment:
     outerClothing: ClothingOuterWinterCMO
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
index 77b5b183fc7..e0771a3e299 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
@@ -6,17 +6,17 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobChemist
-      time: 36000 # 10 hrs Sunrise-RoleTime
+      time: 21600 #6 hrs
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:RoleTimeRequirement
       role: JobMedicalDoctor
-      time: 36000 # 10 hrs Sunrise-RoleTime
+      time: 21600 #6 hrs
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:DepartmentTimeRequirement
       department: Medical
-      time: 108000 # 30 hrs Sunrise-RoleTime
+      time: 216000 # 60 hrs
 
 # Other Timers
 
@@ -31,219 +31,125 @@
 
 # Head
 
-# - type: loadout
-#   id: SeniorPhysicianBeret
-#   equipment: SeniorPhysicianBeret
-#   effects:
-#   - !type:GroupLoadoutEffect
-#     proto: SeniorPhysician
-
-# - type: startingGear
-#   id: SeniorPhysicianBeret
-#   equipment:
-#     head: ClothingHeadHatBeretSeniorPhysician
+#- type: loadout
+#  id: SeniorPhysicianBeret
+#  effects:
+#  - !type:GroupLoadoutEffect
+#    proto: SeniorPhysician
+#  equipment:
+#    head: ClothingHeadHatBeretSeniorPhysician
 
 - type: loadout
   id: MedicalHeadMirror
-  equipment: MedicalHeadMirror
   effects:
   - !type:GroupLoadoutEffect
     proto: MedicalHeadMirrorTimer
-
-- type: startingGear
-  id: MedicalHeadMirror
   equipment:
     head: ClothingHeadMirror
 
 - type: loadout
-  id: MedicalBeret
-  equipment: MedicalBeret
-
-- type: startingGear
   id: MedicalBeret
   equipment:
     head: ClothingHeadHatBeretMedic
 
 - type: loadout
-  id: BlueSurgeryCap
-  equipment: BlueSurgeryCap
-
-- type: startingGear
   id: BlueSurgeryCap
   equipment:
     head: ClothingHeadHatSurgcapBlue
 
 - type: loadout
-  id: GreenSurgeryCap
-  equipment: GreenSurgeryCap
-
-- type: startingGear
   id: GreenSurgeryCap
   equipment:
     head: ClothingHeadHatSurgcapGreen
 
 - type: loadout
-  id: PurpleSurgeryCap
-  equipment: PurpleSurgeryCap
-
-- type: startingGear
   id: PurpleSurgeryCap
   equipment:
     head: ClothingHeadHatSurgcapPurple
 
 - type: loadout
-  id: NurseHat
-  equipment: NurseHat
-
-- type: startingGear
   id: NurseHat
   equipment:
     head: ClothingHeadNurseHat
 
 # Jumpsuit
 - type: loadout
-  id: MedicalDoctorJumpsuit
-  equipment: MedicalDoctorJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: MedicalDoctorJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitMedicalDoctor
 
 - type: loadout
-  id: MedicalDoctorJumpskirt
-  equipment: MedicalDoctorJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: MedicalDoctorJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtMedicalDoctor
 
 - type: loadout
   id: SeniorPhysicianJumpsuit
-  equipment: SeniorPhysicianJumpsuit
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorPhysician
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
-  id: SeniorPhysicianJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitSeniorPhysician
 
 - type: loadout
   id: SeniorPhysicianJumpskirt
-  equipment: SeniorPhysicianJumpskirt
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorPhysician
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
-  id: SeniorPhysicianJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorPhysician
 
 - type: loadout
-  id: MedicalBlueScrubs
-  equipment: MedicalBlueScrubs
-
-- type: startingGear
   id: MedicalBlueScrubs
   equipment:
     jumpsuit: UniformScrubsColorBlue
 
 - type: loadout
-  id: MedicalGreenScrubs
-  equipment: MedicalGreenScrubs
-
-- type: startingGear
   id: MedicalGreenScrubs
   equipment:
     jumpsuit: UniformScrubsColorGreen
 
 - type: loadout
-  id: MedicalPurpleScrubs
-  equipment: MedicalPurpleScrubs
-
-- type: startingGear
   id: MedicalPurpleScrubs
   equipment:
     jumpsuit: UniformScrubsColorPurple
 
 # Back
 - type: loadout
-  id: MedicalDoctorBackpack
-  equipment: MedicalDoctorBackpack
-
-- type: startingGear
   id: MedicalDoctorBackpack
   equipment:
     back: ClothingBackpackMedical
 
 - type: loadout
-  id: MedicalDoctorSatchel
-  equipment: MedicalDoctorSatchel
-
-- type: startingGear
   id: MedicalDoctorSatchel
   equipment:
     back: ClothingBackpackSatchelMedical
 
 - type: loadout
-  id: MedicalDoctorDuffel
-  equipment: MedicalDoctorDuffel
-
-- type: startingGear
   id: MedicalDoctorDuffel
   equipment:
     back: ClothingBackpackDuffelMedical
 
 # OuterClothing
 - type: loadout
-  id: MedicalDoctorWintercoat
-  equipment: MedicalDoctorWintercoat
-
-- type: startingGear
   id: MedicalDoctorWintercoat
   equipment:
     outerClothing: ClothingOuterWinterMed
 
 # Shoes
 - type: loadout
-  id: MedicalWinterBoots
-  equipment: MedicalWinterBoots
-
-- type: startingGear
   id: MedicalWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterMed
 
 # Gloves
 - type: loadout
-  id: NitrileGloves
-  equipment: NitrileGloves
-
-- type: startingGear
   id: NitrileGloves
   equipment:
     gloves: ClothingHandsGlovesNitrile
 
 #Masks
 - type: loadout
-  id: SterileMask
-  equipment: SterileMask
-
-- type: startingGear
   id: SterileMask
   equipment:
     mask: ClothingMaskSterile
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
index 1659d95dae7..40a316afa31 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
@@ -1,24 +1,10 @@
 # Jumpsuit
 - type: loadout
-  id: WhiteJumpsuit
-  equipment: WhiteJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: WhiteJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorWhite
 
 - type: loadout
-  id: WhiteJumpskirt
-  equipment: WhiteJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: WhiteJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtColorWhite
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
index 4c5ec0f2674..95d18d4ea2d 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
@@ -1,63 +1,33 @@
 # Head
 - type: loadout
-  id: ParamedicHead
-  equipment: ParamedicHead
-
-- type: startingGear
   id: ParamedicHead
   equipment:
     head: ClothingHeadHatParamedicsoft
 
 # Jumpsuit
 - type: loadout
-  id: ParamedicJumpsuit
-  equipment: ParamedicJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: ParamedicJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitParamedic
 
 - type: loadout
-  id: ParamedicJumpskirt
-  equipment: ParamedicJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: ParamedicJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtParamedic
 
 # Outer clothing
 - type: loadout
-  id: ParamedicWindbreaker
-  equipment: ParamedicWindbreaker
-
-- type: startingGear
   id: ParamedicWindbreaker
   equipment:
     outerClothing: ClothingOuterCoatParamedicWB
 
 - type: loadout
-  id: ParamedicWintercoat
-  equipment: ParamedicWintercoat
-
-- type: startingGear
   id: ParamedicWintercoat
   equipment:
     outerClothing: ClothingOuterWinterPara
 
 # Shoes
 - type: loadout
-  id: BlueShoes
-  equipment: BlueShoes
-
-- type: startingGear
   id: BlueShoes
   equipment:
     shoes: ClothingShoesColorBlue
diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
index 9bafa779e52..be072ef01fe 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
@@ -1,63 +1,33 @@
 # Neck
 
 - type: loadout
-  id: ResearchDirectorMantle
-  equipment: ResearchDirectorMantle
-
-- type: startingGear
   id: ResearchDirectorMantle
   equipment:
     neck: ClothingNeckMantleRD
 
 - type: loadout
-  id: ResearchDirectorCloak
-  equipment: ResearchDirectorCloak
-
-- type: startingGear
   id: ResearchDirectorCloak
   equipment:
     neck: ClothingNeckCloakRd
 
 # Jumpsuit
 - type: loadout
-  id: ResearchDirectorJumpsuit
-  equipment: ResearchDirectorJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: ResearchDirectorJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitResearchDirector
 
 - type: loadout
-  id: ResearchDirectorJumpskirt
-  equipment: ResearchDirectorJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: ResearchDirectorJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtResearchDirector
 
 # OuterClothing
 - type: loadout
-  id: ResearchDirectorLabCoat
-  equipment: ResearchDirectorLabCoat
-
-- type: startingGear
   id: ResearchDirectorLabCoat
   equipment:
     outerClothing: ClothingOuterCoatRD
 
 - type: loadout
-  id: ResearchDirectorWintercoat
-  equipment: ResearchDirectorWintercoat
-
-- type: startingGear
   id: ResearchDirectorWintercoat
   equipment:
     outerClothing: ClothingOuterWinterRD
diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
index 9ded3965d9b..a8ff7fbeb96 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
@@ -1,143 +1,75 @@
 # Neck
 
 - type: loadout
-  id: ScientistTie
-  equipment: ScientistTie
-
-- type: startingGear
   id: ScientistTie
   equipment:
     neck: ClothingNeckTieSci
 
 # Jumpsuit
 - type: loadout
-  id: ScientistJumpsuit
-  equipment: ScientistJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: ScientistJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitScientist
 
 - type: loadout
-  id: ScientistJumpskirt
-  equipment: ScientistJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: ScientistJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtScientist
 
 - type: loadout
-  id: RoboticistJumpsuit
-  equipment: RoboticistJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: RoboticistJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitRoboticist
 
 - type: loadout
-  id: RoboticistJumpskirt
-  equipment: RoboticistJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: RoboticistJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtRoboticist
 
 # Back
 - type: loadout
-  id: ScientistBackpack
-  equipment: ScientistBackpack
-
-- type: startingGear
   id: ScientistBackpack
   equipment:
     back: ClothingBackpackScience
 
 - type: loadout
-  id: ScientistSatchel
-  equipment: ScientistSatchel
-
-- type: startingGear
   id: ScientistSatchel
   equipment:
     back: ClothingBackpackSatchelScience
 
 - type: loadout
-  id: ScientistDuffel
-  equipment: ScientistDuffel
-
-- type: startingGear
   id: ScientistDuffel
   equipment:
     back: ClothingBackpackDuffelScience
 
 # OuterClothing
 - type: loadout
-  id: RegularLabCoat
-  equipment: RegularLabCoat
-
-- type: startingGear
   id: RegularLabCoat
   equipment:
     outerClothing: ClothingOuterCoatLab
 
 - type: loadout
-  id: ScienceLabCoat
-  equipment: ScienceLabCoat
-
-- type: startingGear
   id: ScienceLabCoat
   equipment:
     outerClothing: ClothingOuterCoatRnd
 
 - type: loadout
-  id: ScienceWintercoat
-  equipment: ScienceWintercoat
-
-- type: startingGear
   id: ScienceWintercoat
   equipment:
     outerClothing: ClothingOuterWinterSci
 
 - type: loadout
-  id: RoboticistLabCoat
-  equipment: RoboticistLabCoat
-
-- type: startingGear
   id: RoboticistLabCoat
   equipment:
     outerClothing: ClothingOuterCoatRobo
 
 - type: loadout
-  id: RoboticistWintercoat
-  equipment: RoboticistWintercoat
-
-- type: startingGear
   id: RoboticistWintercoat
   equipment:
     outerClothing: ClothingOuterWinterRobo
 
 # Gloves
 - type: loadout
-  id: LatexGloves
-  equipment: LatexGloves
-
-- type: startingGear
   id: LatexGloves
   equipment:
     gloves: ClothingHandsGlovesLatex
@@ -145,19 +77,11 @@
 # Sunrise-Edit: Только для робототехника
 #- type: loadout
 #  id: RobohandsGloves
-#  equipment: RobohandsGloves
-#
-#- type: startingGear
-#  id: RobohandsGloves
 #  equipment:
 #    gloves: ClothingHandsGlovesRobohands
 
 # Shoes
 - type: loadout
-  id: ScienceWinterBoots
-  equipment: ScienceWinterBoots
-
-- type: startingGear
   id: ScienceWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterSci
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
index 9706179cd51..e8afa5a203c 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
@@ -1,96 +1,48 @@
 # Head
 - type: loadout
-  id: DetectiveFedora
-  equipment: DetectiveFedora
-
-- type: startingGear
   id: DetectiveFedora
   equipment:
     head: ClothingHeadHatFedoraBrown
 
 - type: loadout
-  id: DetectiveFedoraGrey
-  equipment: DetectiveFedoraGrey
-
-- type: startingGear
   id: DetectiveFedoraGrey
   equipment:
     head: ClothingHeadHatFedoraGrey
 
 # Neck
 - type: loadout
-  id: DetectiveTie
-  equipment: DetectiveTie
-
-- type: startingGear
   id: DetectiveTie
   equipment:
     neck: ClothingNeckTieDet
 
 # Jumpsuit
 - type: loadout
-  id: DetectiveJumpsuit
-  equipment: DetectiveJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: DetectiveJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitDetective
 
 - type: loadout
-  id: DetectiveJumpskirt
-  equipment: DetectiveJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: DetectiveJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtDetective
 
 - type: loadout
-  id: NoirJumpsuit
-  equipment: NoirJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: NoirJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitDetectiveGrey
 
 - type: loadout
-  id: NoirJumpskirt
-  equipment: NoirJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: NoirJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtDetectiveGrey
 
 # OuterClothing
 - type: loadout
-  id: DetectiveArmorVest
-  equipment: DetectiveArmorVest
-
-- type: startingGear
   id: DetectiveArmorVest
   equipment:
     outerClothing: ClothingOuterVestDetective
 
 - type: loadout
-  id: DetectiveCoat
-  equipment: DetectiveCoat
-
-- type: startingGear
   id: DetectiveCoat
   equipment:
     outerClothing: ClothingOuterCoatDetectiveLoadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
index d4135a2c2f0..ceecef6cc6e 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
@@ -1,129 +1,63 @@
 # Jumpsuit
 - type: loadout
-  id: HeadofSecurityJumpsuit
-  equipment: HeadofSecurityJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: HeadofSecurityJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitHoS
 
 - type: loadout
-  id: HeadofSecurityJumpskirt
-  equipment: HeadofSecurityJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: HeadofSecurityJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtHoS
 
 - type: loadout
-  id: HeadofSecurityTurtleneck
-  equipment: HeadofSecurityTurtleneck
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: HeadofSecurityTurtleneck
   equipment:
     jumpsuit: ClothingUniformJumpsuitHoSAlt
 
 - type: loadout
-  id: HeadofSecurityTurtleneckSkirt
-  equipment: HeadofSecurityTurtleneckSkirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: HeadofSecurityTurtleneckSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtHoSAlt
 
 - type: loadout
-  id: HeadofSecurityFormalSuit
-  equipment: HeadofSecurityFormalSuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: HeadofSecurityFormalSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitHosFormal
 
 - type: loadout
-  id: HeadofSecurityFormalSkirt
-  equipment: HeadofSecurityFormalSkirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: HeadofSecurityFormalSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtHosFormal
 
 # Head
 - type: loadout
-  id: HeadofSecurityHead
-  equipment: HeadofSecurityHead
-
-- type: startingGear
   id: HeadofSecurityHead
   equipment:
     head: ClothingHeadHatHoshat
 
 - type: loadout
-  id: HeadofSecurityBeret
-  equipment: HeadofSecurityBeret
-
-- type: startingGear
   id: HeadofSecurityBeret
   equipment:
     head: ClothingHeadHatBeretHoS
 
 # Neck
 - type: loadout
-  id: HeadofSecurityCloak
-  equipment: HeadofSecurityCloak
-
-- type: startingGear
   id: HeadofSecurityCloak
   equipment:
     neck: ClothingNeckCloakHos
 
 - type: loadout
-  id: HeadofSecurityMantle
-  equipment: HeadofSecurityMantle
-
-- type: startingGear
   id: HeadofSecurityMantle
   equipment:
     neck: ClothingNeckMantleHOS
 
 # OuterClothing
 - type: loadout
-  id: HeadofSecurityCoat
-  equipment: HeadofSecurityCoat
-
-- type: startingGear
   id: HeadofSecurityCoat
   equipment:
     outerClothing: ClothingOuterCoatHoSTrench
 
 - type: loadout
-  id: HeadofSecurityWinterCoat
-  equipment: HeadofSecurityWinterCoat
-
-- type: startingGear
   id: HeadofSecurityWinterCoat
   equipment:
     outerClothing: ClothingOuterWinterHoS
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml
index 65a7408aef4..94f889fc797 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml
@@ -1,24 +1,10 @@
 # Jumpsuit
 - type: loadout
-  id: RedJumpsuit
-  equipment: RedJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: RedJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorRed
 
 - type: loadout
-  id: RedJumpskirt
-  equipment: RedJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: RedJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtColorRed
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
index 7ea5c97d1df..1d97e065ee9 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
@@ -1,179 +1,95 @@
 # Head
 - type: loadout
-  id: SecurityHelmet
-  equipment: SecurityHelmet
-
-- type: startingGear
   id: SecurityHelmet
   equipment:
     head: ClothingHeadHelmetBasic
 
 - type: loadout
-  id: SecurityHat
-  equipment: SecurityHat
-
-- type: startingGear
   id: SecurityHat
   equipment:
     head: ClothingHeadHatSecsoft
 
 - type: loadout
-  id: SecurityBeret
-  equipment: SecurityBeret
-
-- type: startingGear
   id: SecurityBeret
   equipment:
     head: ClothingHeadHatBeretSecurity
 
 # Jumpsuit
 - type: loadout
-  id: SecurityJumpsuit
-  equipment: SecurityJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: SecurityJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitSec
 
 - type: loadout
-  id: SecurityJumpskirt
-  equipment: SecurityJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: SecurityJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtSec
 
 - type: loadout
-  id: SecurityJumpsuitGrey
-  equipment: SecurityJumpsuitGrey
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: SecurityJumpsuitGrey
   equipment:
     jumpsuit: ClothingUniformJumpsuitSecGrey
 
 - type: loadout
-  id: SecurityJumpskirtGrey
-  equipment: SecurityJumpskirtGrey
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: SecurityJumpskirtGrey
   equipment:
     jumpsuit: ClothingUniformJumpskirtSecGrey
 
 # Back
 - type: loadout
-  id: SecurityBackpack
-  equipment: SecurityBackpack
-
-- type: startingGear
   id: SecurityBackpack
   equipment:
     back: ClothingBackpackSecurity
 
 - type: loadout
-  id: SecuritySatchel
-  equipment: SecuritySatchel
-
-- type: startingGear
   id: SecuritySatchel
   equipment:
     back: ClothingBackpackSatchelSecurity
 
 - type: loadout
-  id: SecurityDuffel
-  equipment: SecurityDuffel
-
-- type: startingGear
   id: SecurityDuffel
   equipment:
     back: ClothingBackpackDuffelSecurity
 
 # Belt
 - type: loadout
-  id: SecurityBelt
-  equipment: SecurityBelt
-
-- type: startingGear
   id: SecurityBelt
   equipment:
     belt: ClothingBeltSecurityFilled
 
 - type: loadout
-  id: SecurityWebbing
-  equipment: SecurityWebbing
-
-- type: startingGear
   id: SecurityWebbing
   equipment:
     belt: ClothingBeltSecurityWebbingFilled
 
 # Outerclothing
 - type: loadout
-  id: ArmorVest
-  equipment: ArmorVest
-
-- type: startingGear
   id: ArmorVest
   equipment:
     outerClothing: ClothingOuterArmorBasic
 
 - type: loadout
-  id: ArmorVestSlim
-  equipment: ArmorVestSlim
-
-- type: startingGear
   id: ArmorVestSlim
   equipment:
     outerClothing: ClothingOuterArmorBasicSlim
 
 - type: loadout
-  id: SecurityOfficerWintercoat
-  equipment: SecurityOfficerWintercoat
-
-- type: startingGear
   id: SecurityOfficerWintercoat
   equipment:
     outerClothing: ClothingOuterWinterSec
 
 # Shoes
 - type: loadout
-  id: CombatBoots
-  equipment: CombatBoots
-
-- type: startingGear
   id: CombatBoots
   equipment:
     shoes: ClothingShoesBootsCombatFilled
 
 - type: loadout
-  id: JackBoots
-  equipment: JackBoots
-
-- type: startingGear
   id: JackBoots
   equipment:
     shoes: ClothingShoesBootsJackFilled
 
 - type: loadout
-  id: SecurityWinterBoots
-  equipment: SecurityWinterBoots
-
-- type: startingGear
   id: SecurityWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterSecFilled
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml
index 37f946202e3..9c270e6d6fd 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml
@@ -1,62 +1,32 @@
 # Head
 - type: loadout
-  id: WardenHead
-  equipment: WardenHead
-
-- type: startingGear
   id: WardenHead
   equipment:
     head: ClothingHeadHatWarden
 
 - type: loadout
-  id: WardenBeret
-  equipment: WardenBeret
-
-- type: startingGear
   id: WardenBeret
   equipment:
     head: ClothingHeadHatBeretWarden
 
 # Jumpsuit
 - type: loadout
-  id: WardenJumpsuit
-  equipment: WardenJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: WardenJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitWarden
 
 - type: loadout
-  id: WardenJumpskirt
-  equipment: WardenJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: WardenJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtWarden
 
 # OuterClothing
 - type: loadout
-  id: WardenCoat
-  equipment: WardenCoat
-
-- type: startingGear
   id: WardenCoat
   equipment:
     outerClothing: ClothingOuterCoatWarden
 
 - type: loadout
-  id: WardenArmoredWinterCoat
-  equipment: WardenArmoredWinterCoat
-
-- type: startingGear
   id: WardenArmoredWinterCoat
   equipment:
     outerClothing: ClothingOuterWinterWarden
diff --git a/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml
index d672feaba7d..a9833798c76 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml
@@ -1,55 +1,31 @@
 # Jumpsuit
 - type: loadout
-  id: BoxerShorts
-  equipment: BoxerShorts
-
-- type: startingGear
   id: BoxerShorts
   equipment:
     jumpsuit: UniformShortsRed
 
 - type: loadout
-  id: BoxerShortsWithTop
-  equipment: BoxerShortsWithTop
-
-- type: startingGear
   id: BoxerShortsWithTop
   equipment:
     jumpsuit: UniformShortsRedWithTop
 
 # Gloves
 - type: loadout
-  id: RedBoxingGloves
-  equipment: RedBoxingGloves
-
-- type: startingGear
   id: RedBoxingGloves
   equipment:
     gloves: ClothingHandsGlovesBoxingRed
 
 - type: loadout
-  id: BlueBoxingGloves
-  equipment: BlueBoxingGloves
-
-- type: startingGear
   id: BlueBoxingGloves
   equipment:
     gloves: ClothingHandsGlovesBoxingBlue
 
 - type: loadout
-  id: GreenBoxingGloves
-  equipment: GreenBoxingGloves
-
-- type: startingGear
   id: GreenBoxingGloves
   equipment:
     gloves: ClothingHandsGlovesBoxingGreen
 
 - type: loadout
-  id: YellowBoxingGloves
-  equipment: YellowBoxingGloves
-
-- type: startingGear
   id: YellowBoxingGloves
   equipment:
-    gloves: ClothingHandsGlovesBoxingYellow
\ No newline at end of file
+    gloves: ClothingHandsGlovesBoxingYellow
diff --git a/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml
index 6cd2441b6bc..5dfb1319880 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml
@@ -1,18 +1,10 @@
 # Jumpsuit
 - type: loadout
-  id: ReporterJumpsuit
-  equipment: ReporterJumpsuit
-
-- type: startingGear
   id: ReporterJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitReporter
 
 - type: loadout
-  id: JournalistJumpsuit
-  equipment: JournalistJumpsuit
-
-- type: startingGear
   id: JournalistJumpsuit
   equipment:
-    jumpsuit: ClothingUniformJumpsuitJournalist
\ No newline at end of file
+    jumpsuit: ClothingUniformJumpsuitJournalist
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
index 605e0e66d2b..b7dae89fda9 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
@@ -20,37 +20,25 @@
 # Basic options
 # Glasses
 - type: loadout
-  id: Glasses
-  equipment: Glasses
-
-- type: startingGear
   id: Glasses
   equipment:
     eyes: ClothingEyesGlasses
 
 # Special options
-# Jamjar    
+# Jamjar
 - type: loadout
   id: GlassesJamjar
-  equipment: GlassesJamjar
   effects:
   - !type:GroupLoadoutEffect
     proto: JamjarTimer
-
-- type: startingGear
-  id: GlassesJamjar
   equipment:
     eyes: ClothingEyesGlassesJamjar
 
 # Jensen
 - type: loadout
   id: GlassesJensen
-  equipment: GlassesJensen
   effects:
   - !type:GroupLoadoutEffect
     proto: JensenTimer
-
-- type: startingGear
-  id: GlassesJensen
   equipment:
     eyes: ClothingEyesGlassesJensen
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml b/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml
index 5b7e46151fe..21b9070b0dc 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml
@@ -1,279 +1,167 @@
 # Instruments
 - type: loadout
-  id: Glockenspiel
-  equipment: Glockenspiel
-
-- type: startingGear
   id: Glockenspiel
   storage:
     back:
     - GlockenspielInstrument
 
 - type: loadout
-  id: MusicBox
-  equipment: MusicBox
-
-- type: startingGear
   id: MusicBox
   storage:
     back:
     - MusicBoxInstrument
 
 - type: loadout
-  id: Xylophone
-  equipment: Xylophone
-
-- type: startingGear
   id: Xylophone
   storage:
     back:
     - XylophoneInstrument
 
 - type: loadout
-  id: Microphone
-  equipment: Microphone
-
-- type: startingGear
   id: Microphone
   storage:
     back:
     - MicrophoneInstrument
 
 - type: loadout
-  id: Synthesizer
-  equipment: Synthesizer
-
-- type: startingGear
   id: Synthesizer
   storage:
     back:
     - SynthesizerInstrument
 
 - type: loadout
-  id: Kalimba
-  equipment: Kalimba
-
-- type: startingGear
   id: Kalimba
   storage:
     back:
     - KalimbaInstrument
 
 - type: loadout
-  id: Woodblock
-  equipment: Woodblock
-
-- type: startingGear
   id: Woodblock
   storage:
     back:
     - WoodblockInstrument
 
 - type: loadout
-  id: ElectricGuitar
-  equipment: ElectricGuitar
-
-- type: startingGear
   id: ElectricGuitar
   storage:
     back:
     - ElectricGuitarInstrument
 
 - type: loadout
-  id: BassGuitar
-  equipment: BassGuitar
-
-- type: startingGear
   id: BassGuitar
   storage:
     back:
     - BassGuitarInstrument
 
 - type: loadout
-  id: RockGuitar
-  equipment: RockGuitar
-
-- type: startingGear
   id: RockGuitar
   storage:
     back:
     - RockGuitarInstrument
 
 - type: loadout
-  id: AcousticGuitar
-  equipment: AcousticGuitar
-
-- type: startingGear
   id: AcousticGuitar
   storage:
     back:
     - AcousticGuitarInstrument
 
 - type: loadout
-  id: Banjo
-  equipment: Banjo
-
-- type: startingGear
   id: Banjo
   storage:
     back:
     - BanjoInstrument
 
 - type: loadout
-  id: Violin
-  equipment: Violin
-
-- type: startingGear
   id: Violin
   storage:
     back:
     - ViolinInstrument
 
 - type: loadout
-  id: Viola
-  equipment: Viola
-
-- type: startingGear
   id: Viola
   storage:
     back:
     - ViolaInstrument
 
 - type: loadout
-  id: Cello
-  equipment: Cello
-
-- type: startingGear
   id: Cello
   storage:
     back:
     - CelloInstrument
 
 - type: loadout
-  id: Trumpet
-  equipment: Trumpet
-
-- type: startingGear
   id: Trumpet
   storage:
     back:
     - TrumpetInstrument
 
 - type: loadout
-  id: Trombone
-  equipment: Trombone
-
-- type: startingGear
   id: Trombone
   storage:
     back:
     - TromboneInstrument
 
 - type: loadout
-  id: FrenchHorn
-  equipment: FrenchHorn
-
-- type: startingGear
   id: FrenchHorn
   storage:
     back:
     - FrenchHornInstrument
 
 - type: loadout
-  id: Euphonium
-  equipment: Euphonium
-
-- type: startingGear
   id: Euphonium
   storage:
     back:
     - EuphoniumInstrument
 
 - type: loadout
-  id: Saxophone
-  equipment: Saxophone
-
-- type: startingGear
   id: Saxophone
   storage:
     back:
     - SaxophoneInstrument
 
 - type: loadout
-  id: Accordion
-  equipment: Accordion
-
-- type: startingGear
   id: Accordion
   storage:
     back:
     - AccordionInstrument
 
 - type: loadout
-  id: Harmonica
-  equipment: Harmonica
-
-- type: startingGear
   id: Harmonica
   storage:
     back:
     - HarmonicaInstrument
 
 - type: loadout
-  id: Clarinet
-  equipment: Clarinet
-
-- type: startingGear
   id: Clarinet
   storage:
     back:
     - ClarinetInstrument
 
 - type: loadout
-  id: Flute
-  equipment: Flute
-
-- type: startingGear
   id: Flute
   storage:
     back:
     - FluteInstrument
 
 - type: loadout
-  id: Recorder
-  equipment: Recorder
-
-- type: startingGear
   id: Recorder
   storage:
     back:
     - RecorderInstrument
 
 - type: loadout
-  id: PanFlute
-  equipment: PanFlute
-
-- type: startingGear
   id: PanFlute
   storage:
     back:
     - PanFluteInstrument
 
 - type: loadout
-  id: Ocarina
-  equipment: Ocarina
-
-- type: startingGear
   id: Ocarina
   storage:
     back:
     - OcarinaInstrument
 
 - type: loadout
-  id: Bagpipe
-  equipment: Bagpipe
-
-- type: startingGear
   id: Bagpipe
   storage:
     back:
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml
index 7bb50f9a039..533df79805d 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml
@@ -33,26 +33,18 @@
 # Basic
 - type: loadout
   id: EmergencyOxygen
-  equipment: EmergencyOxygen
   effects:
   - !type:GroupLoadoutEffect
     proto: OxygenBreather
-
-- type: startingGear
-  id: EmergencyOxygen
   storage:
     back:
     - BoxSurvival
 
 - type: loadout
   id: EmergencyNitrogen
-  equipment: EmergencyNitrogen
   effects:
   - !type:GroupLoadoutEffect
     proto: NitrogenBreather
-
-- type: startingGear
-  id: EmergencyNitrogen
   storage:
     back:
     - BoxSurvivalNitrogen
@@ -60,26 +52,18 @@
 # Clown
 - type: loadout
   id: EmergencyOxygenClown
-  equipment: EmergencyOxygenClown
   effects:
   - !type:GroupLoadoutEffect
     proto: OxygenBreather
-
-- type: startingGear
-  id: EmergencyOxygenClown
   storage:
     back:
     - BoxHug
 
 - type: loadout
   id: EmergencyNitrogenClown
-  equipment: EmergencyNitrogenClown
   effects:
   - !type:GroupLoadoutEffect
     proto: NitrogenBreather
-
-- type: startingGear
-  id: EmergencyNitrogenClown
   storage:
     back:
     - BoxHugNitrogen
@@ -87,26 +71,18 @@
 # Engineering / Extended
 - type: loadout
   id: EmergencyOxygenExtended
-  equipment: EmergencyOxygenExtended
   effects:
   - !type:GroupLoadoutEffect
     proto: OxygenBreather
-
-- type: startingGear
-  id: EmergencyOxygenExtended
   storage:
     back:
     - BoxSurvivalEngineering
 
 - type: loadout
   id: EmergencyNitrogenExtended
-  equipment: EmergencyNitrogenExtended
   effects:
   - !type:GroupLoadoutEffect
     proto: NitrogenBreather
-
-- type: startingGear
-  id: EmergencyNitrogenExtended
   storage:
     back:
     - BoxSurvivalEngineeringNitrogen
@@ -114,26 +90,18 @@
 # Medical
 - type: loadout
   id: EmergencyOxygenMedical
-  equipment: EmergencyOxygenMedical
   effects:
   - !type:GroupLoadoutEffect
     proto: OxygenBreather
-
-- type: startingGear
-  id: EmergencyOxygenMedical
   storage:
     back:
     - BoxSurvivalMedical
 
 - type: loadout
   id: EmergencyNitrogenMedical
-  equipment: EmergencyNitrogenMedical
   effects:
   - !type:GroupLoadoutEffect
     proto: NitrogenBreather
-
-- type: startingGear
-  id: EmergencyNitrogenMedical
   storage:
     back:
     - BoxSurvivalMedicalNitrogen
@@ -141,26 +109,18 @@
 # Security
 - type: loadout
   id: EmergencyOxygenSecurity
-  equipment: EmergencyOxygenSecurity
   effects:
   - !type:GroupLoadoutEffect
     proto: OxygenBreather
-
-- type: startingGear
-  id: EmergencyOxygenSecurity
   storage:
     back:
     - BoxSurvivalSecurity
 
 - type: loadout
   id: EmergencyNitrogenSecurity
-  equipment: EmergencyNitrogenSecurity
   effects:
   - !type:GroupLoadoutEffect
     proto: NitrogenBreather
-
-- type: startingGear
-  id: EmergencyNitrogenSecurity
   storage:
     back:
     - BoxSurvivalSecurityNitrogen
@@ -168,26 +128,18 @@
 # Syndicate
 - type: loadout
   id: EmergencyOxygenSyndicate
-  equipment: EmergencyOxygenSyndicate
   effects:
   - !type:GroupLoadoutEffect
     proto: OxygenBreather
-
-- type: startingGear
-  id: EmergencyOxygenSyndicate
   storage:
     back:
     - BoxSurvivalSyndicate
 
 - type: loadout
   id: EmergencyNitrogenSyndicate
-  equipment: EmergencyNitrogenSyndicate
   effects:
   - !type:GroupLoadoutEffect
     proto: NitrogenBreather
-
-- type: startingGear
-  id: EmergencyNitrogenSyndicate
   storage:
     back:
     - BoxSurvivalSyndicateNitrogen
@@ -197,62 +149,42 @@
 # Full Tank Equipped
 - type: loadout
   id: LoadoutSpeciesEVANitrogen
-  equipment: GearEVANitrogen
   effects:
   - !type:GroupLoadoutEffect
     proto: EffectSpeciesVox
-
-- type: startingGear
-  id: GearEVANitrogen
   equipment:
     suitstorage: NitrogenTankFilled
 
 # Tank Harness
 - type: loadout
   id: LoadoutTankHarness
-  equipment: GearTankHarness
   effects:
   - !type:GroupLoadoutEffect
     proto: EffectSpeciesVox
-
-- type: startingGear
-  id: GearTankHarness
   equipment:
     outerClothing: ClothingOuterVestTank
 
 # Breaths Tool On Face
 - type: loadout
   id: LoadoutSpeciesBreathTool
-  equipment: GearSpeciesBreathTool
   effects:
   - !type:GroupLoadoutEffect
     proto: EffectSpeciesVox
-
-- type: startingGear
-  id: GearSpeciesBreathTool
   equipment:
     mask: ClothingMaskBreath
 
 - type: loadout
   id: LoadoutSpeciesBreathToolMedical
-  equipment: GearSpeciesBreathToolMedical
   effects:
   - !type:GroupLoadoutEffect
     proto: EffectSpeciesVox
-
-- type: startingGear
-  id: GearSpeciesBreathToolMedical
   equipment:
     mask: ClothingMaskBreathMedical
 
 - type: loadout
   id: LoadoutSpeciesBreathToolSecurity
-  equipment: GearSpeciesBreathToolSecurity
   effects:
   - !type:GroupLoadoutEffect
     proto: EffectSpeciesVox
-
-- type: startingGear
-  id: GearSpeciesBreathToolSecurity
   equipment:
     mask: ClothingMaskGasSecurity
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index a4e913a20a7..c91108124f9 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -10,20 +10,12 @@
 
 # Plushies
 - type: loadout
-  id: PlushieLizard
-  equipment: PlushieLizard
-
-- type: startingGear
   id: PlushieLizard
   storage:
     back:
     - PlushieLizard
 
 - type: loadout
-  id: PlushieSpaceLizard
-  equipment: PlushieSpaceLizard
-
-- type: startingGear
   id: PlushieSpaceLizard
   storage:
     back:
@@ -31,50 +23,30 @@
 
 # Smokeables
 - type: loadout
-  id: Lighter
-  equipment: Lighter
-
-- type: startingGear
   id: Lighter
   storage:
     back:
     - Lighter
 
 - type: loadout
-  id: CigPackGreen
-  equipment: CigPackGreen
-
-- type: startingGear
   id: CigPackGreen
   storage:
     back:
     - CigPackGreen
 
 - type: loadout
-  id: CigPackRed
-  equipment: CigPackRed
-
-- type: startingGear
   id: CigPackRed
   storage:
     back:
     - CigPackRed
 
 - type: loadout
-  id: CigPackBlue
-  equipment: CigPackBlue
-
-- type: startingGear
   id: CigPackBlue
   storage:
     back:
     - CigPackBlue
 
 - type: loadout
-  id: CigPackBlack
-  equipment: CigPackBlack
-
-- type: startingGear
   id: CigPackBlack
   storage:
     back:
@@ -82,136 +54,84 @@
 
 - type: loadout
   id: CigarCase
-  equipment: CigarCase
   effects:
   - !type:GroupLoadoutEffect
     proto: Command
-
-- type: startingGear
-  id: CigarCase
   storage:
     back:
     - CigarCase
 
 - type: loadout
   id: CigarGold
-  equipment: CigarGold
   effects:
   - !type:GroupLoadoutEffect
     proto: Command
-
-- type: startingGear
-  id: CigarGold
   storage:
     back:
     - CigarGold
 
 # Pins
 - type: loadout
-  id: ClothingNeckLGBTPin
-  equipment: ClothingNeckLGBTPin
-
-- type: startingGear
   id: ClothingNeckLGBTPin
   storage:
     back:
     - ClothingNeckLGBTPin
 
 - type: loadout
-  id: ClothingNeckAromanticPin
-  equipment: ClothingNeckAromanticPin
-
-- type: startingGear
   id: ClothingNeckAromanticPin
   storage:
     back:
     - ClothingNeckAromanticPin
 
 - type: loadout
-  id: ClothingNeckAsexualPin
-  equipment: ClothingNeckAsexualPin
-
-- type: startingGear
   id: ClothingNeckAsexualPin
   storage:
     back:
     - ClothingNeckAsexualPin
 
 - type: loadout
-  id: ClothingNeckBisexualPin
-  equipment: ClothingNeckBisexualPin
-
-- type: startingGear
   id: ClothingNeckBisexualPin
   storage:
     back:
     - ClothingNeckBisexualPin
 
 - type: loadout
-  id: ClothingNeckIntersexPin
-  equipment: ClothingNeckIntersexPin
-
-- type: startingGear
   id: ClothingNeckIntersexPin
   storage:
     back:
     - ClothingNeckIntersexPin
 
 - type: loadout
-  id: ClothingNeckLesbianPin
-  equipment: ClothingNeckLesbianPin
-
-- type: startingGear
   id: ClothingNeckLesbianPin
   storage:
     back:
     - ClothingNeckLesbianPin
 
 - type: loadout
-  id: ClothingNeckNonBinaryPin
-  equipment: ClothingNeckNonBinaryPin
-
-- type: startingGear
   id: ClothingNeckNonBinaryPin
   storage:
     back:
     - ClothingNeckNonBinaryPin
 
 - type: loadout
-  id: ClothingNeckPansexualPin
-  equipment: ClothingNeckPansexualPin
-
-- type: startingGear
   id: ClothingNeckPansexualPin
   storage:
     back:
     - ClothingNeckPansexualPin
 
 - type: loadout
-  id: ClothingNeckTransPin
-  equipment: ClothingNeckTransPin
-
-- type: startingGear
   id: ClothingNeckTransPin
   storage:
     back:
     - ClothingNeckTransPin
 
 - type: loadout
-  id: ClothingNeckAutismPin
-  equipment: ClothingNeckAutismPin
-
-- type: startingGear
   id: ClothingNeckAutismPin
   storage:
     back:
     - ClothingNeckAutismPin
 
 - type: loadout
-  id: ClothingNeckGoldAutismPin
-  equipment: ClothingNeckGoldAutismPin
-
-- type: startingGear
   id: ClothingNeckGoldAutismPin
   storage:
     back:
diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml
index ae0df905c79..54a256a3d5b 100644
--- a/Resources/Prototypes/Maps/train.yml
+++ b/Resources/Prototypes/Maps/train.yml
@@ -38,8 +38,9 @@
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            MedicalDoctor: [ 3, 3 ]
+            MedicalDoctor: [ 2, 2 ]
             MedicalIntern: [ 2, 2 ]
+            Paramedic: [ 1, 1 ]
             #science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 4, 4 ]
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index ec1eb5e8372..f969e3af731 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -362,8 +362,8 @@
     state: ian
 
 - type: stealTargetGroup
-  id: AnimalBingus
-  name: Bingus
+  id: AnimalNamedCat
+  name: CMO's Cat
   sprite:
     sprite: Mobs/Pets/bingus.rsi
     state: bingus
diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index 89334f990bd..26e598f1215 100644
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -436,7 +436,7 @@
   id: BingusStealObjective
   components:
   - type: StealCondition
-    stealGroup: AnimalBingus
+    stealGroup: AnimalNamedCat
   - type: Objective
     difficulty: 1
 
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index 8028b6376c8..1aa03bf4c93 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -1795,6 +1795,10 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.25
 
 - type: reagent
@@ -1822,6 +1826,10 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.15
 
 - type: reagent
@@ -1849,6 +1857,10 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.15
 
 - type: reagent
@@ -1876,6 +1888,10 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.25
 
 - type: reagent
@@ -1903,6 +1919,10 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.15
 
 - type: reagent
@@ -1930,4 +1950,8 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.25
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 52a01d973f6..3f9fb7b53d2 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -12,6 +12,10 @@
       effects:
       - !type:SatiateThirst
         factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
       - !type:AdjustReagent
         reagent: Theobromine
         amount: 0.05
@@ -96,6 +100,15 @@
   metamorphicMaxFillLevels: 1
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
 
 - type: reagent
   id: GreenTea
@@ -145,6 +158,15 @@
   metamorphicMaxFillLevels: 5
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
 
 - type: reagent
   id: IcedGreenTea
@@ -322,6 +344,10 @@
       effects:
       - !type:SatiateThirst
         factor: 6
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 3.0
+        type: Remove
     Poison:
       effects:
       - !type:HealthChange
@@ -354,6 +380,15 @@
   metamorphicMaxFillLevels: 1
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
 
 - type: reagent
   id: Tea
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index d78b0351cee..49290677a1e 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -13,6 +13,15 @@
   metamorphicMaxFillLevels: 5
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 1.0
+        type: Remove
 
 - type: reagent
   id: RoyRogers
@@ -68,6 +77,10 @@
       effects:
       - !type:SatiateThirst
         factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
       - !type:AdjustReagent
         reagent: Theobromine
         amount: 0.1
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index ad0d39a1346..4dcef67f77d 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -891,6 +891,10 @@
       - !type:GenericStatusEffect
         key: Stutter
         component: StutteringAccent
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 10
+        type: Remove
       - !type:ResetNarcolepsy
         conditions:
         - !type:ReagentThreshold
@@ -912,6 +916,10 @@
   metabolisms:
     Medicine:
       effects:
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 10
+        type: Remove
       - !type:ResetNarcolepsy
         conditions:
         - !type:ReagentThreshold
@@ -1284,3 +1292,82 @@
         - "psicodine-effect-anxieties-wash-away"
         - "psicodine-effect-at-peace"
         probability: 0.2
+
+- type: reagent
+  id: PotassiumIodide
+  name: reagent-name-potassium-iodide
+  group: Medicine
+  desc: reagent-desc-potassium-iodide
+  physicalDesc: reagent-physical-desc-grainy
+  flavor: medicine
+  color: "#baa15d"
+  metabolisms:
+    Medicine:
+      effects:
+      - !type:GenericStatusEffect
+        key: RadiationProtection
+        component: RadiationProtection
+        time: 2
+        type: Add
+        refresh: false
+      - !type:HealthChange
+        conditions:
+          - !type:ReagentThreshold
+            min: 20
+        damage:
+          types:
+            Poison: 1
+
+- type: reagent
+  id: Haloperidol
+  name: reagent-name-haloperidol
+  group: Medicine
+  desc: reagent-desc-haloperidol
+  physicalDesc: reagent-physical-desc-crystalline
+  flavor: medicine
+  color: "#27870a"
+  metabolisms:
+    Medicine:
+      effects:
+      - !type:Emote
+        emote: Yawn
+        showInChat: true
+        probability: 0.1
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        component: Drowsiness
+        time: 4
+        type: Add
+        refresh: false
+      - !type:GenericStatusEffect
+        key: Jitter
+        time: 4.0
+        type: Remove
+      - !type:GenericStatusEffect
+        key: SeeingRainbows
+        time: 10.0
+        type: Remove
+      - !type:AdjustReagent
+        reagent: Desoxyephedrine
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: Ephedrine
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: Stimulants
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: THC
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: SpaceDrugs
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: Bananadine
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: SpaceGlue
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: MindbreakerToxin
+        amount: -3.0
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index bf311f23e7b..8e73eb13955 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -40,6 +40,14 @@
         key: KnockedDown
         time: 3
         type: Remove
+      - !type:GenericStatusEffect
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Haloperidol
+          max: 0.01
+        key: Drowsiness
+        time: 10
+        type: Remove
     Medicine:
       effects:
       - !type:ResetNarcolepsy
@@ -80,6 +88,14 @@
         key: KnockedDown
         time: 1
         type: Remove
+      - !type:GenericStatusEffect
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Haloperidol
+          max: 0.01
+        key: Drowsiness
+        time: 10
+        type: Remove
       - !type:PopupMessage
         visualType: Medium
         messages: ["ephedrine-effect-tight-pain", "ephedrine-effect-heart-pounds"]
@@ -140,6 +156,14 @@
         key: ForcedSleep
         time: 3
         type: Remove
+      - !type:GenericStatusEffect
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Haloperidol
+          max: 0.01
+        key: Drowsiness
+        time: 10
+        type: Remove
     Medicine:
       metabolismRate: 1.0
       effects:
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index 7f4ebc1a751..a83836c5ffd 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -56,18 +56,19 @@
   metabolisms:
     Poison:
       effects:
+      - !type:Emote
+        emote: Yawn
+        showInChat: true
+        probability: 0.1
       - !type:MovespeedModifier
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
       - !type:GenericStatusEffect
-        conditions:
-        - !type:ReagentThreshold
-          reagent: ChloralHydrate
-          min: 10
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
+        key: Drowsiness
+        component: Drowsiness
+        time: 4
         type: Add
+        refresh: false
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 3c750e01902..fff0e7db9f3 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -576,7 +576,7 @@
   time: 30
   solids:
     FoodDoughFlat: 1
-    FoodAmbrosiaVulgaris: 3
+    LeavesCannabis: 2
     FoodCheeseSlice: 1
     FoodTomato: 1
 
diff --git a/Resources/Prototypes/Recipes/Crafting/web.yml b/Resources/Prototypes/Recipes/Crafting/web.yml
index a68661fdf4e..4c48cba6f99 100644
--- a/Resources/Prototypes/Recipes/Crafting/web.yml
+++ b/Resources/Prototypes/Recipes/Crafting/web.yml
@@ -26,8 +26,8 @@
     tags:
     - SpiderCraft
   icon:
-    sprite: Clothing/OuterClothing/WinterCoats/coatweb.rsi
-    state: icon
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    state: WEB-icon
   objectType: Item
 
 - type: construction
diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml
index b78703942e1..4690055a9fd 100644
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -974,4 +974,12 @@
   completetime: 4
   materials:
     Steel: 100
-    Glass: 500
\ No newline at end of file
+    Glass: 500
+
+- type: latheRecipe
+  id: CutterMachineCircuitboard
+  result: CutterMachineCircuitboard
+  completetime: 4
+  materials:
+    Steel: 100
+    Glass: 500
diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml
index 6460c745fa3..c414bfad525 100644
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -134,6 +134,7 @@
 - type: latheRecipe
   id: Medkit
   result: Medkit
+  name: lathe-recipe-Medkit-name
   completetime: 2
   materials:
     Plastic: 300
@@ -141,6 +142,7 @@
 - type: latheRecipe
   id: MedkitBurn
   result: MedkitBurn
+  name: lathe-recipe-MedkitBurn-name
   completetime: 2
   materials:
     Plastic: 300
@@ -148,6 +150,7 @@
 - type: latheRecipe
   id: MedkitToxin
   result: MedkitToxin
+  name: lathe-recipe-MedkitToxin-name
   completetime: 2
   materials:
     Plastic: 300
@@ -155,6 +158,7 @@
 - type: latheRecipe
   id: MedkitO2
   result: MedkitO2
+  name: lathe-recipe-MedkitO2-name
   completetime: 2
   materials:
     Plastic: 300
@@ -162,6 +166,7 @@
 - type: latheRecipe
   id: MedkitBrute
   result: MedkitBrute
+  name: lathe-recipe-MedkitBrute-name
   completetime: 2
   materials:
     Plastic: 300
@@ -169,6 +174,7 @@
 - type: latheRecipe
   id: MedkitAdvanced
   result: MedkitAdvanced
+  name: lathe-recipe-MedkitAdvanced-name
   completetime: 2
   materials:
     Plastic: 300
@@ -176,6 +182,7 @@
 - type: latheRecipe
   id: MedkitRadiation
   result: MedkitRadiation
+  name: lathe-recipe-MedkitRadiation-name
   completetime: 2
   materials:
     Plastic: 300
@@ -183,6 +190,7 @@
 - type: latheRecipe
   id: MedkitCombat
   result: MedkitCombat
+  name: lathe-recipe-MedkitCombat-name
   completetime: 2
   materials:
     Plastic: 300
diff --git a/Resources/Prototypes/Recipes/Lathes/tiles.yml b/Resources/Prototypes/Recipes/Lathes/tiles.yml
new file mode 100644
index 00000000000..8773dd245cd
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Lathes/tiles.yml
@@ -0,0 +1,363 @@
+- type: latheRecipe
+  id: FloorTileItemDark
+  result: FloorTileItemDark
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkDiagonalMini
+  result: FloorTileItemDarkDiagonalMini
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkDiagonal
+  result: FloorTileItemDarkDiagonal
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkHerringbone
+  result: FloorTileItemDarkHerringbone
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkMini
+  result: FloorTileItemDarkMini
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkMono
+  result: FloorTileItemDarkMono
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkPavement
+  result: FloorTileItemDarkPavement
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkPavementVertical
+  result: FloorTileItemDarkPavementVertical
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkOffset
+  result: FloorTileItemDarkOffset
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelCheckerDark
+  result: FloorTileItemSteelCheckerDark
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteel
+  result: FloorTileItemSteel
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelOffset
+  result: FloorTileItemSteelOffset
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelDiagonalMini
+  result: FloorTileItemSteelDiagonalMini
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelDiagonal
+  result: FloorTileItemSteelDiagonal
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelHerringbone
+  result: FloorTileItemSteelHerringbone
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelMini
+  result: FloorTileItemSteelMini
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelMono
+  result: FloorTileItemSteelMono
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelPavement
+  result: FloorTileItemSteelPavement
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelPavementVertical
+  result: FloorTileItemSteelPavementVertical
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhite
+  result: FloorTileItemWhite
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhiteOffset
+  result: FloorTileItemWhiteOffset
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhiteDiagonalMini
+  result: FloorTileItemWhiteDiagonalMini
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhiteDiagonal
+  result: FloorTileItemWhiteDiagonal
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhiteHerringbone
+  result: FloorTileItemWhiteHerringbone
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhiteMini
+  result: FloorTileItemWhiteMini
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhiteMono
+  result: FloorTileItemWhiteMono
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhitePavement
+  result: FloorTileItemWhitePavement
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhitePavementVertical
+  result: FloorTileItemWhitePavementVertical
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelCheckerLight
+  result: FloorTileItemSteelCheckerLight
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+# Other steel
+- type: latheRecipe
+  id: FloorTileItemGratingMaint
+  result: FloorTileItemGratingMaint
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemTechmaint
+  result: FloorTileItemTechmaint
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelMaint
+  result: FloorTileItemSteelMaint
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+# Wood
+- type: latheRecipe
+  id: FloorTileItemWood
+  result: FloorTileItemWood
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Wood: 25
+
+- type: latheRecipe
+  id: FloorTileItemWoodLarge
+  result: FloorTileItemWoodLarge
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Wood: 25
+
+- type: latheRecipe
+  id: FloorTileItemWoodPattern
+  result: FloorTileItemWoodPattern
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Wood: 25
+
+# Concrete
+- type: latheRecipe
+  id: FloorTileItemConcrete
+  result: FloorTileItemConcrete
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemConcreteMono
+  result: FloorTileItemConcreteMono
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemConcreteSmooth
+  result: FloorTileItemConcreteSmooth
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemGrayConcrete
+  result: FloorTileItemGrayConcrete
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemGrayConcreteMono
+  result: FloorTileItemGrayConcreteMono
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemGrayConcreteSmooth
+  result: FloorTileItemGrayConcreteSmooth
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemOldConcrete
+  result: FloorTileItemOldConcrete
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemOldConcreteMono
+  result: FloorTileItemOldConcreteMono
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemOldConcreteSmooth
+  result: FloorTileItemOldConcreteSmooth
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
index 2e9b1d4f854..a99015fe90b 100644
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -636,3 +636,29 @@
       catalyst: true
   products:
     Happiness: 4
+
+- type: reaction
+  id: PotassiumIodide
+  reactants:
+    Potassium:
+      amount: 1
+    Iodine:
+      amount: 1
+  products:
+    PotassiumIodide: 2
+
+- type: reaction
+  id: Haloperidol
+  reactants:
+    Aluminium:
+      amount: 1
+    Chlorine:
+      amount: 1
+    Fluorine:
+      amount: 1
+    Oil:
+      amount: 1
+    PotassiumIodide:
+      amount: 1
+  products:
+    Haloperidol: 5
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
index d54382d77de..3d38376a1ab 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -4,19 +4,26 @@
   description: job-description-qm
   playTimeTracker: JobQuartermaster
   requirements:
+    - !type:RoleTimeRequirement
+      role: JobCargoTechnician
+      time: 21600 #6 hrs
     - !type:RoleTimeRequirement
       role: JobSalvageSpecialist
-      time: 18000 #5 hrs # Sunrise-RoleTime
+      time: 10800 #3 hrs
     - !type:DepartmentTimeRequirement
       department: Cargo
-      time: 36000 #10 hrs # Sunrise-RoleTime
+      time: 36000 #10 hours
+    - !type:OverallPlaytimeRequirement
+      time: 144000 #40 hrs
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10
   startingGear: QuartermasterGear
   icon: "JobIconQuarterMaster"
   supervisors: job-supervisors-captain
-  radioBold: true
   canBeAntag: false
-  displayWeight: 40  # Sunrise
+  radioBold: true # Sunrise-Edit
+  displayWeight: 40  # Sunrise-Edit
   access:
   - Cargo
   - Salvage
@@ -32,7 +39,7 @@
     components:
       - type: CommandStaff
   speciesBlacklist:
-  - Vox
+  - Vox # Sunrise-Edit
 
 - type: startingGear
   id: QuartermasterGear
diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
index b9f346465d4..d8b76e310ab 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -6,24 +6,27 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 36000 #10 hrs # Sunrise-RoleTime
+      time: 54000 # 15 hours
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 36000 #10 hrs # Sunrise-RoleTime
+      time: 54000 # 15 hours
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 36000 #10 hrs # Sunrise-RoleTime
-    - !type:OverallPlaytimeRequirement
-      time: 72000 #20 hrs # Sunrise-RoleTime
+      time: 54000 # 15 hours
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 54000 # 15 hours
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 20
   startingGear: CaptainGear
   icon: "JobIconCaptain"
   requireAdminNotify: true
   joinNotifyCrew: true
   supervisors: job-supervisors-centcom
-  radioBold: true
   canBeAntag: false
-  displayWeight: 100  # Sunrise
+  displayWeight: 100 # Sunrise-Edit
+  radioBold: true # Sunrise-Edit
   accessGroups:
   - AllAccess
   special:
@@ -33,7 +36,7 @@
     components:
       - type: CommandStaff
   speciesBlacklist:
-  - Vox
+  - Vox # Sunrise-Edit
 
 - type: startingGear
   id: CaptainGear
@@ -46,5 +49,5 @@
   storage:
     back:
     - Flash
-    - Telebaton
+    - Telebaton # Sunrise-Edit
     # - StationCharter
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index c949aa37cbf..1cf875089f6 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -6,23 +6,26 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 18000 #5 hrs # Sunrise-RoleTime
+      time: 36000 # 10 hours
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 18000 #5 hrs # Sunrise-RoleTime
+      time: 36000 # 10 hours
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 18000 #5 hrs # Sunrise-RoleTime
-    - !type:OverallPlaytimeRequirement
-      time: 36000 #10 hrs # Sunrise-RoleTime
+      time: 36000 # 10 hrs
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 36000 # 10 hours
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 20
   startingGear: HoPGear
   icon: "JobIconHeadOfPersonnel"
   requireAdminNotify: true
   supervisors: job-supervisors-captain
-  radioBold: true
   canBeAntag: false
-  displayWeight: 90  # Sunrise
+  radioBold: true # Sunrise-Edit
+  displayWeight: 90 # Sunrise-Edit
   access:
   - Command
   - HeadOfPersonnel
@@ -57,7 +60,7 @@
     components:
       - type: CommandStaff
   speciesBlacklist:
-  - Vox
+  - Vox # Sunrise-Edit
 
 - type: startingGear
   id: HoPGear
@@ -70,4 +73,4 @@
   storage:
     back:
     - Flash
-    - Telebaton
+    - Telebaton # Sunrise-Edit
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
index 190ea5b1ac8..689686ce385 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -6,17 +6,24 @@
   requirements:
     - !type:RoleTimeRequirement
       role: JobAtmosphericTechnician
-      time: 18000 #5 hrs # Sunrise-RoleTime
+      time: 21600 #6 hrs
+    - !type:RoleTimeRequirement
+      role: JobStationEngineer
+      time: 21600 #6 hrs
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 36000 #10 hrs # Sunrise-RoleTime
+      time: 36000 #10 hrs
+    - !type:OverallPlaytimeRequirement
+      time: 144000 #40 hrs
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10
   startingGear: ChiefEngineerGear
   icon: "JobIconChiefEngineer"
   requireAdminNotify: true
   supervisors: job-supervisors-captain
-  radioBold: true
-  displayWeight: 70  # Sunrise
+  radioBold: true # Sunrise-Edit
+  displayWeight: 70 # Sunrise-Edit
   canBeAntag: false
   access:
   - Maintenance
@@ -34,17 +41,17 @@
     components:
       - type: CommandStaff
   speciesBlacklist:
-  - Vox
+  - Vox # Sunrise-Edit
 
 - type: startingGear
   id: ChiefEngineerGear
   equipment:
     id: CEPDA
-    head: ClothingHeadHatHardhatWhite
+    head: ClothingHeadHatHardhatWhite # Sunrise-Edit
     eyes: ClothingEyesGlassesMeson
     ears: ClothingHeadsetCE
     belt: ClothingBeltUtilityEngineering
   storage:
     back:
     - Flash
-    - Telebaton
+    - Telebaton # Sunrise-Edit
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index 0b26b9c0ce9..08e088c1874 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -8,18 +8,25 @@
   requirements:
     - !type:RoleTimeRequirement
       role: JobChemist
-      time: 7200 #2 hrs # Sunrise-RoleTime
+      time: 10800 #3 hrs
+    - !type:RoleTimeRequirement
+      role: JobMedicalDoctor
+      time: 21600 #6 hrs
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 36000 #10 hrs # Sunrise-RoleTime
+      time: 36000 #10 hrs
+    - !type:OverallPlaytimeRequirement
+      time: 144000 #40 hrs
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10
   startingGear: CMOGear
   icon: "JobIconChiefMedicalOfficer"
   requireAdminNotify: true
   supervisors: job-supervisors-captain
-  radioBold: true
   canBeAntag: false
-  displayWeight: 60  # Sunrise
+  radioBold: true # Sunrise-Edit
+  displayWeight: 60 # Sunrise-Edit
   access:
   - Medical
   - Command
@@ -35,7 +42,7 @@
     components:
       - type: CommandStaff
   speciesBlacklist:
-  - Vox
+  - Vox # Sunrise-Edit
 
 - type: startingGear
   id: CMOGear
@@ -46,4 +53,4 @@
   storage:
     back:
     - Flash
-    - Telebaton
+    - Telebaton # Sunrise-Edit
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index d89b88bfffc..7a23fa9e3f9 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -6,15 +6,19 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Science
-      time: 36000 #10 hrs # Sunrise-RoleTime
+      time: 36000 #10 hrs
+    - !type:OverallPlaytimeRequirement
+      time: 144000 #40 hrs
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10
   startingGear: ResearchDirectorGear
   icon: "JobIconResearchDirector"
   requireAdminNotify: true
   supervisors: job-supervisors-captain
-  radioBold: true
   canBeAntag: false
-  displayWeight: 50  # Sunrise
+  radioBold: true # Sunrise-Edit
+  displayWeight: 50 # Sunrise-Edit
   access:
   - Research
   - Command
@@ -29,16 +33,16 @@
     components:
       - type: CommandStaff
   speciesBlacklist:
-  - Vox
+  - Vox # Sunrise-Edit
 
 - type: startingGear
   id: ResearchDirectorGear
   equipment:
     id: RnDPDA
-    pocket1: HandheldRoboAnalyzer
-    pocket2: Nanopaste10
+    pocket1: HandheldRoboAnalyzer # Sunrise-Edit
+    pocket2: Nanopaste10 # Sunrise-Edit
     ears: ClothingHeadsetRD
   storage:
     back:
     - Flash
-    - Telebaton
+    - Telebaton # Sunrise-Edit
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index a691fc17190..ed794fcf863 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -6,18 +6,25 @@
   requirements:
     - !type:RoleTimeRequirement
       role: JobWarden
-      time: 18000 #5 hrs # Sunrise-RoleTime
+      time: 10800 #3 hrs
+    - !type:RoleTimeRequirement
+      role: JobSecurityOfficer
+      time: 36000 #10 hrs
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 54000 #15 hrs # Sunrise-RoleTime
+      time: 108000 # 30 hrs
+    - !type:OverallPlaytimeRequirement
+      time: 144000 #40 hrs
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10
   startingGear: HoSGear
   icon: "JobIconHeadOfSecurity"
   requireAdminNotify: true
   supervisors: job-supervisors-captain
-  radioBold: true
   canBeAntag: false
-  displayWeight: 80  # Sunrise
+  radioBold: true # Sunrise-Edit
+  displayWeight: 80 # Sunrise-Edit
   access:
   - HeadOfSecurity
   - Command
@@ -36,7 +43,7 @@
     components:
       - type: CommandStaff
   speciesBlacklist:
-  - Vox
+  - Vox # Sunrise-Edit
 
 - type: startingGear
   id: HoSGear
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index 9b589c57cd7..6a49a010dfc 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -1,5 +1,6 @@
 - type: department
   id: Cargo
+  name: department-Cargo
   description: department-Cargo-description
   color: "#A46106"
   roles:
@@ -10,6 +11,7 @@
 
 - type: department
   id: Civilian
+  name: department-Civilian
   description: department-Civilian-description
   color: "#9FED58"
   weight: -10
@@ -39,6 +41,7 @@
 
 - type: department
   id: Command
+  name: department-Command
   description: department-Command-description
   color: "#052EED" # Sunrise-Edit
   roles:
@@ -55,6 +58,7 @@
 
 - type: department
   id: Engineering
+  name: department-Engineering
   description: department-Engineering-description
   color: "#EFB341"
   weight: 10  # Sunrise-weights
@@ -68,6 +72,7 @@
 
 - type: department
   id: Medical
+  name: department-Medical
   description: department-Medical-description
   color: "#52B4E9"
   roles:
@@ -82,6 +87,7 @@
 
 - type: department
   id: Security
+  name: department-Security
   description: department-Security-description
   color: "#DE3A3A"
   weight: 20
@@ -99,6 +105,7 @@
 
 - type: department
   id: Science
+  name: department-Science
   description: department-Science-description
   color: "#D381C9"
   roles:
@@ -110,6 +117,7 @@
 
 - type: department
   id: Specific
+  name: department-Specific
   description: department-Specific-description
   color: "#9FED58"
   weight: 5  # Sunrise-weights
diff --git a/Resources/Prototypes/Shaders/shaders.yml b/Resources/Prototypes/Shaders/shaders.yml
index e286dcb7a41..136821efbb8 100644
--- a/Resources/Prototypes/Shaders/shaders.yml
+++ b/Resources/Prototypes/Shaders/shaders.yml
@@ -57,6 +57,11 @@
   kind: source
   path: "/Textures/Shaders/drunk.swsl"
 
+- type: shader
+  id: Drowsiness
+  kind: source
+  path: "/Textures/Shaders/radial_blur.swsl"
+
 - type: shader
   id: Texture
   kind: source
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index 01bd916a672..de03fcba196 100644
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -1,19 +1,109 @@
 - type: stack
+  id: FloorTileDark
+  name: dark tile
+  spawn: FloorTileItemDark
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkDiagonalMini
+  name: dark steel diagonal mini tile
+  spawn: FloorTileItemDarkDiagonalMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkDiagonal
+  name: dark steel diagonal tile
+  spawn: FloorTileItemDarkDiagonal
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkHerringbone
+  name: dark steel herringbone
+  spawn: FloorTileItemDarkHerringbone
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkMini
+  name: dark steel mini tile
+  spawn: FloorTileItemDarkMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkMono
+  name: dark steel mono tile
+  spawn: FloorTileItemDarkMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkPavement
+  name: dark steel pavement
+  spawn: FloorTileItemDarkPavement
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkPavementVertical
+  name: dark steel vertical pavement
+  spawn: FloorTileItemDarkPavementVertical
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkOffset
+  name: offset dark steel tile
+  spawn: FloorTileItemDarkOffset
+  maxCount: 30
+
+- type: stack
   id: FloorTileSteel
   name: steel tile
   spawn: FloorTileItemSteel
   maxCount: 30
 
 - type: stack
-  id: FloorTileMetalDiamond
-  name: steel tile
-  spawn: FloorTileItemMetalDiamond
+  id: FloorTileSteelOffset
+  name: offset steel tile
+  spawn: FloorTileItemSteelOffset
   maxCount: 30
 
 - type: stack
-  id: FloorTileWood
-  name: wood floor
-  spawn: FloorTileItemWood
+  id: FloorTileSteelDiagonalMini
+  name: steel diagonal mini tile
+  spawn: FloorTileItemSteelDiagonalMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelDiagonal
+  name: steel diagonal tile
+  spawn: FloorTileItemSteelDiagonal
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelHerringbone
+  name: steel herringbone
+  spawn: FloorTileItemSteelHerringbone
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelMini
+  name: steel mini tile
+  spawn: FloorTileItemSteelMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelMono
+  name: steel mono tile
+  spawn: FloorTileItemSteelMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelPavement
+  name: steel pavement
+  spawn: FloorTileItemSteelPavement
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelPavementVertical
+  name: steel vertical pavement
+  spawn: FloorTileItemSteelPavementVertical
   maxCount: 30
 
 - type: stack
@@ -23,9 +113,75 @@
   maxCount: 30
 
 - type: stack
-  id: FloorTileDark
-  name: dark tile
-  spawn: FloorTileItemDark
+  id: FloorTileWhiteOffset
+  name: offset white steel tile
+  spawn: FloorTileItemWhiteOffset
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteDiagonalMini
+  name: white steel diagonal mini tile
+  spawn: FloorTileItemWhiteDiagonalMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteDiagonal
+  name: white steel diagonal tile
+  spawn: FloorTileItemWhiteDiagonal
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteHerringbone
+  name: white steel herringbone
+  spawn: FloorTileItemWhiteHerringbone
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteMini
+  name: white steel mini tile
+  spawn: FloorTileItemWhiteMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteMono
+  name: white steel mono tile
+  spawn: FloorTileItemWhiteMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhitePavement
+  name: white steel pavement
+  spawn: FloorTileItemWhitePavement
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhitePavementVertical
+  name: white steel vertical pavement
+  spawn: FloorTileItemWhitePavementVertical
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelCheckerDark
+  name: steel dark checker tile
+  spawn: FloorTileItemSteelCheckerDark
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelCheckerLight
+  name: steel light checker tile
+  spawn: FloorTileItemSteelCheckerLight
+  maxCount: 30
+
+- type: stack
+  id: FloorTileMetalDiamond
+  name: steel tile
+  spawn: FloorTileItemMetalDiamond
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWood
+  name: wood floor
+  spawn: FloorTileItemWood
   maxCount: 30
 
 - type: stack
@@ -322,10 +478,34 @@
   spawn: FloorTileItemGrayConcrete
   maxCount: 30
 
+- type: stack
+  id: FloorTileConcreteMono
+  name: concrete mono tile
+  spawn: FloorTileItemConcreteMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileConcreteSmooth
+  name: concrete smooth
+  spawn: FloorTileItemConcreteSmooth
+  maxCount: 30
+
 - type: stack
   id: FloorTileGrayConcrete
   name: gray concrete tile
-  spawn: FloorTileItemLaundry
+  spawn: FloorTileItemGrayConcrete
+  maxCount: 30
+
+- type: stack
+  id: FloorTileGrayConcreteMono
+  name: gray concrete mono tile
+  spawn: FloorTileItemGrayConcreteMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileGrayConcreteSmooth
+  name: gray concrete smooth
+  spawn: FloorTileItemGrayConcreteSmooth
   maxCount: 30
 
 - type: stack
@@ -334,6 +514,18 @@
   spawn: FloorTileItemOldConcrete
   maxCount: 30
 
+- type: stack
+  id: FloorTileOldConcreteMono
+  name: old concrete mono tile
+  spawn: FloorTileItemOldConcreteMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileOldConcreteSmooth
+  name: old concrete smooth
+  spawn: FloorTileItemOldConcreteSmooth
+  maxCount: 30
+
 - type: stack
   id: FloorTileSilver
   name: silver floor tile
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 53049d34757..9721aa08bc3 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -67,7 +67,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepFloor
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelMini
   heatCapacity: 10000
 
 - type: tile
@@ -85,7 +85,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepFloor
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelPavement
   heatCapacity: 10000
 
 - type: tile
@@ -103,7 +103,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepFloor
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelDiagonal
   heatCapacity: 10000
 
 - type: tile
@@ -115,7 +115,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepFloor
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelOffset
   heatCapacity: 10000
 
 - type: tile
@@ -133,7 +133,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelMono
   heatCapacity: 10000
 
 - type: tile
@@ -151,7 +151,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelPavementVertical
   heatCapacity: 10000
 
 - type: tile
@@ -169,7 +169,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelHerringbone
   heatCapacity: 10000
 
 - type: tile
@@ -187,7 +187,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelDiagonalMini
   heatCapacity: 10000
 
 - type: tile
@@ -285,7 +285,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhiteMini
   heatCapacity: 10000
 
 - type: tile
@@ -303,7 +303,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhitePavement
   heatCapacity: 10000
 
 - type: tile
@@ -321,7 +321,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhiteDiagonal
   heatCapacity: 10000
 
 - type: tile
@@ -333,7 +333,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhiteOffset
   heatCapacity: 10000
 
 - type: tile
@@ -351,7 +351,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhiteMono
   heatCapacity: 10000
 
 - type: tile
@@ -369,7 +369,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhitePavementVertical
   heatCapacity: 10000
 
 - type: tile
@@ -387,7 +387,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhiteHerringbone
   heatCapacity: 10000
 
 - type: tile
@@ -405,7 +405,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhiteDiagonalMini
   heatCapacity: 10000
 
 - type: tile
@@ -459,7 +459,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkMini
   heatCapacity: 10000
 
 - type: tile
@@ -477,7 +477,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkPavement
   heatCapacity: 10000
 
 - type: tile
@@ -495,7 +495,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkDiagonal
   heatCapacity: 10000
 
 - type: tile
@@ -507,7 +507,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkOffset
   heatCapacity: 10000
 
 - type: tile
@@ -525,7 +525,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkMono
   heatCapacity: 10000
 
 - type: tile
@@ -543,7 +543,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkPavementVertical
   heatCapacity: 10000
 
 - type: tile
@@ -561,7 +561,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkHerringbone
   heatCapacity: 10000
 
 - type: tile
@@ -579,7 +579,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkDiagonalMini
   heatCapacity: 10000
 
 - type: tile
@@ -936,7 +936,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemConcrete
+  itemDrop: FloorTileItemConcreteMono
   heatCapacity: 10000
   weather: true
 
@@ -955,7 +955,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemConcrete
+  itemDrop: FloorTileItemConcreteSmooth
   heatCapacity: 10000
   weather: true
 
@@ -993,7 +993,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemGrayConcrete
+  itemDrop: FloorTileItemGrayConcreteMono
   heatCapacity: 10000
   weather: true
 
@@ -1012,7 +1012,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemGrayConcrete
+  itemDrop: FloorTileItemGrayConcreteSmooth
   heatCapacity: 10000
   weather: true
 
@@ -1050,7 +1050,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemOldConcrete
+  itemDrop: FloorTileItemOldConcreteMono
   heatCapacity: 10000
   weather: true
 
@@ -1069,7 +1069,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemOldConcrete
+  itemDrop: FloorTileItemOldConcreteSmooth
   heatCapacity: 10000
   weather: true
 
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Blueshield/blueshield.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Blueshield/blueshield.yml
index 50eb2e62bf0..e410d2aae81 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Blueshield/blueshield.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Blueshield/blueshield.yml
@@ -1,50 +1,24 @@
 - type: loadout
-  id: BlueShieldBackpack
-  equipment: BlueShieldBackpack
-
-- type: startingGear
   id: BlueShieldBackpack
   equipment:
     back: ClothingBackpackBlueShield
 
 - type: loadout
-  id: BlueShieldSatchel
-  equipment: BlueShieldSatchel
-
-- type: startingGear
   id: BlueShieldSatchel
   equipment:
     back: ClothingBackpackSatchelBlueShield
 
 - type: loadout
-  id: BlueShieldDuffel
-  equipment: BlueShieldDuffel
-
-- type: startingGear
   id: BlueShieldDuffel
-  equipment:
-    back: ClothingBackpackDuffelBlueShield
-
-- type: loadout
-  id: BlueShieldJumpsuit
-  equipment: BlueShieldJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
-  id: BlueShieldJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitBlueShield
 
 - type: loadout
-  id: BlueShieldJumpskirt
-  equipment: BlueShieldJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: BlueShieldJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtBlueShield
+
+- type: loadout
+  id: BlueShieldJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitBlueShield
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/CentComm/centcom_operator.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/CentComm/centcom_operator.yml
index 9944eb8b06a..e304c71c70e 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/CentComm/centcom_operator.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/CentComm/centcom_operator.yml
@@ -1,65 +1,29 @@
 - type: loadout
-  id: CentCommOfficerJumpsuit
-  equipment: CentCommOfficerJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: CentCommOfficerJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCentcomOfficer
 
 - type: loadout
-  id: CentCommOfficerJumpskirt
-  equipment: CentCommOfficerJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: CentCommOfficerJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCentcomOfficer
 
 - type: loadout
-  id: CentCommOfficialJumpsuit
-  equipment: CentCommOfficialJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: CentCommOfficialJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCentcomOfficial
 
 - type: loadout
-  id: CentCommOfficialJumpskirt
-  equipment: CentCommOfficialJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: CentCommOfficialJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCentcomOfficial
 
 - type: loadout
-  id: HeadHatBeretCentcomNaval
-  equipment: HeadHatBeretCentcomNaval
-
-- type: startingGear
   id: HeadHatBeretCentcomNaval
   equipment:
     head: ClothingHeadHatBeretCentcomNaval
 
 - type: loadout
-  id: HeadHatCentcomcap
-  equipment: HeadHatCentcomcap
-
-- type: startingGear
   id: HeadHatCentcomcap
   equipment:
     head: ClothingHeadHatCentcomcap
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Civillian/barber.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Civillian/barber.yml
index be84a3991c8..9ec26d0ad01 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Civillian/barber.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Civillian/barber.yml
@@ -1,23 +1,9 @@
 - type: loadout
-  id: BarberJumpsuit
-  equipment: BarberJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: BarberJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitBarber
 
 - type: loadout
-  id: BarberJumpskirt
-  equipment: BarberJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: BarberJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtBarber
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Command/nanotrasenrepresentative.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Command/nanotrasenrepresentative.yml
index f86c7bd528b..638fc8f6707 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Command/nanotrasenrepresentative.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Command/nanotrasenrepresentative.yml
@@ -1,55 +1,26 @@
 #Uniforms
 - type: loadout
-  id: NanoTrasenRepresentativeJumpsuit
-  equipment: NanoTrasenRepresentativeJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: NanoTrasenRepresentativeJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitNtrep
-    
-- type: loadout
-  id: NanoTrasenRepresentativeJumpsuitFormal
-  equipment: NanoTrasenRepresentativeJumpsuitFormal
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
 
-- type: startingGear
+- type: loadout
   id: NanoTrasenRepresentativeJumpsuitFormal
   equipment:
     jumpsuit: ClothingUniformJumpsuitNtrepFormal
 
 - type: loadout
-  id: NanoTrasenRepresentativeJumpskirt
-  equipment: NanoTrasenRepresentativeJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: NanoTrasenRepresentativeJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtNtrep
 
 #outerClothing
 - type: loadout
-  id: NanoTrasenRepresentativeCoat
-  equipment: NanoTrasenRepresentativeCoat
-
-- type: startingGear
   id: NanoTrasenRepresentativeCoat
   equipment:
     outerClothing: ClothingOuterCoatNtrep
 
 - type: loadout
-  id: NanoTrasenRepresentativeCoatOpen
-  equipment: NanoTrasenRepresentativeCoatOpen
-
-- type: startingGear
   id: NanoTrasenRepresentativeCoatOpen
   equipment:
     outerClothing: ClothingOuterCoatNtrepOpen
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Engineering/chief_engineer.yml
index 901c6a5f9ca..ab4bad79c40 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Engineering/chief_engineer.yml
@@ -1,26 +1,14 @@
 - type: loadout
-  id: ChiefEngineerBackpack
-  equipment: ChiefEngineerBackpack
-
-- type: startingGear
   id: ChiefEngineerBackpack
   equipment:
     back: ClothingBackpackCE
 
 - type: loadout
-  id: ChiefEngineerSatchel
-  equipment: ChiefEngineerSatchel
-
-- type: startingGear
   id: ChiefEngineerSatchel
   equipment:
     back: ClothingBackpackSatchelCE
 
 - type: loadout
-  id: ChiefEngineerDuffel
-  equipment: ChiefEngineerDuffel
-
-- type: startingGear
   id: ChiefEngineerDuffel
   equipment:
     back: ClothingBackpackDuffelCE
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Engineering/senior_engineer.yml
index 89730908ad3..cdf35182c0f 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Engineering/senior_engineer.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Engineering/senior_engineer.yml
@@ -1,23 +1,9 @@
 - type: loadout
-  id: JumpsuitSeniorEngineer
-  equipment: JumpsuitSeniorEngineer
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: JumpsuitSeniorEngineer
   equipment:
     jumpsuit: ClothingUniformJumpsuitSeniorEngineer
 
 - type: loadout
-  id: JumpskirtSeniorEngineer
-  equipment: JumpskirtSeniorEngineer
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: JumpskirtSeniorEngineer
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorEngineer
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Medical/senior_physician.yml
index f7147a82e11..d044cf56dac 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Medical/senior_physician.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Medical/senior_physician.yml
@@ -1,23 +1,9 @@
 - type: loadout
-  id: JumpsuitSeniorPhysician
-  equipment: JumpsuitSeniorPhysician
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: JumpsuitSeniorPhysician
   equipment:
     jumpsuit: ClothingUniformJumpsuitSeniorPhysician
 
 - type: loadout
-  id: JumpskirtSeniorPhysician
-  equipment: JumpskirtSeniorPhysician
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: JumpskirtSeniorPhysician
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorPhysician
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Prison/prisoner.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Prison/prisoner.yml
index f6ea9b1b3eb..f8b671a3a43 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Prison/prisoner.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Prison/prisoner.yml
@@ -1,23 +1,9 @@
 - type: loadout
-  id: PrisonerJumpsuit
-  equipment: PrisonerJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: PrisonerJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitPrisonerGrey
 
 - type: loadout
-  id: PrisonerJumpskirt
-  equipment: PrisonerJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: PrisonerJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpsuitPrisonerGrey
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Prison/security_guard.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Prison/security_guard.yml
index 1e610943670..cfcf97c6f22 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Prison/security_guard.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Prison/security_guard.yml
@@ -1,77 +1,39 @@
 - type: loadout
-  id: PrisonGuardJumpsuit
-  equipment: PrisonGuardJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: PrisonGuardJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitPrisonGuard
 
 - type: loadout
-  id: PrisonGuardJumpskirt
-  equipment: PrisonGuardJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: PrisonGuardJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtGuard
 
 - type: loadout
-  id: PrisonGuardBackpack
-  equipment: PrisonGuardBackpack
-
-- type: startingGear
   id: PrisonGuardBackpack
   equipment:
     back: ClothingBackpackPrisonGuard
 
 - type: loadout
-  id: PrisonGuardSatchel
-  equipment: PrisonGuardSatchel
-
-- type: startingGear
   id: PrisonGuardSatchel
   equipment:
     back: ClothingBackpackSatchelPrisonGuard
 
 - type: loadout
-  id: PrisonGuardDuffel
-  equipment: PrisonGuardDuffel
-
-- type: startingGear
   id: PrisonGuardDuffel
   equipment:
     back: ClothingBackpackDuffelPrisonGuard
 
 - type: loadout
-  id: HeadHatBeretPrisonGuard
-  equipment: HeadHatBeretPrisonGuard
-
-- type: startingGear
   id: HeadHatBeretPrisonGuard
   equipment:
     head: ClothingHeadHatBeretPrisonGuard
 
 - type: loadout
-  id: HeadPrisonGuard
-  equipment: HeadPrisonGuard
-
-- type: startingGear
   id: HeadPrisonGuard
   equipment:
     head: ClothingHeadPrisonGuard
 
 - type: loadout
-  id: HeadCapPrisonGuard
-  equipment: HeadCapPrisonGuard
-
-- type: startingGear
   id: HeadCapPrisonGuard
   equipment:
     head: ClothingHeadCapPrisonGuard
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Science/roboticist.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Science/roboticist.yml
index 3720cbdd175..7f46495bd4a 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Science/roboticist.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Science/roboticist.yml
@@ -1,19 +1,11 @@
 # Head
 
 - type: loadout
-  id: RoboticistCap
-  equipment: RoboticistCap
-
-- type: startingGear
   id: RoboticistCap
   equipment:
     head: ClothingHeadHatCorpsoft
 
 - type: loadout
-  id: SkullBandana
-  equipment: SkullBandana
-
-- type: startingGear
   id: SkullBandana
   equipment:
     head: ClothingHeadBandSkull
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Science/senior_researcher.yml
index 74f05deb6b2..39ee48191fe 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Science/senior_researcher.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Science/senior_researcher.yml
@@ -1,23 +1,9 @@
 - type: loadout
-  id: JumpsuitSeniorResearcher
-  equipment: JumpsuitSeniorResearcher
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: JumpsuitSeniorResearcher
   equipment:
     jumpsuit: ClothingUniformJumpsuitSeniorResearcher
 
 - type: loadout
-  id: JumpskirtSeniorResearcher
-  equipment: JumpskirtSeniorResearcher
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: JumpskirtSeniorResearcher
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorResearcher
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml
index c379847c0d4..0b57650e111 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml
@@ -1,50 +1,24 @@
 - type: loadout
-  id: BrigmedicBackpack
-  equipment: BrigmedicBackpack
-
-- type: startingGear
   id: BrigmedicBackpack
   equipment:
     back: ClothingBackpackBrigmedic
 
 - type: loadout
-  id: BrigmedicDuffel
-  equipment: BrigmedicDuffel
-
-- type: startingGear
   id: BrigmedicDuffel
   equipment:
     back: ClothingBackpackDuffelBrigmedic
 
 - type: loadout
-  id: BrigmedicSatchel
-  equipment: BrigmedicSatchel
-
-- type: startingGear
   id: BrigmedicSatchel
   equipment:
     back: ClothingBackpackSatchelBrigmedic
 
 - type: loadout
-  id: BrigmedicJumpsuit
-  equipment: BrigmedicJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: BrigmedicJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitBrigmedic
 
 - type: loadout
-  id: BrigmedicJumpskirt
-  equipment: BrigmedicJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: BrigmedicJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtBrigmedic
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/security.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/security.yml
index cebd7557c87..23cb9407ebe 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/security.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/security.yml
@@ -1,6 +1,6 @@
 - type: loadout
   id: SecurityBodycam
-  equipment: SecurityBodycam
+  startingGear: SecurityBodycam
 
 - type: startingGear
   id: SecurityBodycam
@@ -10,7 +10,7 @@
 
 - type: loadout
   id: SecurityWhistle
-  equipment: SecurityWhistle
+  startingGear: SecurityWhistle
 
 - type: startingGear
   id: SecurityWhistle
@@ -20,7 +20,7 @@
 
 - type: loadout
   id: SecurityRadioHandheld
-  equipment: SecurityRadioHandheld
+  startingGear: SecurityRadioHandheld
 
 - type: startingGear
   id: SecurityRadioHandheld
@@ -30,7 +30,7 @@
 
 - type: loadout
   id: SecurityTourniquet
-  equipment: SecurityTourniquet
+  startingGear: SecurityTourniquet
 
 - type: startingGear
   id: SecurityTourniquet
@@ -40,7 +40,7 @@
 
 - type: loadout
   id: SecurityGrenadeStinger
-  equipment: SecurityGrenadeStinger
+  startingGear: SecurityGrenadeStinger
 
 - type: startingGear
   id: SecurityGrenadeStinger
@@ -50,7 +50,7 @@
 
 - type: loadout
   id: SecurityClusterBangFull
-  equipment: SecurityClusterBangFull
+  startingGear: SecurityClusterBangFull
 
 - type: startingGear
   id: SecurityClusterBangFull
@@ -60,7 +60,7 @@
 
 - type: loadout
   id: SecurityTearGasGrenade
-  equipment: SecurityTearGasGrenade
+  startingGear: SecurityTearGasGrenade
 
 - type: startingGear
   id: SecurityTearGasGrenade
@@ -70,7 +70,7 @@
 
 - type: loadout
   id: SecurityWeaponMeleeNeedle
-  equipment: SecurityWeaponMeleeNeedle
+  startingGear: SecurityWeaponMeleeNeedle
 
 - type: startingGear
   id: SecurityWeaponMeleeNeedle
@@ -80,7 +80,7 @@
 
 - type: loadout
   id: SecurityHoloprojector
-  equipment: SecurityHoloprojector
+  startingGear: SecurityHoloprojector
 
 - type: startingGear
   id: SecurityHoloprojector
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/security_pilot.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/security_pilot.yml
index b28eade7be1..4dd47733540 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/security_pilot.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/security_pilot.yml
@@ -1,23 +1,9 @@
 - type: loadout
-  id: SecurityPilotJumpsuit
-  equipment: SecurityPilotJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: SecurityPilotJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitPilot
 
 - type: loadout
-  id: SecurityPilotJumpskirt
-  equipment: SecurityPilotJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: SecurityPilotJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtPilot
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/senior_officer.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/senior_officer.yml
index 2f2390e140e..5ccd12a356a 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/senior_officer.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/senior_officer.yml
@@ -1,23 +1,9 @@
 - type: loadout
-  id: JumpsuitSeniorOfficer
-  equipment: JumpsuitSeniorOfficer
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
   id: JumpsuitSeniorOfficer
   equipment:
     jumpsuit: ClothingUniformJumpsuitSeniorOfficer
 
 - type: loadout
-  id: JumpskirtSeniorOfficer
-  equipment: JumpskirtSeniorOfficer
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
   id: JumpskirtSeniorOfficer
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorOfficer
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/bra.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/bra.yml
index e0902bd26c2..05d07f0ff41 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/bra.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/bra.yml
@@ -1,154 +1,106 @@
 - type: loadout
   id: StraplessBra
-  equipment: BraStrapless
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: BraStrapless
   equipment:
     bra: ClothingBraStrapless
 
 - type: loadout
   id: WhiteNekoBra
-  equipment: BraNekoWhite
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: BraNekoWhite
   equipment:
     bra: ClothingBraNekoWhite
 
 - type: loadout
   id: BlackNekoBra
-  equipment: BraNekoBlack
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: BraNekoBlack
   equipment:
     bra: ClothingBraNekoBlack
 
 - type: loadout
   id: AssblastusaBra
-  equipment: BraAssblastusa
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: BraAssblastusa
   equipment:
     bra: ClothingBraAssblastusa
 
 - type: loadout
   id: BikiniBra
-  equipment: BraBikini
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: BraBikini
   equipment:
     bra: ClothingBraBikini
 
 - type: loadout
   id: BraletteBra
-  equipment: BraBralette
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: BraBralette
   equipment:
     bra: ClothingBraBralette
 
 - type: loadout
   id: CommieBra
-  equipment: BraCommie
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: BraCommie
   equipment:
     bra: ClothingBraCommie
 
 - type: loadout
   id: KinkyBra
-  equipment: BraKinky
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: BraKinky
   equipment:
     bra: ClothingBraKinky
 
 - type: loadout
   id: LaceBra
-  equipment: BraLace
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: BraLace
   equipment:
     bra: ClothingBraLace
 
 - type: loadout
   id: SportBra
-  equipment: BraSport
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: BraSport
   equipment:
     bra: ClothingBraSport
 
 - type: loadout
   id: ThongBra
-  equipment: BraThong
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: BraThong
   equipment:
     bra: ClothingBraThong
 
 - type: loadout
   id: UkBra
-  equipment: BraUk
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: BraUk
   equipment:
     bra: ClothingBraUk
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/corporate_law.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/corporate_law.yml
index c520edb0d55..aa72fe0e19e 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/corporate_law.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/corporate_law.yml
@@ -1,6 +1,6 @@
 - type: loadout
   id: CorporateLaw
-  equipment: CorporateLaw
+  startingGear: CorporateLaw
 
 - type: startingGear
   id: CorporateLaw
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/pants.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/pants.yml
index 2d9d29db472..a769ac290c8 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/pants.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/pants.yml
@@ -1,287 +1,197 @@
 # Для тяночек
-
 - type: loadout
   id: StraplessWomanPants
-  equipment: StraplessWomanPants
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: StraplessWomanPants
   equipment:
     pants: ClothingPantsWomanStrapless
 
 - type: loadout
   id: NekoWhiteWomanPants
-  equipment: NekoWhiteWomanPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: NekoWhiteWomanPants
   equipment:
     pants: ClothingPantsWomanNekoWhite
 
 - type: loadout
   id: NekoBlackWomanPants
-  equipment: NekoBlackWomanPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: NekoBlackWomanPants
   equipment:
     pants: ClothingPantsWomanNekoBlack
 
 - type: loadout
   id: AssblastusaWomanPants
-  equipment: AssblastusaWomanPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: AssblastusaWomanPants
   equipment:
     pants: ClothingPantsWomanAssblastusa
 
 - type: loadout
   id: BikiniWomanPants
-  equipment: BikiniWomanPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: BikiniWomanPants
   equipment:
     pants: ClothingPantsWomanBikini
 
 - type: loadout
   id: BraletteWomanPants
-  equipment: BraletteWomanPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: BraletteWomanPants
   equipment:
     pants: ClothingPantsWomanBralette
 
 - type: loadout
   id: CommieWomanPants
-  equipment: CommieWomanPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: CommieWomanPants
   equipment:
     pants: ClothingPantsWomanCommie
 
 - type: loadout
   id: KinkyWomanPants
-  equipment: KinkyWomanPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: KinkyWomanPants
   equipment:
     pants: ClothingPantsWomanKinky
 
 - type: loadout
   id: LaceWomanPants
-  equipment: LaceWomanPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: LaceWomanPants
   equipment:
     pants: ClothingPantsWomanLace
 
 - type: loadout
   id: SportWomanPants
-  equipment: SportWomanPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: SportWomanPants
   equipment:
     pants: ClothingPantsWomanSport
 
 - type: loadout
   id: ThongWomanPants
-  equipment: ThongWomanPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: ThongWomanPants
   equipment:
     pants: ClothingPantsWomanThong
 
 - type: loadout
   id: UkWomanPants
-  equipment: UkWomanPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: UkWomanPants
   equipment:
     pants: ClothingPantsWomanUk
 
 # Для мужиков
-
 - type: loadout
   id: BoxersManPants
-  equipment: BoxersManPants
   effects:
   - !type:GroupLoadoutEffect
     proto: MaleMoment
-
-- type: startingGear
-  id: BoxersManPants
   equipment:
     pants: ClothingPantsManBoxers
 
 - type: loadout
   id: AssblastusaManPants
-  equipment: AssblastusaManPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: MaleMoment
-
-- type: startingGear
-  id: AssblastusaManPants
   equipment:
     pants: ClothingPantsManAssblastusa
 
 - type: loadout
   id: BriefsManPants
-  equipment: BriefsManPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: MaleMoment
-
-- type: startingGear
-  id: BriefsManPants
   equipment:
     pants: ClothingPantsManBriefs
 
 - type: loadout
   id: CommieManPants
-  equipment: CommieManPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: MaleMoment
-
-- type: startingGear
-  id: CommieManPants
   equipment:
     pants: ClothingPantsManCommie
 
 - type: loadout
   id: HeartsManPants
-  equipment: HeartsManPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: MaleMoment
-
-- type: startingGear
-  id: HeartsManPants
   equipment:
     pants: ClothingPantsManHearts
 
 - type: loadout
   id: KinkyManPants
-  equipment: KinkyManPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: MaleMoment
-
-- type: startingGear
-  id: KinkyManPants
   equipment:
     pants: ClothingPantsManKinky
 
 - type: loadout
   id: LongjohnsManPants
-  equipment: LongjohnsManPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: MaleMoment
-
-- type: startingGear
-  id: LongjohnsManPants
   equipment:
     pants: ClothingPantsManLongjohns
 
 - type: loadout
   id: MankiniManPants
-  equipment: MankiniManPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: MaleMoment
-
-- type: startingGear
-  id: MankiniManPants
   equipment:
     pants: ClothingPantsManMankini
 
 - type: loadout
   id: StripeManPants
-  equipment: StripeManPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: MaleMoment
-
-- type: startingGear
-  id: StripeManPants
   equipment:
     pants: ClothingPantsManStripe
 
 - type: loadout
   id: UkManPants
-  equipment: UkManPants
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: MaleMoment
-
-- type: startingGear
-  id: UkManPants
   equipment:
     pants: ClothingPantsManUk
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/socks.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/socks.yml
index 366736cd632..ad64d04731c 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/socks.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/socks.yml
@@ -1,394 +1,260 @@
+# Для тяночек
 - type: loadout
   id: ThighWhiteSocks
-  equipment: ThighWhiteSocks
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: ThighWhiteSocks
   equipment:
     socks: ClothingThighWhite
 
-- type: loadout
-  id: ShortWhiteSocks
-  equipment: ShortWhiteSocks
-
-- type: startingGear
-  id: ShortWhiteSocks
-  equipment:
-    socks: ClothingShortWhite
-
 - type: loadout
   id: FishnetTights
-  equipment: FishnetTights
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: FishnetTights
   equipment:
     socks: ClothingFishnet
 
 - type: loadout
   id: KneeWhiteSocks
-  equipment: KneeWhiteSocks
   sponsorOnly: true
-
-- type: startingGear
-  id: KneeWhiteSocks
   equipment:
     socks: ClothingKneeWhite
 
-- type: loadout
-  id: KneeAceSocks
-  equipment: KneeAceSocks
-  sponsorOnly: true
-
-- type: startingGear
-  id: KneeAceSocks
-  equipment:
-    socks: ClothingKneeAce
-
-- type: loadout
-  id: KneeAssblastusaSocks
-  equipment: KneeAssblastusaSocks
-  sponsorOnly: true
-
-- type: startingGear
-  id: KneeAssblastusaSocks
-  equipment:
-    socks: ClothingKneeAsblastusa
-
-- type: loadout
-  id: KneeBeeSocks
-  equipment: KneeBeeSocks
-  sponsorOnly: true
-
-- type: startingGear
-  id: KneeBeeSocks
-  equipment:
-    socks: ClothingKneeBee
-
-- type: loadout
-  id: KneeBlackSocks
-  equipment: KneeBlackSocks
-  sponsorOnly: true
-
-- type: startingGear
-  id: KneeBlackSocks
-  equipment:
-    socks: ClothingKneeBlack
-
-- type: loadout
-  id: KneeCommieSocks
-  equipment: KneeCommieSocks
-  sponsorOnly: true
-
-- type: startingGear
-  id: KneeCommieSocks
-  equipment:
-    socks: ClothingKneeCommie
-
 - type: loadout
   id: KneeFishnetSocks
-  equipment: KneeFishnetSocks
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: KneeFishnetSocks
   equipment:
     socks: ClothingKneeFishnet
 
-- type: loadout
-  id: KneeRainbowSocks
-  equipment: KneeRainbowSocks
-  sponsorOnly: true
-
-- type: startingGear
-  id: KneeRainbowSocks
-  equipment:
-    socks: ClothingKneeRainbow
-
-- type: loadout
-  id: KneeStripedSocks
-  equipment: KneeStripedSocks
-  sponsorOnly: true
-
-- type: startingGear
-  id: KneeStripedSocks
-  equipment:
-    socks: ClothingKneeStriped
-
-- type: loadout
-  id: KneeThinSocks
-  equipment: KneeThinSocks
-  sponsorOnly: true
-
-- type: startingGear
-  id: KneeThinSocks
-  equipment:
-    socks: ClothingKneeThin
-
-- type: loadout
-  id: KneeTransSocks
-  equipment: KneeTransSocks
-  sponsorOnly: true
-
-- type: startingGear
-  id: KneeTransSocks
-  equipment:
-    socks: ClothingKneeTrans
-
-- type: loadout
-  id: KneeUkSocks
-  equipment: KneeUkSocks
-  sponsorOnly: true
-
-- type: startingGear
-  id: KneeUkSocks
-  equipment:
-    socks: ClothingKneeUk
-
-- type: loadout
-  id: NormBlackSocks
-  equipment: NormBlackSocks
-  sponsorOnly: true
-
-- type: startingGear
-  id: NormBlackSocks
-  equipment:
-    socks: ClothingNormBlack
-
-- type: loadout
-  id: NormWhiteSocks
-  equipment: NormWhiteSocks
-  sponsorOnly: true
-
-- type: startingGear
-  id: NormWhiteSocks
-  equipment:
-    socks: ClothingNormWhite
-
 - type: loadout
   id: Pantyhose
-  equipment: Pantyhose
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: Pantyhose
   equipment:
     socks: ClothingPantyhose
 
 - type: loadout
   id: ShortBlackSocks
-  equipment: ShortBlackSocks
   sponsorOnly: true
-
-- type: startingGear
-  id: ShortBlackSocks
   equipment:
     socks: ClothingShortBlack
 
 - type: loadout
   id: StockingsBlue
-  equipment: StockingsBlue
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: StockingsBlue
   equipment:
     socks: ClothingStockingsBlue
 
 - type: loadout
   id: StockingsCyan
-  equipment: StockingsCyan
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: StockingsCyan
   equipment:
     socks: ClothingStockingsCyan
 
 - type: loadout
   id: StockingsDpink
-  equipment: StockingsDpink
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: StockingsDpink
   equipment:
     socks: ClothingStockingsDpink
 
 - type: loadout
   id: StockingsGreen
-  equipment: StockingsGreen
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: StockingsGreen
   equipment:
     socks: ClothingStockingsGreen
 
 - type: loadout
   id: Stockingslpink
-  equipment: Stockingslpink
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: Stockingslpink
   equipment:
     socks: ClothingStockingslpink
 
 - type: loadout
   id: StockingsOrange
-  equipment: StockingsOrange
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: StockingsOrange
   equipment:
     socks: ClothingStockingsOrange
 
 - type: loadout
   id: StockingsPurple
-  equipment: StockingsPurple
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: StockingsPurple
   equipment:
     socks: ClothingStockingsPurple
 
 - type: loadout
   id: ThighAceSocks
-  equipment: ThighAceSocks
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: ThighAceSocks
   equipment:
     socks: ClothingThighAce
 
 - type: loadout
   id: ThighAsblastusaSocks
-  equipment: ThighAsblastusaSocks
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: ThighAsblastusaSocks
   equipment:
     socks: ClothingThighAsblastusa
 
 - type: loadout
   id: ThighBeeSocks
-  equipment: ThighBeeSocks
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: ThighBeeSocks
   equipment:
     socks: ClothingThighBee
 
 - type: loadout
   id: ThighBlackSocks
-  equipment: ThighBlackSocks
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: ThighBlackSocks
   equipment:
     socks: ClothingThighBlack
 
 - type: loadout
   id: ThighCommieSocks
-  equipment: ThighCommieSocks
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: ThighCommieSocks
   equipment:
     socks: ClothingThighCommie
 
 - type: loadout
   id: ThighRainbowSocks
-  equipment: ThighRainbowSocks
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: ThighRainbowSocks
   equipment:
     socks: ClothingThighRainbow
 
 - type: loadout
   id: ThighTransSocks
-  equipment: ThighTransSocks
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: ThighTransSocks
   equipment:
     socks: ClothingThighTrans
 
 - type: loadout
   id: ThighUkSocks
-  equipment: ThighUkSocks
   sponsorOnly: true
   effects:
   - !type:GroupLoadoutEffect
     proto: WomanMoment
-
-- type: startingGear
-  id: ThighUkSocks
   equipment:
     socks: ClothingThighUk
+
+# Для мужиков
+- type: loadout
+  id: ShortWhiteSocks
+  equipment:
+    socks: ClothingShortWhite
+
+- type: loadout
+  id: KneeAceSocks
+  sponsorOnly: true
+  equipment:
+    socks: ClothingKneeAce
+
+- type: loadout
+  id: KneeAssblastusaSocks
+  sponsorOnly: true
+  equipment:
+    socks: ClothingKneeAsblastusa
+
+- type: loadout
+  id: KneeBeeSocks
+  sponsorOnly: true
+  equipment:
+    socks: ClothingKneeBee
+
+- type: loadout
+  id: KneeBlackSocks
+  sponsorOnly: true
+  equipment:
+    socks: ClothingKneeBlack
+
+- type: loadout
+  id: KneeCommieSocks
+  sponsorOnly: true
+  equipment:
+    socks: ClothingKneeCommie
+
+- type: loadout
+  id: KneeRainbowSocks
+  sponsorOnly: true
+  equipment:
+    socks: ClothingKneeRainbow
+
+- type: loadout
+  id: KneeStripedSocks
+  sponsorOnly: true
+  equipment:
+    socks: ClothingKneeStriped
+
+- type: loadout
+  id: KneeThinSocks
+  sponsorOnly: true
+  equipment:
+    socks: ClothingKneeThin
+
+- type: loadout
+  id: KneeTransSocks
+  sponsorOnly: true
+  equipment:
+    socks: ClothingKneeTrans
+
+- type: loadout
+  id: KneeUkSocks
+  sponsorOnly: true
+  equipment:
+    socks: ClothingKneeUk
+
+- type: loadout
+  id: NormBlackSocks
+  sponsorOnly: true
+  equipment:
+    socks: ClothingNormBlack
+
+- type: loadout
+  id: NormWhiteSocks
+  sponsorOnly: true
+  equipment:
+    socks: ClothingNormWhite
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/survival.yml
index 4520a5c5a41..c0b5919fe82 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/survival.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/survival.yml
@@ -10,7 +10,7 @@
 # Basic
 - type: loadout
   id: EmergencyWithoutGas
-  equipment: EmergencyWithoutGas
+  startingGear: EmergencyWithoutGas
   effects:
   - !type:GroupLoadoutEffect
     proto: NoBreather
@@ -24,7 +24,7 @@
 # Clown
 - type: loadout
   id: EmergencyWithoutGasClown
-  equipment: EmergencyWithoutGasClown
+  startingGear: EmergencyWithoutGasClown
   effects:
   - !type:GroupLoadoutEffect
     proto: NoBreather
@@ -38,7 +38,7 @@
 # Engineering / Extended
 - type: loadout
   id: EmergencyWithoutGasExtended
-  equipment: EmergencyWithoutGasExtended
+  startingGear: EmergencyWithoutGasExtended
   effects:
   - !type:GroupLoadoutEffect
     proto: NoBreather
@@ -52,7 +52,7 @@
 # Medical
 - type: loadout
   id: EmergencyWithoutGasMedical
-  equipment: EmergencyWithoutGasMedical
+  startingGear: EmergencyWithoutGasMedical
   effects:
   - !type:GroupLoadoutEffect
     proto: NoBreather
@@ -66,7 +66,7 @@
 # Security
 - type: loadout
   id: EmergencyWithoutGasSecurity
-  equipment: EmergencyWithoutGasSecurity
+  startingGear: EmergencyWithoutGasSecurity
   effects:
   - !type:GroupLoadoutEffect
     proto: NoBreather
@@ -80,7 +80,7 @@
 # Syndicate
 - type: loadout
   id: EmergencyWithoutGasSyndicate
-  equipment: EmergencyWithoutGasSyndicate
+  startingGear: EmergencyWithoutGasSyndicate
   effects:
   - !type:GroupLoadoutEffect
     proto: NoBreather
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/trinkets.yml
index ed138cab1ce..3c3a4444e2d 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/trinkets.yml
@@ -1,7 +1,7 @@
 # Pins
 - type: loadout
   id: ClothingNeckNanoTrasenPin
-  equipment: ClothingNeckNanoTrasenPin
+  startingGear: ClothingNeckNanoTrasenPin
 
 - type: startingGear
   id: ClothingNeckNanoTrasenPin
@@ -11,7 +11,7 @@
 
 - type: loadout
   id: ClothingNeckNakamuraPin
-  equipment: ClothingNeckNakamuraPin
+  startingGear: ClothingNeckNakamuraPin
 
 - type: startingGear
   id: ClothingNeckNakamuraPin
@@ -21,7 +21,7 @@
 
 - type: loadout
   id: ClothingNeckLogistikaPin
-  equipment: ClothingNeckLogistikaPin
+  startingGear: ClothingNeckLogistikaPin
 
 - type: startingGear
   id: ClothingNeckLogistikaPin
@@ -31,7 +31,7 @@
 
 - type: loadout
   id: ClothingNeckDeForestPin
-  equipment: ClothingNeckDeForestPin
+  startingGear: ClothingNeckDeForestPin
 
 - type: startingGear
   id: ClothingNeckDeForestPin
@@ -41,7 +41,7 @@
 
 - type: loadout
   id: ClothingNeckDonkPin
-  equipment: ClothingNeckDonkPin
+  startingGear: ClothingNeckDonkPin
 
 - type: startingGear
   id: ClothingNeckDonkPin
@@ -51,7 +51,7 @@
 
 - type: loadout
   id: ClothingNeckVitezstviPin
-  equipment: ClothingNeckVitezstviPin
+  startingGear: ClothingNeckVitezstviPin
 
 - type: startingGear
   id: ClothingNeckVitezstviPin
@@ -61,7 +61,7 @@
 
 - type: loadout
   id: ClothingNeckEarthPin
-  equipment: ClothingNeckEarthPin
+  startingGear: ClothingNeckEarthPin
 
 - type: startingGear
   id: ClothingNeckEarthPin
@@ -71,7 +71,7 @@
 
 - type: loadout
   id: ClothingNeckUSSPPin
-  equipment: ClothingNeckUSSPPin
+  startingGear: ClothingNeckUSSPPin
 
 - type: startingGear
   id: ClothingNeckUSSPPin
diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml
index 6295b5811eb..687f1d42288 100644
--- a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml
@@ -1,5 +1,6 @@
 - type: department
   id: Law
+  name: department-Law
   description: department-Law-description
   color: "#FF5297"
   weight: 80
@@ -10,6 +11,7 @@
 
 - type: department
   id: CentralCommand
+  name: department-CentralCommand
   description: department-CentralCommand-description
   color: "#048e0f" # Sunrise-Edit
   weight: 120
@@ -19,6 +21,7 @@
 
 - type: department # Surnise-Blueshield
   id: Blueshield
+  name: department-Blueshield
   description: department-Blueshield-description
   color: "#005bfb"  # Иначе плохо видно
   roles:
@@ -29,6 +32,7 @@
 - type: department
   id: PlanetPrison
   sort: 0
+  name: department-PlanetPrison
   description: department-PlanetPrison-description
   color: "#9f4000"
   roles:
@@ -44,6 +48,7 @@
 - type: department
   id: Silicon
   sort: 0
+  name: department-Silicon
   description: department-Silicon-description
   color: "#8D9AAC"
   roles:
diff --git a/Resources/Prototypes/status_effects.yml b/Resources/Prototypes/status_effects.yml
index 27609b1bb54..96379323fd1 100644
--- a/Resources/Prototypes/status_effects.yml
+++ b/Resources/Prototypes/status_effects.yml
@@ -62,3 +62,9 @@
 
 - type: statusEffect
   id: Flashed
+
+- type: statusEffect
+  id: RadiationProtection
+
+- type: statusEffect
+  id: Drowsiness #blurs your vision and makes you randomly fall asleep
diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-equipped-HELMET.png
new file mode 100644
index 00000000000..ea6575dbbb8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-icon.png
new file mode 100644
index 00000000000..8e8b13f4334
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/meta.json
index 7867b11a028..df3e9f284f7 100644
--- a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "By Gotimanga for SS14",
+    "copyright": "By Gotimanga for SS14, grayscale layering by IProduceWidgets (Github)",
     "size": {
         "x": 32,
         "y": 32
@@ -10,9 +10,30 @@
         {
             "name": "icon"
         },
+        {
+            "name": "coatybits-icon"
+        },
+        {
+            "name": "winterbits-icon"
+        },
+        {
+            "name": "winterbits-tan-icon"
+        },
         {
             "name": "equipped-HELMET",
             "directions": 4
+        },
+		{
+            "name": "coatybits-equipped-HELMET",
+            "directions": 4
+        },
+		{
+            "name": "winterbits-equipped-HELMET",
+            "directions": 4
+        },
+		{
+            "name": "winterbits-tan-equipped-HELMET",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-equipped-HELMET.png
new file mode 100644
index 00000000000..882e3ed5f79
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-icon.png
new file mode 100644
index 00000000000..d0b9a774d08
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-equipped-HELMET.png
new file mode 100644
index 00000000000..923d7363b61
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-icon.png
new file mode 100644
index 00000000000..93136b687c5
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-icon.png differ
diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vox.png
new file mode 100644
index 00000000000..c8b2504d85b
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vox.png differ
diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
index 0a6535fa89e..f4c5491145d 100644
--- a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
@@ -17,6 +17,10 @@
     {
       "name": "equipped-MASK-reptilian",
       "directions": 4
+    },
+    {
+      "name":"equipped-MASK-vox",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vox.png
new file mode 100644
index 00000000000..3591f30f92b
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vox.png differ
diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
index 0a6535fa89e..f4c5491145d 100644
--- a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
@@ -17,6 +17,10 @@
     {
       "name": "equipped-MASK-reptilian",
       "directions": 4
+    },
+    {
+      "name":"equipped-MASK-vox",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..4d42db5aa06
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-icon.png
new file mode 100644
index 00000000000..34725dcae12
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-inhand-left.png
new file mode 100644
index 00000000000..f83377858a2
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-inhand-right.png
new file mode 100644
index 00000000000..12781db9f2f
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-ARMORED-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-ARMORED-icon.png
new file mode 100644
index 00000000000..6f7573420d0
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-ARMORED-icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-ARMORED-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-ARMORED-icon.png
new file mode 100644
index 00000000000..58ddc0afc5c
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-ARMORED-icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARDEN-ARMORED-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARDEN-ARMORED-icon.png
new file mode 100644
index 00000000000..eaf984f4378
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARDEN-ARMORED-icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..d453b039c53
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..25c72cf26f6
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-icon.png
new file mode 100644
index 00000000000..0bea4ba42fc
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-left.png
new file mode 100644
index 00000000000..34e9a603ab8
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-right.png
new file mode 100644
index 00000000000..3627bf8c8d1
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
index 269e7ea5a89..d766019d715 100644
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
@@ -25,6 +25,562 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+	{
+      "name": "ATMOS-icon"
+    },
+    {
+      "name": "ATMOS-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "ATMOS-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "ATMOS-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "ATMOS-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "SCI-icon"
+    },
+    {
+      "name": "SCI-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "SCI-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "SCI-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "SCI-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "CHEM-icon"
+    },
+    {
+      "name": "CHEM-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "CHEM-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "CHEM-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "MIME-icon"
+    },
+    {
+      "name": "MIME-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "MIME-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "MIME-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "MIME-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "BAR-icon"
+    },
+    {
+      "name": "BAR-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "BAR-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "BAR-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "BAR-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "PARA-icon"
+    },
+    {
+      "name": "PARA-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "PARA-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "PARA-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "PARA-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "MINER-icon"
+    },
+    {
+      "name": "MINER-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "MINER-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "MINER-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "MINER-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "CARGO-icon"
+    },
+    {
+      "name": "CARGO-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "CARGO-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "CARGO-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "CARGO-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "HYDRO-icon"
+    },
+    {
+      "name": "HYDRO-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "HYDRO-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "HYDRO-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "HYDRO-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "CHEF-icon"
+    },
+    {
+      "name": "CHEF-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "CHEF-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "CHEF-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "GENE-icon"
+    },
+    {
+      "name": "GENE-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "GENE-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "GENE-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "ENGI-icon"
+    },
+    {
+      "name": "ENGI-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "ENGI-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "ENGI-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "ENGI-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "CAP-icon"
+    },
+    {
+      "name": "CAP-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "CAP-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "CAP-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "CAP-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "WARD-icon"
+    },
+    {
+      "name": "WARD-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "WARD-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "WARD-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "JANI-icon"
+    },
+    {
+      "name": "JANI-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "JANI-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "JANI-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "HOP-icon"
+    },
+    {
+      "name": "HOP-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "HOP-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "HOP-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "MED-icon"
+    },
+    {
+      "name": "MED-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "MED-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "MED-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "MED-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "SEC-icon"
+    },
+    {
+      "name": "SEC-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "SEC-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "SEC-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "SEC-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "SYNDIECAP-icon"
+    },
+    {
+      "name": "SYNDIECAP-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "SYNDIECAP-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "SYNDIECAP-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "SYNDIE-icon"
+    },
+    {
+      "name": "SYNDIE-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "SYNDIE-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "SYNDIE-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "CMO-icon"
+    },
+    {
+      "name": "CMO-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "CMO-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "CMO-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "CE-icon"
+    },
+    {
+      "name": "CE-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "CE-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "CE-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "CE-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "ROBO-icon"
+    },
+    {
+      "name": "ROBO-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "ROBO-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "ROBO-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "HOS-icon"
+    },
+    {
+      "name": "HOS-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "HOS-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "HOS-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "CENTCOM-icon"
+    },
+    {
+      "name": "CENTCOM-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "CENTCOM-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "CENTCOM-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "VIRO-icon"
+    },
+    {
+      "name": "VIRO-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "VIRO-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "VIRO-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "QM-icon"
+    },
+    {
+      "name": "QM-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "QM-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "QM-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "WEB-icon"
+    },
+    {
+      "name": "WEB-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "WEB-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "WEB-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "RD-icon"
+    },
+    {
+      "name": "RD-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "RD-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "RD-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "coatybits-icon"
+    },
+	{
+      "name": "winterbits-icon"
+    },
+	{
+      "name": "winterbits-tan-icon"
+    },
+	{
+      "name": "coatybits-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+	{
+      "name": "winterbits-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+	{
+      "name": "winterbits-tan-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+	{
+      "name": "coatybits-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+	{
+      "name": "winterbits-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+	{
+      "name": "coatybits-inhand-left",
+      "directions": 4
+    },
+	{
+      "name": "winterbits-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "coatybits-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "winterbits-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "ARMOR-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+	{
+      "name": "ARMOR-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "ARMOR-inhand-left",
+      "directions": 4
+    },
+	{
+      "name": "WARDEN-ARMORED-icon"
+    },
+	{
+      "name": "HOS-ARMORED-icon"
+    },
+	{
+      "name": "SYNDIE-ARMORED-icon"
+    },
+	{
+      "name": "ARMOR-icon"
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..a597167d9f6
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..b0bb27edca3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-icon.png
new file mode 100644
index 00000000000..c3c25154f20
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-left.png
new file mode 100644
index 00000000000..09c187e3fe6
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-right.png
new file mode 100644
index 00000000000..77201839c7b
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..7e401cdd7b4
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-icon.png
new file mode 100644
index 00000000000..41b3123ef4a
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
deleted file mode 100644
index 269e7ea5a89..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json
deleted file mode 100644
index 1c427d3df9f..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
deleted file mode 100644
index 3c81e9f96c2..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and repaletted to match with the default state",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
deleted file mode 100644
index 269e7ea5a89..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
deleted file mode 100644
index 269e7ea5a89..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
deleted file mode 100644
index 5f802d30832..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
deleted file mode 100644
index 5f802d30832..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
deleted file mode 100644
index 5f802d30832..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
deleted file mode 100644
index 269e7ea5a89..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
deleted file mode 100644
index 5f802d30832..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
deleted file mode 100644
index 5f802d30832..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
deleted file mode 100644
index ed831eb49fa..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
deleted file mode 100644
index 269e7ea5a89..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
deleted file mode 100644
index 5f802d30832..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
deleted file mode 100644
index 269e7ea5a89..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
deleted file mode 100644
index 2d4f5082169..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, Resprited by github:DreamlyJack(624946166152298517). equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
deleted file mode 100644
index 269e7ea5a89..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
deleted file mode 100644
index 269e7ea5a89..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
deleted file mode 100644
index 5f802d30832..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
deleted file mode 100644
index 5f802d30832..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
deleted file mode 100644
index 5f802d30832..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
deleted file mode 100644
index 269e7ea5a89..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
deleted file mode 100644
index cb3d6dfd905..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
deleted file mode 100644
index 5f802d30832..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
deleted file mode 100644
index b38186a2b94..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 / https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, recolored by Github user Dutch-VanDerLinde.",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "equipped-OUTERCLOTHING",
-            "directions": 4
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/meta.json
deleted file mode 100644
index 5f1566a476d..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by PixelTheKermit (github) for SS14",
-  "size": {"x": 32, "y": 32},
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/meta.json
deleted file mode 100644
index eadf9c61d48..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by belay5 (Discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/meta.json
deleted file mode 100644
index eadf9c61d48..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by belay5 (Discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png
index 7f0f359ed41..4d981a54c7c 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png
index 31bdf9a1adb..f8133ecc16b 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png
index e605ea59bd9..76f3ec14448 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png
index 6925df6df6c..69c30d66e80 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json
index e484bbb13af..bda672d9609 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "drawn by Ubaser",
+  "copyright": "drawn by Ubaser and modified by alzore_(discord)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png
index b292b07a39d..c2c2e4d929c 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png
index 95c916586e8..53063f59dfd 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png
index 2df546bd078..0a447f07746 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png
index d4c3b8602f5..da7b5bc6668 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json
index 8bfe0c1a190..6fda26443e2 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by UbaserB and edited by Kilk for SS14" ,
+  "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" ,
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png
index 467cad3bd89..dee2d7fb3a4 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/icon.png
index e1fea94f59c..b1b0e3024df 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png
index ae66fbf2314..0adf41be118 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png
index 9fba6eb0ecf..3d2a86f3c8c 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/meta.json
index 8bfe0c1a190..6fda26443e2 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by UbaserB and edited by Kilk for SS14" ,
+  "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" ,
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/equipped-FEET.png
index 6736993f4f4..9721c880c99 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png
index c0775e6f22a..2a178b902ba 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png
index 7a85298de15..2802f072428 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png
index 903168d47b8..33d50cba558 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/meta.json
index 8bfe0c1a190..6fda26443e2 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by UbaserB and edited by Kilk for SS14" ,
+  "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" ,
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/equipped-FEET.png
index 1f3e9613607..1a55673925d 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/icon.png
index 4bd7201d1e9..47f596310ab 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png
index 270f95ccf5f..dfbe52f9b96 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png
index eaa7faa88df..b4dcef516c2 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json
index 8bfe0c1a190..6fda26443e2 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by UbaserB and edited by Kilk for SS14" ,
+  "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" ,
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png
index 0e03908a0e5..53687ff5813 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png
index bec3a3c81f2..5dc63e7d4f7 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png
index c600e2e27ed..562c871f365 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png
index e1251f23561..a059a5089bb 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json
index 8bfe0c1a190..6fda26443e2 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by UbaserB and edited by Kilk for SS14" ,
+  "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" ,
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png
index 248b20735ac..bcff2ee62e4 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/icon.png
index bf7a5a514c0..1167a26b4e6 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png
index ebf7810dadd..3397fee7b9c 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-right.png
index 22f21c3eacf..c00ee22e4a7 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/meta.json
index b333e16946e..6fcbb46f5ad 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by UbaserB and edited by Kilk for SS14",
+  "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/equipped-FEET.png
index 8a24f3260ce..e38aa6f63d0 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/icon.png
index bf2a8ee58ab..6cda093ac52 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png
index 345b1c6c783..c87ff7cdd83 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-right.png
index 45906997979..2443e02aaf1 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json
index 8bfe0c1a190..6fda26443e2 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by UbaserB and edited by Kilk for SS14" ,
+  "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" ,
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Interface/eraser.svg b/Resources/Textures/Interface/eraser.svg
new file mode 100644
index 00000000000..e7060e56fbd
--- /dev/null
+++ b/Resources/Textures/Interface/eraser.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-eraser" viewBox="0 0 16 16">
+  <path d="M8.086 2.207a2 2 0 0 1 2.828 0l3.879 3.879a2 2 0 0 1 0 2.828l-5.5 5.5A2 2 0 0 1 7.879 15H5.12a2 2 0 0 1-1.414-.586l-2.5-2.5a2 2 0 0 1 0-2.828l6.879-6.879zm2.121.707a1 1 0 0 0-1.414 0L4.16 7.547l5.293 5.293 4.633-4.633a1 1 0 0 0 0-1.414l-3.879-3.879zM8.746 13.547 3.453 8.254 1.914 9.793a1 1 0 0 0 0 1.414l2.5 2.5a1 1 0 0 0 .707.293H7.88a1 1 0 0 0 .707-.293l.16-.16z"/>
+</svg>
\ No newline at end of file
diff --git a/Resources/Textures/Interface/eraser.svg.png b/Resources/Textures/Interface/eraser.svg.png
new file mode 100644
index 00000000000..de3ed8b1c7e
Binary files /dev/null and b/Resources/Textures/Interface/eraser.svg.png differ
diff --git a/Resources/Textures/Interface/eyedropper.svg b/Resources/Textures/Interface/eyedropper.svg
new file mode 100644
index 00000000000..601caaf70cb
--- /dev/null
+++ b/Resources/Textures/Interface/eyedropper.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-eyedropper" viewBox="0 0 16 16">
+  <path d="M13.354.646a1.207 1.207 0 0 0-1.708 0L8.5 3.793l-.646-.647a.5.5 0 1 0-.708.708L8.293 5l-7.147 7.146A.5.5 0 0 0 1 12.5v1.793l-.854.853a.5.5 0 1 0 .708.707L1.707 15H3.5a.5.5 0 0 0 .354-.146L11 7.707l1.146 1.147a.5.5 0 0 0 .708-.708l-.647-.646 3.147-3.146a1.207 1.207 0 0 0 0-1.708l-2-2zM2 12.707l7-7L10.293 7l-7 7H2z"/>
+</svg>
\ No newline at end of file
diff --git a/Resources/Textures/Interface/eyedropper.svg.png b/Resources/Textures/Interface/eyedropper.svg.png
new file mode 100644
index 00000000000..ce3e41a7168
Binary files /dev/null and b/Resources/Textures/Interface/eyedropper.svg.png differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-ord.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-ord.png
similarity index 100%
rename from Resources/Textures/Objects/Devices/cartridges.rsi/cart-ord.png
rename to Resources/Textures/Objects/Devices/cartridge.rsi/cart-ord.png
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/insert_overlay.png b/Resources/Textures/Objects/Devices/cartridge.rsi/insert_overlay.png
similarity index 100%
rename from Resources/Textures/Objects/Devices/cartridges.rsi/insert_overlay.png
rename to Resources/Textures/Objects/Devices/cartridge.rsi/insert_overlay.png
diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
index c7eb96d964e..f3b02a2b2ea 100644
--- a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/cartridge.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/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d , cart-log made by Skarletto (github)",
+  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and tgstation at tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8, cart-log made by Skarletto (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -49,12 +49,18 @@
     {
       "name": "cart-lib"
     },
+    {
+      "name": "cart-log"
+    },
     {
       "name": "cart-m"
     },
     {
       "name": "cart-mi"
     },
+    {
+      "name": "cart-ord"
+    },
     {
       "name": "cart-q"
     },
@@ -74,7 +80,7 @@
       "name": "cart-y"
     },
     {
-      "name": "cart-log"
+      "name": "insert_overlay"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-a.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-a.png
deleted file mode 100644
index 567490fdea6..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-a.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-b.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-b.png
deleted file mode 100644
index 90a75aecca7..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-b.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-c.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-c.png
deleted file mode 100644
index e2fa89e9d56..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-c.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-ce.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-ce.png
deleted file mode 100644
index 3eb6762a5ad..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-ce.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-chem.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-chem.png
deleted file mode 100644
index 945092b63d0..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-chem.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-clown.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-clown.png
deleted file mode 100644
index 384d2fbd099..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-clown.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-cmo.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-cmo.png
deleted file mode 100644
index 794eeb32a2c..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-cmo.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-e.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-e.png
deleted file mode 100644
index 81573340a36..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-e.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-eye.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-eye.png
deleted file mode 100644
index 52be2688c4d..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-eye.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-h.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-h.png
deleted file mode 100644
index 2cdc1326357..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-h.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-hos.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-hos.png
deleted file mode 100644
index 5d3419fc63c..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-hos.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-j.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-j.png
deleted file mode 100644
index f676b14b846..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-j.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-lib.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-lib.png
deleted file mode 100644
index 6fbffc5962a..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-lib.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-m.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-m.png
deleted file mode 100644
index 3956c626a44..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-m.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-mi.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-mi.png
deleted file mode 100644
index ad50f4cd308..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-mi.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-q.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-q.png
deleted file mode 100644
index 5f0e415ca8d..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-q.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-rd.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-rd.png
deleted file mode 100644
index 3544bf21dfc..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-rd.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-s.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-s.png
deleted file mode 100644
index 732722a2cf0..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-s.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-tear.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-tear.png
deleted file mode 100644
index a4fc0a1747f..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-tear.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart.png
deleted file mode 100644
index a5347224d75..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridges.rsi/meta.json
deleted file mode 100644
index b0f5cd02a76..00000000000
--- a/Resources/Textures/Objects/Devices/cartridges.rsi/meta.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "insert_overlay"
-    },
-    {
-      "name": "cart"
-    },
-    {
-      "name": "cart-e"
-    },
-    {
-      "name": "cart-m"
-    },
-    {
-      "name": "cart-chem"
-    },
-    {
-      "name": "cart-c"
-    },
-    {
-      "name": "cart-h"
-    },
-    {
-      "name": "cart-s"
-    },
-    {
-      "name": "cart-clown"
-    },
-    {
-      "name": "cart-a"
-    },
-    {
-      "name": "cart-j"
-    },
-    {
-      "name": "cart-q"
-    },
-    {
-      "name": "cart-ord"
-    },
-    {
-      "name": "cart-tear"
-    },
-    {
-      "name": "cart-b"
-    },
-    {
-      "name": "cart-lib"
-    },
-    {
-      "name": "cart-eye"
-    },
-    {
-      "name": "cart-mi"
-    },
-    {
-      "name": "cart-hos"
-    },
-    {
-      "name": "cart-ce"
-    },
-    {
-      "name": "cart-cmo"
-    },
-    {
-      "name": "cart-rd"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/concrete-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/concrete-mono.png
new file mode 100644
index 00000000000..c8300ff3e4a
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/concrete-mono.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/concrete-smooth.png b/Resources/Textures/Objects/Tiles/tile.rsi/concrete-smooth.png
new file mode 100644
index 00000000000..a108ce8b4d5
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/concrete-smooth.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal-mini.png
new file mode 100644
index 00000000000..a325052228c
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal-mini.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal.png
new file mode 100644
index 00000000000..c6b889a14a1
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-herringbone.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-herringbone.png
new file mode 100644
index 00000000000..2ebda842b97
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-herringbone.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-mini.png
new file mode 100644
index 00000000000..1605945c16d
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-mini.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-mono.png
new file mode 100644
index 00000000000..8e02358eb6e
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-mono.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-offset.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-offset.png
new file mode 100644
index 00000000000..e21176bf452
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-offset.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement-vertical.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement-vertical.png
new file mode 100644
index 00000000000..66bfacb04b3
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement-vertical.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement.png
new file mode 100644
index 00000000000..b5311d5e364
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark.png
index cd05817621c..220a0cfdb65 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/dark.png and b/Resources/Textures/Objects/Tiles/tile.rsi/dark.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-mono.png
new file mode 100644
index 00000000000..72445cc47e2
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-mono.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-smooth.png b/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-smooth.png
new file mode 100644
index 00000000000..cc86c6edeaf
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-smooth.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
index 11992954f89..7db50200ed6 100644
--- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
+++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
@@ -10,6 +10,30 @@
     {
       "name": "dark"
     },
+    {
+      "name": "dark-diagonal-mini"
+    },
+    {
+      "name": "dark-diagonal"
+    },
+    {
+      "name": "dark-herringbone"
+    },
+    {
+      "name": "dark-mini"
+    },
+    {
+      "name": "dark-mono"
+    },
+    {
+      "name": "dark-pavement"
+    },
+    {
+      "name": "dark-pavement-vertical"
+    },
+    {
+      "name": "dark-offset"
+    },
     {
       "name": "dirty"
     },
@@ -22,12 +46,30 @@
     {
       "name": "concrete"
     },
+    {
+      "name": "concrete-mono"
+    },
+    {
+      "name": "concrete-smooth"
+    },
     {
       "name": "grayconcrete"
     },
+    {
+      "name": "grayconcrete-mono"
+    },
+    {
+      "name": "grayconcrete-smooth"
+    },
     {
       "name": "oldconcrete"
     },
+    {
+      "name": "oldconcrete-mono"
+    },
+    {
+      "name": "oldconcrete-smooth"
+    },
     {
       "name": "gcircuit"
     },
@@ -37,15 +79,15 @@
     {
       "name": "blue"
     },
-	{
-	  "name": "brass"
-	},
-	{
-	  "name": "brass-filled"
-	},
-	{
-	  "name": "reebe"
-	},
+	  {
+	    "name": "brass"
+	  },
+	  {
+	    "name": "brass-filled"
+	  },
+	  {
+	    "name": "reebe"
+	  },
     {
       "name": "lime"
     },
@@ -168,6 +210,30 @@
     {
       "name": "steel"
     },
+    {
+      "name": "steel-offset"
+    },
+    {
+      "name": "steel-diagonal-mini"
+    },
+    {
+      "name": "steel-diagonal"
+    },
+    {
+      "name": "steel-herringbone"
+    },
+    {
+      "name": "steel-mini"
+    },
+    {
+      "name": "steel-mono"
+    },
+    {
+      "name": "steel-pavement"
+    },
+    {
+      "name": "steel-pavement-vertical"
+    },
     {
       "name": "silver"
     },
@@ -177,6 +243,30 @@
     {
       "name": "white"
     },
+    {
+      "name": "white-offset"
+    },
+    {
+      "name": "white-diagonal-mini"
+    },
+    {
+      "name": "white-diagonal"
+    },
+    {
+      "name": "white-herringbone"
+    },
+    {
+      "name": "white-mini"
+    },
+    {
+      "name": "white-mono"
+    },
+    {
+      "name": "white-pavement"
+    },
+    {
+      "name": "white-pavement-vertical"
+    },
     {
       "name": "monofloor"
     },
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-mono.png
new file mode 100644
index 00000000000..c42fa801d97
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-mono.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-smooth.png b/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-smooth.png
new file mode 100644
index 00000000000..ef0e7012c9c
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-smooth.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal-mini.png
new file mode 100644
index 00000000000..cbe178a00f1
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal-mini.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal.png
new file mode 100644
index 00000000000..752d17fa530
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-herringbone.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-herringbone.png
new file mode 100644
index 00000000000..0dd75de3544
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-herringbone.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-mini.png
new file mode 100644
index 00000000000..277b658d320
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-mini.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-mono.png
new file mode 100644
index 00000000000..ff71f6e0514
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-mono.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-offset.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-offset.png
new file mode 100644
index 00000000000..679861267ee
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-offset.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement-vertical.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement-vertical.png
new file mode 100644
index 00000000000..a5c058085c1
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement-vertical.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement.png
new file mode 100644
index 00000000000..e9559c10571
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel.png
index 5ea3049f875..b39ca9aeb51 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/steel.png and b/Resources/Textures/Objects/Tiles/tile.rsi/steel.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal-mini.png
new file mode 100644
index 00000000000..109f89c1abc
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal-mini.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal.png
new file mode 100644
index 00000000000..9bbe51b2841
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-herringbone.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-herringbone.png
new file mode 100644
index 00000000000..316d36da026
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-herringbone.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-mini.png
new file mode 100644
index 00000000000..e413501ba3c
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-mini.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-mono.png
new file mode 100644
index 00000000000..53361667dd6
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-mono.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-offset.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-offset.png
new file mode 100644
index 00000000000..b58aa94d6ab
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-offset.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement-vertical.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement-vertical.png
new file mode 100644
index 00000000000..42eec613812
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement-vertical.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement.png
new file mode 100644
index 00000000000..9800874d740
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white.png b/Resources/Textures/Objects/Tiles/tile.rsi/white.png
index 28459f0cb78..20d44bde5a1 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/white.png and b/Resources/Textures/Objects/Tiles/tile.rsi/white.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-back-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-back-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-suitstorage-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-suitstorage-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left-fill-1.png
new file mode 100644
index 00000000000..87a1358a8ce
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right-fill-1.png
new file mode 100644
index 00000000000..4d0d61d0c17
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json
index 421037eac37..33274c57fe5 100644
--- a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json
@@ -8,34 +8,58 @@
   },
   "states": [
     {
-      "name": "spear"
+        "name": "spear"
     },
     {
-      "name": "spear1"
+        "name": "spear1"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
     },
     {
-      "name": "inhand-right",
-      "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": "equipped-BACKPACK",
-      "directions": 4
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-back-fill-1",
+        "directions": 4
     },
     {
         "name": "equipped-SUITSTORAGE",
         "directions": 4
+    },
+    {
+        "name": "equipped-suitstorage-fill-1",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left-fill-1.png
new file mode 100644
index 00000000000..e50787d3f94
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right-fill-1.png
new file mode 100644
index 00000000000..0a78a494a7c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-back-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-back-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-suitstorage-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-suitstorage-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left-fill-1.png
new file mode 100644
index 00000000000..87a1358a8ce
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right-fill-1.png
new file mode 100644
index 00000000000..4d0d61d0c17
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json
index 5a18552d2e0..538317a61de 100644
--- a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json
@@ -8,34 +8,58 @@
   },
   "states": [
     {
-      "name": "spear"
+        "name": "spear"
     },
     {
-      "name": "spear1"
+        "name": "spear1"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
     },
     {
-      "name": "inhand-right",
-      "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": "equipped-BACKPACK",
-      "directions": 4
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-back-fill-1",
+        "directions": 4
     },
     {
         "name": "equipped-SUITSTORAGE",
         "directions": 4
+    },
+    {
+        "name": "equipped-suitstorage-fill-1",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left-fill-1.png
new file mode 100644
index 00000000000..e50787d3f94
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right-fill-1.png
new file mode 100644
index 00000000000..0a78a494a7c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-back-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-back-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-suitstorage-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-suitstorage-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left-fill-1.png
new file mode 100644
index 00000000000..87a1358a8ce
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right-fill-1.png
new file mode 100644
index 00000000000..4d0d61d0c17
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json
index 5a18552d2e0..6ef6a5fa440 100644
--- a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json
@@ -8,34 +8,58 @@
   },
   "states": [
     {
-      "name": "spear"
+        "name": "spear"
     },
     {
-      "name": "spear1"
+         "name": "spear1"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
     },
     {
-      "name": "inhand-right",
-      "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": "equipped-BACKPACK",
-      "directions": 4
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-back-fill-1",
+        "directions": 4
     },
     {
         "name": "equipped-SUITSTORAGE",
         "directions": 4
+    },
+    {
+        "name": "equipped-suitstorage-fill-1",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left-fill-1.png
new file mode 100644
index 00000000000..e50787d3f94
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right-fill-1.png
new file mode 100644
index 00000000000..0a78a494a7c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-back-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-back-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-suitstorage-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-suitstorage-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left-fill-1.png
new file mode 100644
index 00000000000..87a1358a8ce
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right-fill-1.png
new file mode 100644
index 00000000000..4d0d61d0c17
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json
index 31cf2a800c2..5ee0443364a 100644
--- a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json
@@ -8,34 +8,58 @@
   },
   "states": [
     {
-      "name": "spear"
+        "name": "spear"
     },
     {
-      "name": "spear1"
+        "name": "spear1"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
     },
     {
-      "name": "inhand-right",
-      "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": "equipped-BACKPACK",
-      "directions": 4
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-back-fill-1",
+        "directions": 4
     },
     {
         "name": "equipped-SUITSTORAGE",
         "directions": 4
+    },
+    {
+        "name": "equipped-suitstorage-fill-1",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left-fill-1.png
new file mode 100644
index 00000000000..e50787d3f94
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right-fill-1.png
new file mode 100644
index 00000000000..0a78a494a7c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-back-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-back-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-suitstorage-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-suitstorage-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left-fill-1.png
new file mode 100644
index 00000000000..87a1358a8ce
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right-fill-1.png
new file mode 100644
index 00000000000..4d0d61d0c17
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json
index 5a18552d2e0..538317a61de 100644
--- a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json
@@ -8,34 +8,58 @@
   },
   "states": [
     {
-      "name": "spear"
+        "name": "spear"
     },
     {
-      "name": "spear1"
+        "name": "spear1"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
     },
     {
-      "name": "inhand-right",
-      "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": "equipped-BACKPACK",
-      "directions": 4
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-back-fill-1",
+        "directions": 4
     },
     {
         "name": "equipped-SUITSTORAGE",
         "directions": 4
+    },
+    {
+        "name": "equipped-suitstorage-fill-1",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left-fill-1.png
new file mode 100644
index 00000000000..e50787d3f94
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right-fill-1.png
new file mode 100644
index 00000000000..0a78a494a7c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Shaders/radial_blur.swsl b/Resources/Textures/Shaders/radial_blur.swsl
new file mode 100644
index 00000000000..f3224ce06c9
--- /dev/null
+++ b/Resources/Textures/Shaders/radial_blur.swsl
@@ -0,0 +1,14 @@
+uniform sampler2D SCREEN_TEXTURE;
+uniform highp float Strength;
+const highp int SampleCount = 10; // a higher number makes the shader look better, but has a big performance impact
+
+// a simple radial blur
+void fragment() {
+    highp vec2 uv = FRAGCOORD.xy * SCREEN_PIXEL_SIZE.xy;
+    highp vec2 direction = vec2(0.5, 0.5) - uv;
+    for (int i=1; i <= SampleCount; i++)
+    {
+        COLOR += zTextureSpec(SCREEN_TEXTURE, uv + float(i) * Strength / float(SampleCount) * direction);
+    }
+    COLOR = COLOR / float(SampleCount);
+}
diff --git a/Resources/Textures/Structures/Machines/cuttermachine.rsi/building.png b/Resources/Textures/Structures/Machines/cuttermachine.rsi/building.png
new file mode 100644
index 00000000000..7b710f4f74a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/cuttermachine.rsi/building.png differ
diff --git a/Resources/Textures/Structures/Machines/cuttermachine.rsi/icon.png b/Resources/Textures/Structures/Machines/cuttermachine.rsi/icon.png
new file mode 100644
index 00000000000..c718682539b
Binary files /dev/null and b/Resources/Textures/Structures/Machines/cuttermachine.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Machines/cuttermachine.rsi/meta.json b/Resources/Textures/Structures/Machines/cuttermachine.rsi/meta.json
new file mode 100644
index 00000000000..fd5f81442a3
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/cuttermachine.rsi/meta.json
@@ -0,0 +1,39 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by Ko4erga (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "panel"
+    },
+    {
+      "name": "unlit"
+    },
+    {
+      "name": "building",
+      "delays": [
+        [
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Machines/cuttermachine.rsi/panel.png b/Resources/Textures/Structures/Machines/cuttermachine.rsi/panel.png
new file mode 100644
index 00000000000..1081f6622f4
Binary files /dev/null and b/Resources/Textures/Structures/Machines/cuttermachine.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/cuttermachine.rsi/unlit.png b/Resources/Textures/Structures/Machines/cuttermachine.rsi/unlit.png
new file mode 100644
index 00000000000..91551514811
Binary files /dev/null and b/Resources/Textures/Structures/Machines/cuttermachine.rsi/unlit.png differ
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 0b38a649227..e9d63c2a904 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -540,3 +540,33 @@ binds:
 - function: Hotbar9
   type: State
   key: Num9
+- function: MappingUnselect
+  type: State
+  key: MouseRight
+  canFocus: true
+- function: SaveMap
+  type: State
+  key: S
+  mod1: Control
+- function: MappingEnablePick
+  type: State
+  key: Num5
+- function: MappingEnableDelete
+  type: State
+  key: Num6
+- function: MappingPick
+  type: State
+  key: MouseLeft
+  canFocus: true
+- function: MappingRemoveDecal
+  type: State
+  key: MouseLeft
+  canFocus: true
+- function: MappingCancelEraseDecal
+  type: State
+  key: MouseRight
+  canFocus: true
+- function: MappingOpenContextMenu
+  type: State
+  key: MouseRight
+  canFocus: true
diff --git a/RobustToolbox b/RobustToolbox
index 2e4275a7f3b..5c0ce43e6c3 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 2e4275a7f3b2800e7fbe1da1e1909e8e349033bf
+Subproject commit 5c0ce43e6c3c22a939fad8a9f9848e489b135651