diff --git a/Content.Client/Access/AccessOverlay.cs b/Content.Client/Access/AccessOverlay.cs
index 3cb90158f3..59c9441036 100644
--- a/Content.Client/Access/AccessOverlay.cs
+++ b/Content.Client/Access/AccessOverlay.cs
@@ -9,20 +9,20 @@ namespace Content.Client.Access;
 
 public sealed class AccessOverlay : Overlay
 {
+    private const string TextFontPath = "/Fonts/NotoSans/NotoSans-Regular.ttf";
+    private const int TextFontSize = 12;
+
     private readonly IEntityManager _entityManager;
-    private readonly EntityLookupSystem _lookup;
-    private readonly SharedTransformSystem _xform;
+    private readonly SharedTransformSystem _transformSystem;
     private readonly Font _font;
 
     public override OverlaySpace Space => OverlaySpace.ScreenSpace;
 
-    public AccessOverlay(IEntityManager entManager, IResourceCache cache, EntityLookupSystem lookup, SharedTransformSystem xform)
+    public AccessOverlay(IEntityManager entityManager, IResourceCache resourceCache, SharedTransformSystem transformSystem)
     {
-        _entityManager = entManager;
-        _lookup = lookup;
-        _xform = xform;
-
-        _font = cache.GetFont("/Fonts/IBMPlexMono/IBMPlexMono-Regular.ttf", 12);
+        _entityManager = entityManager;
+        _transformSystem = transformSystem;
+        _font = resourceCache.GetFont(TextFontPath, TextFontSize);
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -30,52 +30,65 @@ public sealed class AccessOverlay : Overlay
         if (args.ViewportControl == null)
             return;
 
-        var readerQuery = _entityManager.GetEntityQuery<AccessReaderComponent>();
-        var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
-
-        foreach (var ent in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldAABB,
-                         LookupFlags.Static | LookupFlags.Approximate))
+        var textBuffer = new StringBuilder();
+        var query = _entityManager.EntityQueryEnumerator<AccessReaderComponent, TransformComponent>();
+        while (query.MoveNext(out var uid, out var accessReader, out var transform))
         {
-            if (!readerQuery.TryGetComponent(ent, out var reader) ||
-                !xformQuery.TryGetComponent(ent, out var xform))
+            textBuffer.Clear();
+
+            var entityName = _entityManager.ToPrettyString(uid);
+            textBuffer.AppendLine(entityName.Prototype);
+            textBuffer.Append("UID: ");
+            textBuffer.Append(entityName.Uid.Id);
+            textBuffer.Append(", NUID: ");
+            textBuffer.Append(entityName.Nuid.Id);
+            textBuffer.AppendLine();
+
+            if (!accessReader.Enabled)
             {
+                textBuffer.AppendLine("-Disabled");
                 continue;
             }
 
-            var text = new StringBuilder();
-            var index = 0;
-            var a = $"{_entityManager.ToPrettyString(ent)}";
-            text.Append(a);
-
-            foreach (var list in reader.AccessLists)
+            if (accessReader.AccessLists.Count > 0)
             {
-                a = $"Tag {index}";
-                text.AppendLine(a);
-
-                foreach (var entry in list)
+                var groupNumber = 0;
+                foreach (var accessList in accessReader.AccessLists)
                 {
-                    a = $"- {entry}";
-                    text.AppendLine(a);
+                    groupNumber++;
+                    foreach (var entry in accessList)
+                    {
+                        textBuffer.Append("+Set ");
+                        textBuffer.Append(groupNumber);
+                        textBuffer.Append(": ");
+                        textBuffer.Append(entry.Id);
+                        textBuffer.AppendLine();
+                    }
                 }
-
-                index++;
-            }
-
-            string textStr;
-
-            if (text.Length >= 2)
-            {
-                textStr = text.ToString();
-                textStr = textStr[..^2];
             }
             else
             {
-                textStr = "";
+                textBuffer.AppendLine("+Unrestricted");
             }
 
-            var screenPos = args.ViewportControl.WorldToScreen(_xform.GetWorldPosition(xform));
+            foreach (var key in accessReader.AccessKeys)
+            {
+                textBuffer.Append("+Key ");
+                textBuffer.Append(key.OriginStation);
+                textBuffer.Append(": ");
+                textBuffer.Append(key.Id);
+                textBuffer.AppendLine();
+            }
 
-            args.ScreenHandle.DrawString(_font, screenPos, textStr, Color.Gold);
+            foreach (var tag in accessReader.DenyTags)
+            {
+                textBuffer.Append("-Tag ");
+                textBuffer.AppendLine(tag.Id);
+            }
+
+            var accessInfoText = textBuffer.ToString();
+            var screenPos = args.ViewportControl.WorldToScreen(_transformSystem.GetWorldPosition(transform));
+            args.ScreenHandle.DrawString(_font, screenPos, accessInfoText, Color.Gold);
         }
     }
 }
diff --git a/Content.Client/Access/Commands/ShowAccessReadersCommand.cs b/Content.Client/Access/Commands/ShowAccessReadersCommand.cs
index 7c804dd969..cb6cb6cf6b 100644
--- a/Content.Client/Access/Commands/ShowAccessReadersCommand.cs
+++ b/Content.Client/Access/Commands/ShowAccessReadersCommand.cs
@@ -7,8 +7,16 @@ namespace Content.Client.Access.Commands;
 public sealed class ShowAccessReadersCommand : IConsoleCommand
 {
     public string Command => "showaccessreaders";
-    public string Description => "Shows all access readers in the viewport";
-    public string Help => $"{Command}";
+
+    public string Description => "Toggles showing access reader permissions on the map";
+    public string Help => """
+        Overlay Info:
+        -Disabled | The access reader is disabled
+        +Unrestricted | The access reader has no restrictions
+        +Set [Index]: [Tag Name]| A tag in an access set (accessor needs all tags in the set to be allowed by the set)
+        +Key [StationUid]: [StationRecordKeyId] | A StationRecordKey that is allowed
+        -Tag [Tag Name] | A tag that is not allowed (takes priority over other allows)
+        """;
     public void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         var collection = IoCManager.Instance;
@@ -26,10 +34,9 @@ public sealed class ShowAccessReadersCommand : IConsoleCommand
 
         var entManager = collection.Resolve<IEntityManager>();
         var cache = collection.Resolve<IResourceCache>();
-        var lookup = entManager.System<EntityLookupSystem>();
         var xform = entManager.System<SharedTransformSystem>();
 
-        overlay.AddOverlay(new AccessOverlay(entManager, cache, lookup, xform));
+        overlay.AddOverlay(new AccessOverlay(entManager, cache, xform));
         shell.WriteLine($"Set access reader debug overlay to true");
     }
 }
diff --git a/Content.Client/Access/UI/AccessLevelControl.xaml b/Content.Client/Access/UI/AccessLevelControl.xaml
new file mode 100644
index 0000000000..56968d8983
--- /dev/null
+++ b/Content.Client/Access/UI/AccessLevelControl.xaml
@@ -0,0 +1,4 @@
+<GridContainer xmlns="https://spacestation14.io"
+               Columns="5"
+               HorizontalAlignment="Center">
+</GridContainer>
diff --git a/Content.Client/Access/UI/AccessLevelControl.xaml.cs b/Content.Client/Access/UI/AccessLevelControl.xaml.cs
new file mode 100644
index 0000000000..34db80b7af
--- /dev/null
+++ b/Content.Client/Access/UI/AccessLevelControl.xaml.cs
@@ -0,0 +1,52 @@
+using System.Linq;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using Content.Shared.Access;
+using Content.Shared.Access.Systems;
+
+namespace Content.Client.Access.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class AccessLevelControl : GridContainer
+{
+    public readonly Dictionary<ProtoId<AccessLevelPrototype>, Button> ButtonsList = new();
+
+    public AccessLevelControl()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    public void Populate(List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototypeManager prototypeManager)
+    {
+        foreach (var access in accessLevels)
+        {
+            if (!prototypeManager.TryIndex(access, out var accessLevel))
+            {
+                Logger.Error($"Unable to find accesslevel for {access}");
+                continue;
+            }
+
+            var newButton = new Button
+            {
+                Text = accessLevel.GetAccessLevelName(),
+                ToggleMode = true,
+            };
+            AddChild(newButton);
+            ButtonsList.Add(accessLevel.ID, newButton);
+        }
+    }
+
+    public void UpdateState(
+        List<ProtoId<AccessLevelPrototype>> pressedList,
+        List<ProtoId<AccessLevelPrototype>>? enabledList = null)
+    {
+        foreach (var (accessName, button) in ButtonsList)
+        {
+            button.Pressed = pressedList.Contains(accessName);
+            button.Disabled = !(enabledList?.Contains(accessName) ?? true);
+        }
+    }
+}
diff --git a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs
index 0c23542f79..c1b63dc4d0 100644
--- a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs
+++ b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs
@@ -64,7 +64,7 @@ namespace Content.Client.Access.UI
             _window?.UpdateState(castState);
         }
 
-        public void SubmitData(List<string> newAccessList)
+        public void SubmitData(List<ProtoId<AccessLevelPrototype>> newAccessList)
         {
             SendMessage(new WriteToTargetAccessReaderIdMessage(newAccessList));
         }
diff --git a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
index 2fd0057121..6025c3b551 100644
--- a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
+++ b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
@@ -16,7 +16,6 @@ namespace Content.Client.Access.UI
         [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-        private readonly ISawmill _logMill = default!;
         private readonly AccessOverriderBoundUserInterface _owner;
         private readonly Dictionary<string, Button> _accessButtons = new();
 
@@ -25,7 +24,7 @@ namespace Content.Client.Access.UI
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
-            _logMill = _logManager.GetSawmill(SharedAccessOverriderSystem.Sawmill);
+            var logMill = _logManager.GetSawmill(SharedAccessOverriderSystem.Sawmill);
 
             _owner = owner;
 
@@ -33,13 +32,13 @@ namespace Content.Client.Access.UI
             {
                 if (!prototypeManager.TryIndex(access, out var accessLevel))
                 {
-                    _logMill.Error($"Unable to find accesslevel for {access}");
+                    logMill.Error($"Unable to find accesslevel for {access}");
                     continue;
                 }
 
                 var newButton = new Button
                 {
-                    Text = GetAccessLevelName(accessLevel),
+                    Text = accessLevel.GetAccessLevelName(),
                     ToggleMode = true,
                 };
 
@@ -49,14 +48,6 @@ namespace Content.Client.Access.UI
             }
         }
 
-        private static string GetAccessLevelName(AccessLevelPrototype prototype)
-        {
-            if (prototype.Name is { } name)
-                return Loc.GetString(name);
-
-            return prototype.ID;
-        }
-
         public void UpdateState(AccessOverriderBoundUserInterfaceState state)
         {
             PrivilegedIdLabel.Text = state.PrivilegedIdName;
@@ -105,7 +96,7 @@ namespace Content.Client.Access.UI
             _owner.SubmitData(
 
                 // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair
-                _accessButtons.Where(x => x.Value.Pressed).Select(x => x.Key).ToList());
+                _accessButtons.Where(x => x.Value.Pressed).Select(x => new ProtoId<AccessLevelPrototype>(x.Key)).ToList());
         }
     }
 }
diff --git a/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
index 95cc972b73..5bf31f631d 100644
--- a/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
+++ b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
@@ -28,7 +28,6 @@ namespace Content.Client.Access.UI
             if (EntMan.TryGetComponent<IdCardConsoleComponent>(Owner, out var idCard))
             {
                 accessLevels = idCard.AccessLevels;
-                accessLevels.Sort();
             }
             else
             {
@@ -70,7 +69,7 @@ namespace Content.Client.Access.UI
         public void SubmitData(
             string newFullName,
             string newJobTitle,
-            List<string> newAccessList,
+            List<ProtoId<AccessLevelPrototype>> newAccessList,
             string newJobPrototype,
             string? newJobIcon)
         {
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
index 47d63cf954..04dcd44806 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
@@ -30,11 +30,7 @@
             <Label Text="{Loc 'id-card-console-window-job-selection-label'}" />
             <OptionButton Name="JobPresetOptionButton" />
         </GridContainer>
-        <GridContainer Name="AccessLevelGrid" Columns="5" HorizontalAlignment="Center">
-
-            <!-- Access level buttons are added here by the C# code -->
-
-        </GridContainer>
+        <Control Name="AccessLevelControlContainer" />
         <!-- WD EDIT -->
         <GridContainer Name="CurrentJobIcon" Columns="2">
             <Label Text="Текущая выбранная иконка для роли: " />
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
index 815728fb70..0e4f5c440b 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
@@ -2,7 +2,6 @@ using System.Linq;
 using System.Numerics;
 using Content.Shared.Access;
 using Content.Shared.Access.Components;
-using Content.Shared.Access.Systems;
 using Content.Shared.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.ResourceManagement;
@@ -22,11 +21,10 @@ namespace Content.Client.Access.UI
         [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly IResourceCache _resource = default!;      //WD-EDIT
         [Dependency] private readonly IEntityManager _entityManager = default!; //WD-EDIT
-        private readonly ISawmill _logMill = default!;
 
         private readonly IdCardConsoleBoundUserInterface _owner;
 
-        private readonly Dictionary<string, Button> _accessButtons = new();
+        private AccessLevelControl _accessButtons = new();
         private readonly Dictionary<string, TextureButton> _jobIconButtons = new(); //WD-EDIT
         private readonly List<string> _jobPrototypeIds = new();
 
@@ -42,7 +40,6 @@ namespace Content.Client.Access.UI
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
-            _logMill = _logManager.GetSawmill(SharedIdCardConsoleSystem.Sawmill);
 
             _owner = owner;
 
@@ -65,7 +62,6 @@ namespace Content.Client.Access.UI
             var jobs = _prototypeManager.EnumeratePrototypes<JobPrototype>().ToList();
             jobs.Sort((x, y) => string.Compare(x.LocalizedName, y.LocalizedName, StringComparison.CurrentCulture));
 
-            List<Button> buttonsToAdd = new();
             foreach (var job in jobs)
             {
                 if (!job.OverrideConsoleVisibility.GetValueOrDefault(job.SetPreference))
@@ -79,30 +75,12 @@ namespace Content.Client.Access.UI
 
             JobPresetOptionButton.OnItemSelected += SelectJobPreset;
 
-            foreach (var access in accessLevels)
+            _accessButtons.Populate(accessLevels, prototypeManager);
+            AccessLevelControlContainer.AddChild(_accessButtons);
+
+            foreach (var (id, button) in _accessButtons.ButtonsList)
             {
-                if (!prototypeManager.TryIndex(access, out var accessLevel))
-                {
-                    _logMill.Error($"Unable to find accesslevel for {access}");
-                    continue;
-                }
-
-                var newButton = new Button
-                {
-                    Text = GetAccessLevelName(accessLevel),
-                    ToggleMode = true
-                };
-
-                _accessButtons.Add(accessLevel.ID, newButton);
-                newButton.OnPressed += _ => SubmitData();
-                buttonsToAdd.Add(newButton);
-            }
-
-            buttonsToAdd.Sort((x, y) => string.Compare(x.Text, y.Text, StringComparison.Ordinal));
-
-            foreach (var button in buttonsToAdd)
-            {
-                AccessLevelGrid.AddChild(button);
+                button.OnPressed += _ => SubmitData();
             }
 
             //WD-EDIT
@@ -136,17 +114,9 @@ namespace Content.Client.Access.UI
             //WD-EDIT
         }
 
-        private static string GetAccessLevelName(AccessLevelPrototype prototype)
-        {
-            if (prototype.Name is { } name)
-                return Loc.GetString(name);
-
-            return prototype.ID;
-        }
-
         private void ClearAllAccess()
         {
-            foreach (var button in _accessButtons.Values)
+            foreach (var button in _accessButtons.ButtonsList.Values)
             {
                 if (button.Pressed)
                 {
@@ -170,7 +140,7 @@ namespace Content.Client.Access.UI
             // this is a sussy way to do this
             foreach (var access in job.Access)
             {
-                if (_accessButtons.TryGetValue(access, out var button) && !button.Disabled)
+                if (_accessButtons.ButtonsList.TryGetValue(access, out var button) && !button.Disabled)
                 {
                     button.Pressed = true;
                 }
@@ -185,7 +155,7 @@ namespace Content.Client.Access.UI
 
                 foreach (var access in groupPrototype.Tags)
                 {
-                    if (_accessButtons.TryGetValue(access, out var button) && !button.Disabled)
+                    if (_accessButtons.ButtonsList.TryGetValue(access, out var button) && !button.Disabled)
                     {
                         button.Pressed = true;
                     }
@@ -236,15 +206,10 @@ namespace Content.Client.Access.UI
 
             JobPresetOptionButton.Disabled = !interfaceEnabled;
 
-            foreach (var (accessName, button) in _accessButtons)
-            {
-                button.Disabled = !interfaceEnabled;
-                if (!interfaceEnabled)
-                    continue;
-
-                button.Pressed = state.TargetIdAccessList?.Contains(accessName) ?? false;
-                button.Disabled = !state.AllowedModifyAccessList?.Contains(accessName) ?? true;
-            }
+            _accessButtons.UpdateState(state.TargetIdAccessList?.ToList() ??
+                                       new List<ProtoId<AccessLevelPrototype>>(),
+                                       state.AllowedModifyAccessList?.ToList() ??
+                                       new List<ProtoId<AccessLevelPrototype>>());
 
             var jobIndex = _jobPrototypeIds.IndexOf(state.TargetIdJobPrototype);
             if (jobIndex >= 0)
@@ -298,7 +263,7 @@ namespace Content.Client.Access.UI
                 FullNameLineEdit.Text,
                 JobTitleLineEdit.Text,
                 // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair
-                _accessButtons.Where(x => x.Value.Pressed).Select(x => x.Key).ToList(),
+                _accessButtons.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList(),
                 jobProtoDirty ? _jobPrototypeIds[JobPresetOptionButton.SelectedId] : string.Empty,
                 _lastJobIcon);
         }
diff --git a/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml b/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml
index ac4adf7e0e..36a750d009 100644
--- a/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml
+++ b/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml
@@ -1,9 +1,9 @@
-<controls:FancyWindow
+<controls:FancyWindow
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     Title="{Loc 'anomaly-scanner-ui-title'}"
-    MinSize="350 260"
-    SetSize="350 260">
+    MinSize="350 400"
+    SetSize="350 400">
     <BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="10 0 10 10">
         <RichTextLabel Name="TextDisplay"></RichTextLabel>
     </BoxContainer>
diff --git a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
index 482acb3c87..d3365702bc 100644
--- a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
+++ b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
@@ -27,6 +27,11 @@ public sealed class CargoBountyConsoleBoundUserInterface : BoundUserInterface
             SendMessage(new BountyPrintLabelMessage(id));
         };
 
+        _menu.OnSkipButtonPressed += id =>
+        {
+            SendMessage(new BountySkipMessage(id));
+        };
+
         _menu.OpenCentered();
     }
 
@@ -37,7 +42,7 @@ public sealed class CargoBountyConsoleBoundUserInterface : BoundUserInterface
         if (message is not CargoBountyConsoleState state)
             return;
 
-        _menu?.UpdateEntries(state.Bounties);
+        _menu?.UpdateEntries(state.Bounties, state.UntilNextSkip);
     }
 
     protected override void Dispose(bool disposing)
diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml b/Content.Client/Cargo/UI/BountyEntry.xaml
index 60446327b3..7c61323bd5 100644
--- a/Content.Client/Cargo/UI/BountyEntry.xaml
+++ b/Content.Client/Cargo/UI/BountyEntry.xaml
@@ -13,7 +13,18 @@
                 </BoxContainer>
                 <Control MinWidth="10"/>
                 <BoxContainer Orientation="Vertical" MinWidth="120">
-                    <Button Name="PrintButton" Text="{Loc 'bounty-console-label-button-text'}" HorizontalExpand="False" HorizontalAlignment="Right"/>
+                    <BoxContainer Orientation="Horizontal" MinWidth="120">
+                        <Button Name="PrintButton"
+                                Text="{Loc 'bounty-console-label-button-text'}"
+                                HorizontalExpand="False"
+                                HorizontalAlignment="Right"
+                                StyleClasses="OpenRight"/>
+                        <Button Name="SkipButton"
+                                Text="{Loc 'bounty-console-skip-button-text'}"
+                                HorizontalExpand="False"
+                                HorizontalAlignment="Right"
+                                StyleClasses="OpenLeft"/>
+                    </BoxContainer>
                     <RichTextLabel Name="IdLabel" HorizontalAlignment="Right" Margin="0 0 5 0"/>
                 </BoxContainer>
             </BoxContainer>
diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml.cs b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
index 1fc8a4986a..027d7b3e80 100644
--- a/Content.Client/Cargo/UI/BountyEntry.xaml.cs
+++ b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
@@ -1,11 +1,13 @@
 using Content.Client.Message;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Prototypes;
+using Content.Shared.Random;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
+using Serilog;
 
 namespace Content.Client.Cargo.UI;
 
@@ -14,15 +16,19 @@ public sealed partial class BountyEntry : BoxContainer
 {
     [Dependency] private readonly IPrototypeManager _prototype = default!;
 
-    public Action? OnButtonPressed;
+    public Action? OnLabelButtonPressed;
+    public Action? OnSkipButtonPressed;
 
     public TimeSpan EndTime;
+    public TimeSpan UntilNextSkip;
 
-    public BountyEntry(CargoBountyData bounty)
+    public BountyEntry(CargoBountyData bounty, TimeSpan untilNextSkip)
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
+        UntilNextSkip = untilNextSkip;
+
         if (!_prototype.TryIndex<CargoBountyPrototype>(bounty.Bounty, out var bountyPrototype))
             return;
 
@@ -38,6 +44,27 @@ public sealed partial class BountyEntry : BoxContainer
         DescriptionLabel.SetMarkup(Loc.GetString("bounty-console-description-label", ("description", Loc.GetString(bountyPrototype.Description))));
         IdLabel.SetMarkup(Loc.GetString("bounty-console-id-label", ("id", bounty.Id)));
 
-        PrintButton.OnPressed += _ => OnButtonPressed?.Invoke();
+        PrintButton.OnPressed += _ => OnLabelButtonPressed?.Invoke();
+        SkipButton.OnPressed += _ => OnSkipButtonPressed?.Invoke();
+    }
+
+    private void UpdateSkipButton(float deltaSeconds)
+    {
+        UntilNextSkip -= TimeSpan.FromSeconds(deltaSeconds);
+        if (UntilNextSkip > TimeSpan.Zero)
+        {
+            SkipButton.Label.Text = UntilNextSkip.ToString("mm\\:ss");
+            SkipButton.Disabled = true;
+            return;
+        }
+
+        SkipButton.Label.Text = Loc.GetString("bounty-console-skip-button-text");
+        SkipButton.Disabled = false;
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+        UpdateSkipButton(args.DeltaSeconds);
     }
 }
diff --git a/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs b/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs
index 2f1756dd18..3767b45e4b 100644
--- a/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs
@@ -10,19 +10,21 @@ namespace Content.Client.Cargo.UI;
 public sealed partial class CargoBountyMenu : FancyWindow
 {
     public Action<string>? OnLabelButtonPressed;
+    public Action<string>? OnSkipButtonPressed;
 
     public CargoBountyMenu()
     {
         RobustXamlLoader.Load(this);
     }
 
-    public void UpdateEntries(List<CargoBountyData> bounties)
+    public void UpdateEntries(List<CargoBountyData> bounties, TimeSpan untilNextSkip)
     {
         BountyEntriesContainer.Children.Clear();
         foreach (var b in bounties)
         {
-            var entry = new BountyEntry(b);
-            entry.OnButtonPressed += () => OnLabelButtonPressed?.Invoke(b.Id);
+            var entry = new BountyEntry(b, untilNextSkip);
+            entry.OnLabelButtonPressed += () => OnLabelButtonPressed?.Invoke(b.Id);
+            entry.OnSkipButtonPressed += () => OnSkipButtonPressed?.Invoke(b.Id);
 
             BountyEntriesContainer.AddChild(entry);
         }
diff --git a/Content.Client/Chemistry/UI/InjectorStatusControl.cs b/Content.Client/Chemistry/UI/InjectorStatusControl.cs
index d5cc67a9f0..ba1f97cd1e 100644
--- a/Content.Client/Chemistry/UI/InjectorStatusControl.cs
+++ b/Content.Client/Chemistry/UI/InjectorStatusControl.cs
@@ -15,9 +15,10 @@ public sealed class InjectorStatusControl : Control
     private readonly SharedSolutionContainerSystem _solutionContainers;
     private readonly RichTextLabel _label;
 
-    private FixedPoint2 _prevVolume;
-    private FixedPoint2 _prevMaxVolume;
-    private InjectorToggleMode _prevToggleState;
+    private FixedPoint2 PrevVolume;
+    private FixedPoint2 PrevMaxVolume;
+    private FixedPoint2 PrevTransferAmount;
+    private InjectorToggleMode PrevToggleState;
 
     public InjectorStatusControl(Entity<InjectorComponent> parent, SharedSolutionContainerSystem solutionContainers)
     {
@@ -35,14 +36,16 @@ public sealed class InjectorStatusControl : Control
             return;
 
         // only updates the UI if any of the details are different than they previously were
-        if (_prevVolume == solution.Volume
-            && _prevMaxVolume == solution.MaxVolume
-            && _prevToggleState == _parent.Comp.ToggleState)
+        if (PrevVolume == solution.Volume
+            && PrevMaxVolume == solution.MaxVolume
+            && PrevTransferAmount == _parent.Comp.TransferAmount
+            && PrevToggleState == _parent.Comp.ToggleState)
             return;
 
-        _prevVolume = solution.Volume;
-        _prevMaxVolume = solution.MaxVolume;
-        _prevToggleState = _parent.Comp.ToggleState;
+        PrevVolume = solution.Volume;
+        PrevMaxVolume = solution.MaxVolume;
+        PrevTransferAmount = _parent.Comp.TransferAmount;
+        PrevToggleState = _parent.Comp.ToggleState;
 
         // Update current volume and injector state
         var modeStringLocalized = Loc.GetString(_parent.Comp.ToggleState switch
diff --git a/Content.Client/Disposal/Systems/DisposalUnitSystem.cs b/Content.Client/Disposal/Systems/DisposalUnitSystem.cs
index 8c40c78421..b9e4a38660 100644
--- a/Content.Client/Disposal/Systems/DisposalUnitSystem.cs
+++ b/Content.Client/Disposal/Systems/DisposalUnitSystem.cs
@@ -96,24 +96,22 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
     private void UpdateState(EntityUid uid, SharedDisposalUnitComponent unit, SpriteComponent sprite, AppearanceComponent appearance)
     {
         if (!_appearanceSystem.TryGetData<VisualState>(uid, Visuals.VisualState, out var state, appearance))
-        {
             return;
-        }
 
         sprite.LayerSetVisible(DisposalUnitVisualLayers.Unanchored, state == VisualState.UnAnchored);
         sprite.LayerSetVisible(DisposalUnitVisualLayers.Base, state == VisualState.Anchored);
-        sprite.LayerSetVisible(DisposalUnitVisualLayers.BaseFlush, state is VisualState.Flushing or VisualState.Charging);
+        sprite.LayerSetVisible(DisposalUnitVisualLayers.OverlayFlush, state is VisualState.OverlayFlushing or VisualState.OverlayCharging);
 
         var chargingState = sprite.LayerMapTryGet(DisposalUnitVisualLayers.BaseCharging, out var chargingLayer)
             ? sprite.LayerGetState(chargingLayer)
             : new RSI.StateId(DefaultChargeState);
 
         // This is a transient state so not too worried about replaying in range.
-        if (state == VisualState.Flushing)
+        if (state == VisualState.OverlayFlushing)
         {
             if (!_animationSystem.HasRunningAnimation(uid, AnimationKey))
             {
-                var flushState = sprite.LayerMapTryGet(DisposalUnitVisualLayers.BaseFlush, out var flushLayer)
+                var flushState = sprite.LayerMapTryGet(DisposalUnitVisualLayers.OverlayFlush, out var flushLayer)
                     ? sprite.LayerGetState(flushLayer)
                     : new RSI.StateId(DefaultFlushState);
 
@@ -125,7 +123,7 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
                     {
                         new AnimationTrackSpriteFlick
                         {
-                            LayerKey = DisposalUnitVisualLayers.BaseFlush,
+                            LayerKey = DisposalUnitVisualLayers.OverlayFlush,
                             KeyFrames =
                             {
                                 // Play the flush animation
@@ -154,26 +152,18 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
                 _animationSystem.Play(uid, anim, AnimationKey);
             }
         }
-        else if (state == VisualState.Charging)
-        {
-            sprite.LayerSetState(DisposalUnitVisualLayers.BaseFlush, chargingState);
-        }
+        else if (state == VisualState.OverlayCharging)
+            sprite.LayerSetState(DisposalUnitVisualLayers.OverlayFlush, new RSI.StateId("disposal-charging"));
         else
-        {
             _animationSystem.Stop(uid, AnimationKey);
-        }
 
         if (!_appearanceSystem.TryGetData<HandleState>(uid, Visuals.Handle, out var handleState, appearance))
-        {
             handleState = HandleState.Normal;
-        }
 
         sprite.LayerSetVisible(DisposalUnitVisualLayers.OverlayEngaged, handleState != HandleState.Normal);
 
         if (!_appearanceSystem.TryGetData<LightStates>(uid, Visuals.Light, out var lightState, appearance))
-        {
             lightState = LightStates.Off;
-        }
 
         sprite.LayerSetVisible(DisposalUnitVisualLayers.OverlayCharging,
                 (lightState & LightStates.Charging) != 0);
@@ -189,7 +179,7 @@ public enum DisposalUnitVisualLayers : byte
     Unanchored,
     Base,
     BaseCharging,
-    BaseFlush,
+    OverlayFlush,
     OverlayCharging,
     OverlayReady,
     OverlayFull,
diff --git a/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs
new file mode 100644
index 0000000000..cd7ea717ce
--- /dev/null
+++ b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs
@@ -0,0 +1,59 @@
+using Content.Shared.Access;
+using Content.Shared.Doors.Electronics;
+using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Doors.Electronics;
+
+public sealed class DoorElectronicsBoundUserInterface : BoundUserInterface
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    private DoorElectronicsConfigurationMenu? _window;
+
+    public DoorElectronicsBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+        List<ProtoId<AccessLevelPrototype>> accessLevels = new();
+
+        foreach (var accessLevel in _prototypeManager.EnumeratePrototypes<AccessLevelPrototype>())
+        {
+            if (accessLevel.Name != null)
+            {
+                accessLevels.Add(accessLevel.ID);
+            }
+        }
+
+        accessLevels.Sort();
+
+        _window = new DoorElectronicsConfigurationMenu(this, accessLevels, _prototypeManager);
+        _window.OnClose += Close;
+        _window.OpenCentered();
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        var castState = (DoorElectronicsConfigurationState) state;
+
+        _window?.UpdateState(castState);
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!disposing) return;
+
+        _window?.Dispose();
+    }
+
+    public void UpdateConfiguration(List<ProtoId<AccessLevelPrototype>> newAccessList)
+    {
+        SendMessage(new DoorElectronicsUpdateConfigurationMessage(newAccessList));
+    }
+}
diff --git a/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml
new file mode 100644
index 0000000000..4cd59f38b2
--- /dev/null
+++ b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml
@@ -0,0 +1,6 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                xmlns:ui="clr-namespace:Content.Client.UserInterface"
+                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+    <Control Name="AccessLevelControlContainer" />
+
+</controls:FancyWindow>
diff --git a/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs
new file mode 100644
index 0000000000..c01f13a462
--- /dev/null
+++ b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs
@@ -0,0 +1,41 @@
+using System.Linq;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using Content.Client.Access.UI;
+using Content.Client.Doors.Electronics;
+using Content.Shared.Access;
+using Content.Shared.Doors.Electronics;
+using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
+
+namespace Content.Client.Doors.Electronics;
+
+[GenerateTypedNameReferences]
+public sealed partial class DoorElectronicsConfigurationMenu : FancyWindow
+{
+    private readonly DoorElectronicsBoundUserInterface _owner;
+    private AccessLevelControl _buttonsList = new();
+
+    public DoorElectronicsConfigurationMenu(DoorElectronicsBoundUserInterface ui, List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototypeManager prototypeManager)
+    {
+        RobustXamlLoader.Load(this);
+
+        _owner = ui;
+
+        _buttonsList.Populate(accessLevels, prototypeManager);
+        AccessLevelControlContainer.AddChild(_buttonsList);
+
+        foreach (var (id, button) in _buttonsList.ButtonsList)
+        {
+            button.OnPressed += _ => _owner.UpdateConfiguration(
+                _buttonsList.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList());
+        }
+    }
+
+    public void UpdateState(DoorElectronicsConfigurationState state)
+    {
+        _buttonsList.UpdateState(state.AccessList);
+    }
+}
diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index 93950da375..0bd82ea9c0 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -212,14 +212,16 @@ namespace Content.Client.Examine
             var vBox = new BoxContainer
             {
                 Name = "ExaminePopupVbox",
-                Orientation = LayoutOrientation.Vertical
+                Orientation = LayoutOrientation.Vertical,
+                MaxWidth = _examineTooltipOpen.MaxWidth
             };
             panel.AddChild(vBox);
 
             var hBox = new BoxContainer
             {
                 Orientation = LayoutOrientation.Horizontal,
-                SeparationOverride = 5
+                SeparationOverride = 5,
+                Margin = new Thickness(6, 0, 6, 0)
             };
 
             vBox.AddChild(hBox);
@@ -229,8 +231,7 @@ namespace Content.Client.Examine
                 var spriteView = new SpriteView
                 {
                     OverrideDirection = Direction.South,
-                    SetSize = new Vector2(32, 32),
-                    Margin = new Thickness(2, 0, 2, 0),
+                    SetSize = new Vector2(32, 32)
                 };
                 spriteView.SetEntity(target);
                 hBox.AddChild(spriteView);
@@ -238,19 +239,17 @@ namespace Content.Client.Examine
 
             if (knowTarget)
             {
-                hBox.AddChild(new Label
-                {
-                    Text = Identity.Name(target, EntityManager, player),
-                    HorizontalExpand = true,
-                });
+                var itemName = FormattedMessage.RemoveMarkup(Identity.Name(target, EntityManager, player));
+                var labelMessage = FormattedMessage.FromMarkup($"[bold]{itemName}[/bold]");
+                var label = new RichTextLabel();
+                label.SetMessage(labelMessage);
+                hBox.AddChild(label);
             }
             else
             {
-                hBox.AddChild(new Label
-                {
-                    Text = "???",
-                    HorizontalExpand = true,
-                });
+                var label = new RichTextLabel();
+                label.SetMessage(FormattedMessage.FromMarkup("[bold]???[/bold]"));
+                hBox.AddChild(label);
             }
 
             panel.Measure(Vector2Helpers.Infinity);
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index d24ed1c225..8753654fc3 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -45,6 +45,9 @@ namespace Content.Client.Input
             // Not in engine because the engine doesn't understand what a flipped object is
             common.AddFunction(ContentKeyFunctions.EditorFlipObject);
 
+            // Not in engine so that the RCD can rotate objects
+            common.AddFunction(EngineKeyFunctions.EditorRotateObject);
+
             var human = contexts.GetContext("human");
             human.AddFunction(EngineKeyFunctions.MoveUp);
             human.AddFunction(EngineKeyFunctions.MoveDown);
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml b/Content.Client/Lathe/UI/LatheMenu.xaml
index b924798395..c1229a69c1 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml
@@ -124,9 +124,7 @@
             <BoxContainer
             VerticalExpand="True"
             HorizontalExpand="True"
-            Orientation="Vertical"
-            MinHeight="225"
-            >
+            Orientation="Vertical">
             <Label Text="{Loc 'lathe-menu-materials-title'}" Margin="5 5 5 5" HorizontalAlignment="Center"/>
             <BoxContainer
                 Orientation="Vertical"
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
index 93d80dbf9c..ca8d256127 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
@@ -104,41 +104,12 @@ public sealed partial class LatheMenu : DefaultWindow
         RecipeList.Children.Clear();
         foreach (var prototype in sortedRecipesToShow)
         {
-            StringBuilder sb = new();
-            var first = true;
-            foreach (var (id, amount) in prototype.RequiredMaterials)
-            {
-                if (!_prototypeManager.TryIndex<MaterialPrototype>(id, out var proto))
-                    continue;
-
-                if (first)
-                    first = false;
-                else
-                    sb.Append('\n');
-
-                var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, component.MaterialUseMultiplier);
-                var sheetVolume = _materialStorage.GetSheetVolume(proto);
-
-                var unit = Loc.GetString(proto.Unit);
-                // rounded in locale not here
-                var sheets = adjustedAmount / (float) sheetVolume;
-                var amountText = Loc.GetString("lathe-menu-material-amount", ("amount", sheets), ("unit", unit));
-                var name = Loc.GetString(proto.Name);
-                sb.Append(Loc.GetString("lathe-menu-tooltip-display", ("material", name), ("amount", amountText)));
-            }
-
-            if (!string.IsNullOrWhiteSpace(prototype.Description))
-            {
-                sb.Append('\n');
-                sb.Append(Loc.GetString("lathe-menu-description-display", ("description", prototype.Description)));
-            }
-
             var icon = prototype.Icon == null
                 ? _spriteSystem.GetPrototypeIcon(prototype.Result).Default
                 : _spriteSystem.Frame0(prototype.Icon);
             var canProduce = _lathe.CanProduce(_owner, prototype, quantity);
 
-            var control = new RecipeControl(prototype, sb.ToString(), canProduce, icon);
+            var control = new RecipeControl(prototype, () => GenerateTooltipText(prototype), canProduce, icon);
             control.OnButtonPressed += s =>
             {
                 if (!int.TryParse(AmountLineEdit.Text, out var amount) || amount <= 0)
@@ -149,6 +120,51 @@ public sealed partial class LatheMenu : DefaultWindow
         }
     }
 
+    private string GenerateTooltipText(LatheRecipePrototype prototype)
+    {
+        StringBuilder sb = new();
+
+        foreach (var (id, amount) in prototype.RequiredMaterials)
+        {
+            if (!_prototypeManager.TryIndex<MaterialPrototype>(id, out var proto))
+                continue;
+
+            var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, _entityManager.GetComponent<LatheComponent>(_owner).MaterialUseMultiplier);
+            var sheetVolume = _materialStorage.GetSheetVolume(proto);
+
+            var unit = Loc.GetString(proto.Unit);
+            var sheets = adjustedAmount / (float) sheetVolume;
+
+            var availableAmount = _materialStorage.GetMaterialAmount(_owner, id);
+            var missingAmount = Math.Max(0, adjustedAmount - availableAmount);
+            var missingSheets = missingAmount / (float) sheetVolume;
+
+            var name = Loc.GetString(proto.Name);
+
+            string tooltipText;
+            if (missingSheets > 0)
+            {
+                tooltipText = Loc.GetString("lathe-menu-material-amount-missing", ("amount", sheets), ("missingAmount", missingSheets), ("unit", unit), ("material", name));
+            }
+            else
+            {
+                var amountText = Loc.GetString("lathe-menu-material-amount", ("amount", sheets), ("unit", unit));
+                tooltipText = Loc.GetString("lathe-menu-tooltip-display", ("material", name), ("amount", amountText));
+            }
+
+            sb.AppendLine(tooltipText);
+        }
+
+        if (!string.IsNullOrWhiteSpace(prototype.Description))
+            sb.AppendLine(Loc.GetString("lathe-menu-description-display", ("description", prototype.Description)));
+
+        // Remove last newline
+        if (sb.Length > 0)
+            sb.Remove(sb.Length - 1, 1);
+
+        return sb.ToString();
+    }
+
     public void UpdateCategories()
     {
         var currentCategories = new List<ProtoId<LatheCategoryPrototype>>();
diff --git a/Content.Client/Lathe/UI/RecipeControl.xaml.cs b/Content.Client/Lathe/UI/RecipeControl.xaml.cs
index 451a988765..bf85ff7d93 100644
--- a/Content.Client/Lathe/UI/RecipeControl.xaml.cs
+++ b/Content.Client/Lathe/UI/RecipeControl.xaml.cs
@@ -11,17 +11,16 @@ namespace Content.Client.Lathe.UI;
 public sealed partial class RecipeControl : Control
 {
     public Action<string>? OnButtonPressed;
+    public Func<string> TooltipTextSupplier;
 
-    public string TooltipText;
-
-    public RecipeControl(LatheRecipePrototype recipe, string tooltip, bool canProduce, Texture? texture = null)
+    public RecipeControl(LatheRecipePrototype recipe, Func<string> tooltipTextSupplier, bool canProduce, Texture? texture = null)
     {
         RobustXamlLoader.Load(this);
 
         RecipeName.Text = recipe.Name;
         RecipeTexture.Texture = texture;
         Button.Disabled = !canProduce;
-        TooltipText = tooltip;
+        TooltipTextSupplier = tooltipTextSupplier;
         Button.TooltipSupplier = SupplyTooltip;
 
         Button.OnPressed += (_) =>
@@ -32,6 +31,6 @@ public sealed partial class RecipeControl : Control
 
     private Control? SupplyTooltip(Control sender)
     {
-        return new RecipeTooltip(TooltipText);
+        return new RecipeTooltip(TooltipTextSupplier());
     }
 }
diff --git a/Content.Client/Materials/UI/MaterialStorageControl.xaml b/Content.Client/Materials/UI/MaterialStorageControl.xaml
index e504434649..2be0f40aa5 100644
--- a/Content.Client/Materials/UI/MaterialStorageControl.xaml
+++ b/Content.Client/Materials/UI/MaterialStorageControl.xaml
@@ -1,7 +1,8 @@
-<BoxContainer xmlns="https://spacestation14.io"
-              Orientation="Vertical"
+<ScrollContainer xmlns="https://spacestation14.io"
               SizeFlagsStretchRatio="8"
               HorizontalExpand="True"
               VerticalExpand="True">
-    <Label Name="NoMatsLabel" Text="{Loc 'lathe-menu-no-materials-message'}" Align="Center"/>
-</BoxContainer>
+    <BoxContainer Name="MaterialList" Orientation="Vertical">
+        <Label Name="NoMatsLabel" Text="{Loc 'lathe-menu-no-materials-message'}" Align="Center"/>
+    </BoxContainer>
+</ScrollContainer>
diff --git a/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs b/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs
index 59e7717112..45186a7ac1 100644
--- a/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs
+++ b/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs
@@ -12,7 +12,7 @@ namespace Content.Client.Materials.UI;
 /// This widget is one row in the lathe eject menu.
 /// </summary>
 [GenerateTypedNameReferences]
-public sealed partial class MaterialStorageControl : BoxContainer
+public sealed partial class MaterialStorageControl : ScrollContainer
 {
     [Dependency] private readonly IEntityManager _entityManager = default!;
 
@@ -72,7 +72,7 @@ public sealed partial class MaterialStorageControl : BoxContainer
         }
 
         var children = new List<MaterialDisplay>();
-        children.AddRange(Children.OfType<MaterialDisplay>());
+        children.AddRange(MaterialList.Children.OfType<MaterialDisplay>());
 
         foreach (var display in children)
         {
@@ -80,7 +80,7 @@ public sealed partial class MaterialStorageControl : BoxContainer
 
             if (extra.Contains(mat))
             {
-                RemoveChild(display);
+                MaterialList.RemoveChild(display);
                 continue;
             }
 
@@ -92,7 +92,7 @@ public sealed partial class MaterialStorageControl : BoxContainer
         foreach (var mat in missing)
         {
             var volume = mats[mat];
-            AddChild(new MaterialDisplay(_owner.Value, mat, volume, canEject));
+            MaterialList.AddChild(new MaterialDisplay(_owner.Value, mat, volume, canEject));
         }
 
         _currentMaterials = mats;
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
index 39326c8a99..863412e553 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
@@ -210,9 +210,9 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
                 specifier = new SpriteSpecifier.Rsi(new ResPath("Interface/Alerts/human_crew_monitoring.rsi"), "dead");
             }
 
-            else if (sensor.TotalDamage != null)
+            else if (sensor.DamagePercentage != null)
             {
-                var index = MathF.Round(4f * (sensor.TotalDamage.Value / 100f));
+                var index = MathF.Round(4f * sensor.DamagePercentage.Value);
 
                 if (index >= 5)
                     specifier = new SpriteSpecifier.Rsi(new ResPath("Interface/Alerts/human_crew_monitoring.rsi"), "critical");
diff --git a/Content.Client/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Client/Nutrition/EntitySystems/OpenableSystem.cs
deleted file mode 100644
index f8c3f7c447..0000000000
--- a/Content.Client/Nutrition/EntitySystems/OpenableSystem.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared.Nutrition.EntitySystems;
-
-namespace Content.Client.Nutrition.EntitySystems;
-
-public sealed class OpenableSystem : SharedOpenableSystem
-{
-}
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml b/Content.Client/Options/UI/Tabs/MiscTab.xaml
index 19d9891b16..8006b1158d 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml
@@ -25,6 +25,14 @@
                 <CheckBox Name="ReducedMotionCheckBox" Text="{Loc 'ui-options-reduced-motion'}" />
                 <CheckBox Name="EnableColorNameCheckBox" Text="{Loc 'ui-options-enable-color-name'}" />
                 <CheckBox Name="ColorblindFriendlyCheckBox" Text="{Loc 'ui-options-colorblind-friendly'}" />
+                <BoxContainer Orientation="Horizontal">
+                    <Label Text="{Loc 'ui-options-chat-window-opacity'}" Margin="8 0" />
+                    <Slider Name="ChatWindowOpacitySlider"
+                            MinValue="0"
+                            MaxValue="1"
+                            MinWidth="200" />
+                    <Label Name="ChatWindowOpacityLabel" Margin="8 0" />
+                </BoxContainer>
                 <BoxContainer Orientation="Horizontal">
                     <Label Text="{Loc 'ui-options-screen-shake-intensity'}" Margin="8 0" />
                     <Slider Name="ScreenShakeIntensitySlider"
@@ -41,6 +49,7 @@
                 <Label Text="{Loc 'ui-options-general-speech'}"
                        FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
                        StyleClasses="LabelKeyText"/>
+                <CheckBox Name="ShowOocPatronColor" Text="{Loc 'ui-options-show-ooc-patron-color'}" />
                 <CheckBox Name="ShowLoocAboveHeadCheckBox" Text="{Loc 'ui-options-show-looc-on-head'}" />
                 <CheckBox Name="FancySpeechBubblesCheckBox" Text="{Loc 'ui-options-fancy-speech'}" />
                 <CheckBox Name="FancyNameBackgroundsCheckBox" Text="{Loc 'ui-options-fancy-name-background'}" />
@@ -66,6 +75,3 @@
         </controls:StripeBack>
     </BoxContainer>
 </tabs:MiscTab>
-
-
-
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
index 3b9c41efdf..0eff811fa4 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
@@ -3,11 +3,14 @@ using Content.Client.UserInterface.Screens;
 using Content.Shared.CCVar;
 using Content.Shared.HUD;
 using Robust.Client.AutoGenerated;
+using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared;
 using Robust.Shared.Configuration;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Range = Robust.Client.UserInterface.Controls.Range;
 
@@ -16,6 +19,7 @@ namespace Content.Client.Options.UI.Tabs
     [GenerateTypedNameReferences]
     public sealed partial class MiscTab : Control
     {
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
@@ -55,8 +59,11 @@ namespace Content.Client.Options.UI.Tabs
                 UpdateApplyButton();
             };
 
+            ShowOocPatronColor.Visible = _playerManager.LocalSession?.Channel.UserData.PatronTier is { } patron;
+            
             HudThemeOption.OnItemSelected += OnHudThemeChanged;
             DiscordRich.OnToggled += OnCheckBoxToggled;
+            ShowOocPatronColor.OnToggled += OnCheckBoxToggled;
             ShowLoocAboveHeadCheckBox.OnToggled += OnCheckBoxToggled;
             ShowHeldItemCheckBox.OnToggled += OnCheckBoxToggled;
             ShowCombatModeIndicatorsCheckBox.OnToggled += OnCheckBoxToggled;
@@ -66,12 +73,14 @@ namespace Content.Client.Options.UI.Tabs
             EnableColorNameCheckBox.OnToggled += OnCheckBoxToggled;
             ColorblindFriendlyCheckBox.OnToggled += OnCheckBoxToggled;
             ReducedMotionCheckBox.OnToggled += OnCheckBoxToggled;
+            ChatWindowOpacitySlider.OnValueChanged += OnChatWindowOpacitySliderChanged;
             ScreenShakeIntensitySlider.OnValueChanged += OnScreenShakeIntensitySliderChanged;
             // ToggleWalk.OnToggled += OnCheckBoxToggled;
             StaticStorageUI.OnToggled += OnCheckBoxToggled;
 
             HudThemeOption.SelectId(_hudThemeIdToIndex.GetValueOrDefault(_cfg.GetCVar(CVars.InterfaceTheme), 0));
             DiscordRich.Pressed = _cfg.GetCVar(CVars.DiscordEnabled);
+            ShowOocPatronColor.Pressed = _cfg.GetCVar(CCVars.ShowOocPatronColor);
             ShowLoocAboveHeadCheckBox.Pressed = _cfg.GetCVar(CCVars.LoocAboveHeadShow);
             ShowHeldItemCheckBox.Pressed = _cfg.GetCVar(CCVars.HudHeldItemShow);
             ShowCombatModeIndicatorsCheckBox.Pressed = _cfg.GetCVar(CCVars.CombatModeIndicatorsPointShow);
@@ -81,6 +90,7 @@ namespace Content.Client.Options.UI.Tabs
             EnableColorNameCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatEnableColorName);
             ColorblindFriendlyCheckBox.Pressed = _cfg.GetCVar(CCVars.AccessibilityColorblindFriendly);
             ReducedMotionCheckBox.Pressed = _cfg.GetCVar(CCVars.ReducedMotion);
+            ChatWindowOpacitySlider.Value = _cfg.GetCVar(CCVars.ChatWindowOpacity);
             ScreenShakeIntensitySlider.Value = _cfg.GetCVar(CCVars.ScreenShakeIntensity) * 100f;
             // ToggleWalk.Pressed = _cfg.GetCVar(CCVars.ToggleWalk);
             StaticStorageUI.Pressed = _cfg.GetCVar(CCVars.StaticStorageUI);
@@ -101,6 +111,13 @@ namespace Content.Client.Options.UI.Tabs
             UpdateApplyButton();
         }
 
+        private void OnChatWindowOpacitySliderChanged(Range range)
+        {
+            ChatWindowOpacityLabel.Text = Loc.GetString("ui-options-chat-window-opacity-percent",
+                ("opacity", range.Value));
+            UpdateApplyButton();
+        }
+
         private void OnScreenShakeIntensitySliderChanged(Range obj)
         {
             ScreenShakeIntensityLabel.Text = Loc.GetString("ui-options-screen-shake-percent", ("intensity", ScreenShakeIntensitySlider.Value / 100f));
@@ -121,12 +138,14 @@ namespace Content.Client.Options.UI.Tabs
             _cfg.SetCVar(CCVars.HudHeldItemShow, ShowHeldItemCheckBox.Pressed);
             _cfg.SetCVar(CCVars.CombatModeIndicatorsPointShow, ShowCombatModeIndicatorsCheckBox.Pressed);
             _cfg.SetCVar(CCVars.OpaqueStorageWindow, OpaqueStorageWindowCheckBox.Pressed);
+            _cfg.SetCVar(CCVars.ShowOocPatronColor, ShowOocPatronColor.Pressed);
             _cfg.SetCVar(CCVars.LoocAboveHeadShow, ShowLoocAboveHeadCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ChatEnableFancyBubbles, FancySpeechBubblesCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ChatFancyNameBackground, FancyNameBackgroundsCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ChatEnableColorName, EnableColorNameCheckBox.Pressed);
             _cfg.SetCVar(CCVars.AccessibilityColorblindFriendly, ColorblindFriendlyCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ReducedMotion, ReducedMotionCheckBox.Pressed);
+            _cfg.SetCVar(CCVars.ChatWindowOpacity, ChatWindowOpacitySlider.Value);
             _cfg.SetCVar(CCVars.ScreenShakeIntensity, ScreenShakeIntensitySlider.Value / 100f);
             // _cfg.SetCVar(CCVars.ToggleWalk, ToggleWalk.Pressed);
             _cfg.SetCVar(CCVars.StaticStorageUI, StaticStorageUI.Pressed);
@@ -148,12 +167,14 @@ namespace Content.Client.Options.UI.Tabs
             var isShowHeldItemSame = ShowHeldItemCheckBox.Pressed == _cfg.GetCVar(CCVars.HudHeldItemShow);
             var isCombatModeIndicatorsSame = ShowCombatModeIndicatorsCheckBox.Pressed == _cfg.GetCVar(CCVars.CombatModeIndicatorsPointShow);
             var isOpaqueStorageWindow = OpaqueStorageWindowCheckBox.Pressed == _cfg.GetCVar(CCVars.OpaqueStorageWindow);
+            var isOocPatronColorShowSame = ShowOocPatronColor.Pressed == _cfg.GetCVar(CCVars.ShowOocPatronColor);
             var isLoocShowSame = ShowLoocAboveHeadCheckBox.Pressed == _cfg.GetCVar(CCVars.LoocAboveHeadShow);
             var isFancyChatSame = FancySpeechBubblesCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableFancyBubbles);
             var isFancyBackgroundSame = FancyNameBackgroundsCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatFancyNameBackground);
             var isEnableColorNameSame = EnableColorNameCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableColorName);
             var isColorblindFriendly = ColorblindFriendlyCheckBox.Pressed == _cfg.GetCVar(CCVars.AccessibilityColorblindFriendly);
             var isReducedMotionSame = ReducedMotionCheckBox.Pressed == _cfg.GetCVar(CCVars.ReducedMotion);
+            var isChatWindowOpacitySame = Math.Abs(ChatWindowOpacitySlider.Value - _cfg.GetCVar(CCVars.ChatWindowOpacity)) < 0.01f;
             var isScreenShakeIntensitySame = Math.Abs(ScreenShakeIntensitySlider.Value / 100f - _cfg.GetCVar(CCVars.ScreenShakeIntensity)) < 0.01f;
             // var isToggleWalkSame = ToggleWalk.Pressed == _cfg.GetCVar(CCVars.ToggleWalk);
             var isStaticStorageUISame = StaticStorageUI.Pressed == _cfg.GetCVar(CCVars.StaticStorageUI);
@@ -164,12 +185,14 @@ namespace Content.Client.Options.UI.Tabs
                                    isShowHeldItemSame &&
                                    isCombatModeIndicatorsSame &&
                                    isOpaqueStorageWindow &&
+                                   isOocPatronColorShowSame &&
                                    isLoocShowSame &&
                                    isFancyChatSame &&
                                    isFancyBackgroundSame &&
                                    isEnableColorNameSame &&
                                    isColorblindFriendly &&
                                    isReducedMotionSame &&
+                                   isChatWindowOpacitySame &&
                                    isScreenShakeIntensitySame &&
                                    // isToggleWalkSame &&
                                    isStaticStorageUISame;
diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index 9e562b5dd3..c1c0ae93ec 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -19,7 +19,6 @@ namespace Content.Client.Overlays;
 /// </summary>
 public sealed class EntityHealthBarOverlay : Overlay
 {
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
     private readonly IEntityManager _entManager;
     private readonly SharedTransformSystem _transform;
     private readonly MobStateSystem _mobStateSystem;
@@ -27,17 +26,14 @@ public sealed class EntityHealthBarOverlay : Overlay
     private readonly ProgressColorSystem _progressColor;
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
     public HashSet<string> DamageContainers = new();
-    private readonly ShaderInstance _shader;
 
     public EntityHealthBarOverlay(IEntityManager entManager)
     {
-        IoCManager.InjectDependencies(this);
         _entManager = entManager;
         _transform = _entManager.System<SharedTransformSystem>();
         _mobStateSystem = _entManager.System<MobStateSystem>();
         _mobThresholdSystem = _entManager.System<MobThresholdSystem>();
         _progressColor = _entManager.System<ProgressColorSystem>();
-        _shader = _prototype.Index<ShaderPrototype>("unshaded").Instance();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -50,8 +46,6 @@ public sealed class EntityHealthBarOverlay : Overlay
         var scaleMatrix = Matrix3.CreateScale(new Vector2(scale, scale));
         var rotationMatrix = Matrix3.CreateRotation(-rotation);
 
-        handle.UseShader(_shader);
-
         var query = _entManager.AllEntityQueryEnumerator<MobThresholdsComponent, MobStateComponent, DamageableComponent, SpriteComponent>();
         while (query.MoveNext(out var uid,
             out var mobThresholdsComponent,
@@ -122,7 +116,6 @@ public sealed class EntityHealthBarOverlay : Overlay
             handle.DrawRect(pixelDarken, Black.WithAlpha(128));
         }
 
-        handle.UseShader(null);
         handle.SetTransform(Matrix3.Identity);
     }
 
diff --git a/Content.Client/Paint/PaintVisualizerSystem.cs b/Content.Client/Paint/PaintVisualizerSystem.cs
deleted file mode 100644
index 8d037811fa..0000000000
--- a/Content.Client/Paint/PaintVisualizerSystem.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using System.Linq;
-using Robust.Client.GameObjects;
-using static Robust.Client.GameObjects.SpriteComponent;
-using Content.Shared.Clothing;
-using Content.Shared.Hands;
-using Content.Shared.Paint;
-using Robust.Client.Graphics;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client.Paint;
-
-public sealed class PaintedVisualizerSystem : VisualizerSystem<PaintedComponent>
-{
-    /// <summary>
-    /// Visualizer for Paint which applies a shader and colors the entity.
-    /// </summary>
-
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly IPrototypeManager _protoMan = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<PaintedComponent, HeldVisualsUpdatedEvent>(OnHeldVisualsUpdated);
-        SubscribeLocalEvent<PaintedComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<PaintedComponent, EquipmentVisualsUpdatedEvent>(OnEquipmentVisualsUpdated);
-    }
-
-    protected override void OnAppearanceChange(EntityUid uid, PaintedComponent component, ref AppearanceChangeEvent args)
-    {
-        var shader = _protoMan.Index<ShaderPrototype>(component.ShaderName).Instance();
-
-        if (args.Sprite == null)
-            return;
-
-        // What is this even doing? It's not even checking what the value is.
-        if (!_appearance.TryGetData(uid, PaintVisuals.Painted, out bool isPainted))
-            return;
-
-        var sprite = args.Sprite;
-
-        foreach (var spriteLayer in sprite.AllLayers)
-        {
-            if (spriteLayer is not Layer layer)
-                continue;
-
-            if (layer.Shader == null) // If shader isn't null we dont want to replace the original shader.
-            {
-                layer.Shader = shader;
-                layer.Color = component.Color;
-            }
-        }
-    }
-
-    private void OnHeldVisualsUpdated(EntityUid uid, PaintedComponent component, HeldVisualsUpdatedEvent args)
-    {
-        if (args.RevealedLayers.Count == 0)
-            return;
-
-        if (!TryComp(args.User, out SpriteComponent? sprite))
-            return;
-
-        foreach (var revealed in args.RevealedLayers)
-        {
-            if (!sprite.LayerMapTryGet(revealed, out var layer))
-                continue;
-
-            sprite.LayerSetShader(layer, component.ShaderName);
-            sprite.LayerSetColor(layer, component.Color);
-        }
-    }
-
-    private void OnEquipmentVisualsUpdated(EntityUid uid, PaintedComponent component, EquipmentVisualsUpdatedEvent args)
-    {
-        if (args.RevealedLayers.Count == 0)
-            return;
-
-        if (!TryComp(args.Equipee, out SpriteComponent? sprite))
-            return;
-
-        foreach (var revealed in args.RevealedLayers)
-        {
-            if (!sprite.LayerMapTryGet(revealed, out var layer))
-                continue;
-
-            sprite.LayerSetShader(layer, component.ShaderName);
-            sprite.LayerSetColor(layer, component.Color);
-        }
-    }
-
-    private void OnShutdown(EntityUid uid, PaintedComponent component, ref ComponentShutdown args)
-    {
-        if (!TryComp(uid, out SpriteComponent? sprite))
-            return;
-
-        component.BeforeColor = sprite.Color;
-        var shader = _protoMan.Index<ShaderPrototype>(component.ShaderName).Instance();
-
-        if (!Terminating(uid))
-        {
-            foreach (var spriteLayer in sprite.AllLayers)
-            {
-                if (spriteLayer is not Layer layer)
-                    continue;
-
-                if (layer.Shader == shader) // If shader isn't same as one in component we need to ignore it.
-                {
-                    layer.Shader = null;
-                    if (layer.Color == component.Color) // If color isn't the same as one in component we don't want to change it.
-                        layer.Color = component.BeforeColor;
-                }
-            }
-        }
-    }
-}
diff --git a/Content.Client/Pinpointer/UI/NavMapControl.cs b/Content.Client/Pinpointer/UI/NavMapControl.cs
index a8ec7b37a0..677092e191 100644
--- a/Content.Client/Pinpointer/UI/NavMapControl.cs
+++ b/Content.Client/Pinpointer/UI/NavMapControl.cs
@@ -114,9 +114,16 @@ public partial class NavMapControl : MapGridControl
             VerticalExpand = false,
             Children =
             {
-                _zoom,
-                _beacons,
-                _recenter,
+                new BoxContainer()
+                {
+                    Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                    Children =
+                    {
+                        _zoom,
+                        _beacons,
+                        _recenter
+                    }
+                }
             }
         };
 
diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs
index 5741a98de1..d9f47c0799 100644
--- a/Content.Client/Popups/PopupSystem.cs
+++ b/Content.Client/Popups/PopupSystem.cs
@@ -188,10 +188,13 @@ namespace Content.Client.Popups
             PopupEntity(message, uid, type);
         }
 
-        public override void PopupClient(string? message, EntityUid uid, EntityUid recipient, PopupType type = PopupType.Small)
+        public override void PopupClient(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
         {
+            if (recipient == null)
+                return;
+
             if (_timing.IsFirstTimePredicted)
-                PopupEntity(message, uid, recipient, type);
+                PopupEntity(message, uid, recipient.Value, type);
         }
 
         public override void PopupEntity(string? message, EntityUid uid, PopupType type = PopupType.Small)
diff --git a/Content.Client/RCD/AlignRCDConstruction.cs b/Content.Client/RCD/AlignRCDConstruction.cs
new file mode 100644
index 0000000000..da7b22c91a
--- /dev/null
+++ b/Content.Client/RCD/AlignRCDConstruction.cs
@@ -0,0 +1,122 @@
+using System.Numerics;
+using Content.Client.Gameplay;
+using Content.Shared.Hands.Components;
+using Content.Shared.Interaction;
+using Content.Shared.RCD.Components;
+using Content.Shared.RCD.Systems;
+using Robust.Client.Placement;
+using Robust.Client.Player;
+using Robust.Client.State;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+
+namespace Content.Client.RCD;
+
+public sealed class AlignRCDConstruction : PlacementMode
+{
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
+    [Dependency] private readonly RCDSystem _rcdSystem = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IStateManager _stateManager = default!;
+
+    private const float SearchBoxSize = 2f;
+    private const float PlaceColorBaseAlpha = 0.5f;
+
+    private EntityCoordinates _unalignedMouseCoords = default;
+
+    /// <summary>
+    /// This placement mode is not on the engine because it is content specific (i.e., for the RCD)
+    /// </summary>
+    public AlignRCDConstruction(PlacementManager pMan) : base(pMan)
+    {
+        var dependencies = IoCManager.Instance!;
+        _entityManager = dependencies.Resolve<IEntityManager>();
+        _mapManager = dependencies.Resolve<IMapManager>();
+        _playerManager = dependencies.Resolve<IPlayerManager>();
+        _stateManager = dependencies.Resolve<IStateManager>();
+
+        _mapSystem = _entityManager.System<SharedMapSystem>();
+        _rcdSystem = _entityManager.System<RCDSystem>();
+        _transformSystem = _entityManager.System<SharedTransformSystem>();
+
+        ValidPlaceColor = ValidPlaceColor.WithAlpha(PlaceColorBaseAlpha);
+    }
+
+    public override void AlignPlacementMode(ScreenCoordinates mouseScreen)
+    {
+        _unalignedMouseCoords = ScreenToCursorGrid(mouseScreen);
+        MouseCoords = _unalignedMouseCoords.AlignWithClosestGridTile(SearchBoxSize, _entityManager, _mapManager);
+
+        var gridId = MouseCoords.GetGridUid(_entityManager);
+
+        if (!_entityManager.TryGetComponent<MapGridComponent>(gridId, out var mapGrid))
+            return;
+
+        CurrentTile = _mapSystem.GetTileRef(gridId.Value, mapGrid, MouseCoords);
+
+        float tileSize = mapGrid.TileSize;
+        GridDistancing = tileSize;
+
+        if (pManager.CurrentPermission!.IsTile)
+        {
+            MouseCoords = new EntityCoordinates(MouseCoords.EntityId, new Vector2(CurrentTile.X + tileSize / 2,
+                CurrentTile.Y + tileSize / 2));
+        }
+        else
+        {
+            MouseCoords = new EntityCoordinates(MouseCoords.EntityId, new Vector2(CurrentTile.X + tileSize / 2 + pManager.PlacementOffset.X,
+                CurrentTile.Y + tileSize / 2 + pManager.PlacementOffset.Y));
+        }
+    }
+
+    public override bool IsValidPosition(EntityCoordinates position)
+    {
+        var player = _playerManager.LocalSession?.AttachedEntity;
+
+        // If the destination is out of interaction range, set the placer alpha to zero
+        if (!_entityManager.TryGetComponent<TransformComponent>(player, out var xform))
+            return false;
+
+        if (!xform.Coordinates.InRange(_entityManager, _transformSystem, position, SharedInteractionSystem.InteractionRange))
+        {
+            InvalidPlaceColor = InvalidPlaceColor.WithAlpha(0);
+            return false;
+        }
+
+        // Otherwise restore the alpha value
+        else
+        {
+            InvalidPlaceColor = InvalidPlaceColor.WithAlpha(PlaceColorBaseAlpha);
+        }
+
+        // Determine if player is carrying an RCD in their active hand
+        if (!_entityManager.TryGetComponent<HandsComponent>(player, out var hands))
+            return false;
+
+        var heldEntity = hands.ActiveHand?.HeldEntity;
+
+        if (!_entityManager.TryGetComponent<RCDComponent>(heldEntity, out var rcd))
+            return false;
+
+        // Retrieve the map grid data for the position
+        if (!_rcdSystem.TryGetMapGridData(position, out var mapGridData))
+            return false;
+
+        // Determine if the user is hovering over a target
+        var currentState = _stateManager.CurrentState;
+
+        if (currentState is not GameplayStateBase screen)
+            return false;
+
+        var target = screen.GetClickedEntity(_unalignedMouseCoords.ToMap(_entityManager, _transformSystem));
+
+        // Determine if the RCD operation is valid or not
+        if (!_rcdSystem.IsRCDOperationStillValid(heldEntity.Value, rcd, mapGridData.Value, target, player.Value, false))
+            return false;
+
+        return true;
+    }
+}
diff --git a/Content.Client/RCD/RCDConstructionGhostSystem.cs b/Content.Client/RCD/RCDConstructionGhostSystem.cs
new file mode 100644
index 0000000000..792916b892
--- /dev/null
+++ b/Content.Client/RCD/RCDConstructionGhostSystem.cs
@@ -0,0 +1,78 @@
+using Content.Shared.Hands.Components;
+using Content.Shared.Interaction;
+using Content.Shared.RCD;
+using Content.Shared.RCD.Components;
+using Content.Shared.RCD.Systems;
+using Robust.Client.Placement;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+
+namespace Content.Client.RCD;
+
+public sealed class RCDConstructionGhostSystem : EntitySystem
+{
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly RCDSystem _rcdSystem = default!;
+    [Dependency] private readonly IPlacementManager _placementManager = default!;
+
+    private string _placementMode = typeof(AlignRCDConstruction).Name;
+    private Direction _placementDirection = default;
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        // Get current placer data
+        var placerEntity = _placementManager.CurrentPermission?.MobUid;
+        var placerProto = _placementManager.CurrentPermission?.EntityType;
+        var placerIsRCD = HasComp<RCDComponent>(placerEntity);
+
+        // Exit if erasing or the current placer is not an RCD (build mode is active)
+        if (_placementManager.Eraser || (placerEntity != null && !placerIsRCD))
+            return;
+
+        // Determine if player is carrying an RCD in their active hand
+        var player = _playerManager.LocalSession?.AttachedEntity;
+
+        if (!TryComp<HandsComponent>(player, out var hands))
+            return;
+
+        var heldEntity = hands.ActiveHand?.HeldEntity;
+
+        if (!TryComp<RCDComponent>(heldEntity, out var rcd))
+        {
+            // If the player was holding an RCD, but is no longer, cancel placement
+            if (placerIsRCD)
+                _placementManager.Clear();
+
+            return;
+        }
+
+        // Update the direction the RCD prototype based on the placer direction
+        if (_placementDirection != _placementManager.Direction)
+        {
+            _placementDirection = _placementManager.Direction;
+            RaiseNetworkEvent(new RCDConstructionGhostRotationEvent(GetNetEntity(heldEntity.Value), _placementDirection));
+        }
+
+        // If the placer has not changed, exit
+        _rcdSystem.UpdateCachedPrototype(heldEntity.Value, rcd);
+
+        if (heldEntity == placerEntity && rcd.CachedPrototype.Prototype == placerProto)
+            return;
+
+        // Create a new placer
+        var newObjInfo = new PlacementInformation
+        {
+            MobUid = heldEntity.Value,
+            PlacementOption = _placementMode,
+            EntityType = rcd.CachedPrototype.Prototype,
+            Range = (int) Math.Ceiling(SharedInteractionSystem.InteractionRange),
+            IsTile = (rcd.CachedPrototype.Mode == RcdMode.ConstructTile),
+            UseEditorContext = false,
+        };
+
+        _placementManager.Clear();
+        _placementManager.BeginPlacing(newObjInfo);
+    }
+}
diff --git a/Content.Client/RCD/RCDMenu.xaml b/Content.Client/RCD/RCDMenu.xaml
new file mode 100644
index 0000000000..b3d5367a5f
--- /dev/null
+++ b/Content.Client/RCD/RCDMenu.xaml
@@ -0,0 +1,47 @@
+<ui:RadialMenu xmlns="https://spacestation14.io"
+                xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
+                xmlns:rcd="clr-namespace:Content.Client.RCD"
+                BackButtonStyleClass="RadialMenuBackButton"
+                CloseButtonStyleClass="RadialMenuCloseButton"
+                VerticalExpand="True"
+                HorizontalExpand="True"
+                MinSize="450 450">
+    
+    <!-- Note: The min size of the window just determine how close to the edge of the screen the center of the radial menu can be placed -->
+    <!-- The radial menu will try to open so that its center is located where the player's cursor is currently -->
+
+    <!-- Entry layer (shows main categories) -->
+    <ui:RadialContainer Name="Main" VerticalExpand="True" HorizontalExpand="True" Radius="64" ReserveSpaceForHiddenChildren="False">
+        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'rcd-component-walls-and-flooring'}" TargetLayer="WallsAndFlooring" Visible="False">
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Radial/RCD/walls_and_flooring.png"/>
+        </ui:RadialMenuTextureButton>
+        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'rcd-component-windows-and-grilles'}" TargetLayer="WindowsAndGrilles" Visible="False">
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Radial/RCD/windows_and_grilles.png"/>
+        </ui:RadialMenuTextureButton>
+        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'rcd-component-airlocks'}" TargetLayer="Airlocks" Visible="False">
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Radial/RCD/airlocks.png"/>
+        </ui:RadialMenuTextureButton>
+        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'rcd-component-electrical'}" TargetLayer="Electrical" Visible="False">
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Radial/RCD/multicoil.png"/>
+        </ui:RadialMenuTextureButton>
+        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'rcd-component-lighting'}" TargetLayer="Lighting" Visible="False">
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Radial/RCD/lighting.png"/>
+        </ui:RadialMenuTextureButton>
+    </ui:RadialContainer>
+
+    <!-- Walls and flooring -->
+    <ui:RadialContainer Name="WallsAndFlooring"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
+
+    <!-- Windows and grilles -->
+    <ui:RadialContainer Name="WindowsAndGrilles"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
+
+    <!-- Airlocks -->
+    <ui:RadialContainer Name="Airlocks"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
+
+    <!-- Computer and machine frames -->
+    <ui:RadialContainer Name="Electrical"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
+       
+    <!-- Lighting -->
+    <ui:RadialContainer Name="Lighting"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
+
+</ui:RadialMenu>
diff --git a/Content.Client/RCD/RCDMenu.xaml.cs b/Content.Client/RCD/RCDMenu.xaml.cs
new file mode 100644
index 0000000000..51ec66ea44
--- /dev/null
+++ b/Content.Client/RCD/RCDMenu.xaml.cs
@@ -0,0 +1,174 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Popups;
+using Content.Shared.RCD;
+using Content.Shared.RCD.Components;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.Player;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using System.Numerics;
+
+namespace Content.Client.RCD;
+
+[GenerateTypedNameReferences]
+public sealed partial class RCDMenu : RadialMenu
+{
+    [Dependency] private readonly EntityManager _entManager = default!;
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+
+    private readonly SpriteSystem _spriteSystem;
+    private readonly SharedPopupSystem _popup;
+
+    public event Action<ProtoId<RCDPrototype>>? SendRCDSystemMessageAction;
+
+    private EntityUid _owner;
+
+    public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui)
+    {
+        IoCManager.InjectDependencies(this);
+        RobustXamlLoader.Load(this);
+
+        _spriteSystem = _entManager.System<SpriteSystem>();
+        _popup = _entManager.System<SharedPopupSystem>();
+
+        _owner = owner;
+
+        // Find the main radial container
+        var main = FindControl<RadialContainer>("Main");
+
+        if (main == null)
+            return;
+
+        // Populate secondary radial containers
+        if (!_entManager.TryGetComponent<RCDComponent>(owner, out var rcd))
+            return;
+
+        foreach (var protoId in rcd.AvailablePrototypes)
+        {
+            if (!_protoManager.TryIndex(protoId, out var proto))
+                continue;
+
+            if (proto.Mode == RcdMode.Invalid)
+                continue;
+
+            var parent = FindControl<RadialContainer>(proto.Category);
+
+            if (parent == null)
+                continue;
+
+            var tooltip = Loc.GetString(proto.SetName);
+
+            if ((proto.Mode == RcdMode.ConstructTile || proto.Mode == RcdMode.ConstructObject) &&
+                proto.Prototype != null && _protoManager.TryIndex(proto.Prototype, out var entProto))
+            {
+                tooltip = Loc.GetString(entProto.Name);
+            }
+
+            tooltip = char.ToUpper(tooltip[0]) + tooltip.Remove(0, 1);
+
+            var button = new RCDMenuButton()
+            {
+                StyleClasses = { "RadialMenuButton" },
+                SetSize = new Vector2(64f, 64f),
+                ToolTip = tooltip,
+                ProtoId = protoId,
+            };
+
+            if (proto.Sprite != null)
+            {
+                var tex = new TextureRect()
+                {
+                    VerticalAlignment = VAlignment.Center,
+                    HorizontalAlignment = HAlignment.Center,
+                    Texture = _spriteSystem.Frame0(proto.Sprite),
+                    TextureScale = new Vector2(2f, 2f),
+                };
+
+                button.AddChild(tex);
+            }
+
+            parent.AddChild(button);
+
+            // Ensure that the button that transitions the menu to the associated category layer
+            // is visible in the main radial container (as these all start with Visible = false)
+            foreach (var child in main.Children)
+            {
+                var castChild = child as RadialMenuTextureButton;
+
+                if (castChild is not RadialMenuTextureButton)
+                    continue;
+
+                if (castChild.TargetLayer == proto.Category)
+                {
+                    castChild.Visible = true;
+                    break;
+                }
+            }
+        }
+
+        // Set up menu actions
+        foreach (var child in Children)
+            AddRCDMenuButtonOnClickActions(child);
+
+        OnChildAdded += AddRCDMenuButtonOnClickActions;
+
+        SendRCDSystemMessageAction += bui.SendRCDSystemMessage;
+    }
+
+    private void AddRCDMenuButtonOnClickActions(Control control)
+    {
+        var radialContainer = control as RadialContainer;
+
+        if (radialContainer == null)
+            return;
+
+        foreach (var child in radialContainer.Children)
+        {
+            var castChild = child as RCDMenuButton;
+
+            if (castChild == null)
+                continue;
+
+            castChild.OnButtonUp += _ =>
+            {
+                SendRCDSystemMessageAction?.Invoke(castChild.ProtoId);
+
+                if (_playerManager.LocalSession?.AttachedEntity != null &&
+                    _protoManager.TryIndex(castChild.ProtoId, out var proto))
+                {
+                    var msg = Loc.GetString("rcd-component-change-mode", ("mode", Loc.GetString(proto.SetName)));
+
+                    if (proto.Mode == RcdMode.ConstructTile || proto.Mode == RcdMode.ConstructObject)
+                    {
+                        var name = Loc.GetString(proto.SetName);
+
+                        if (proto.Prototype != null &&
+                            _protoManager.TryIndex(proto.Prototype, out var entProto))
+                            name = entProto.Name;
+
+                        msg = Loc.GetString("rcd-component-change-build-mode", ("name", name));
+                    }
+
+                    // Popup message
+                    _popup.PopupClient(msg, _owner, _playerManager.LocalSession.AttachedEntity);
+                }
+
+                Close();
+            };
+        }
+    }
+}
+
+public sealed class RCDMenuButton : RadialMenuTextureButton
+{
+    public ProtoId<RCDPrototype> ProtoId { get; set; }
+
+    public RCDMenuButton()
+    {
+
+    }
+}
diff --git a/Content.Client/RCD/RCDMenuBoundUserInterface.cs b/Content.Client/RCD/RCDMenuBoundUserInterface.cs
new file mode 100644
index 0000000000..a37dbcecf8
--- /dev/null
+++ b/Content.Client/RCD/RCDMenuBoundUserInterface.cs
@@ -0,0 +1,49 @@
+using Content.Shared.RCD;
+using Content.Shared.RCD.Components;
+using JetBrains.Annotations;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.RCD;
+
+[UsedImplicitly]
+public sealed class RCDMenuBoundUserInterface : BoundUserInterface
+{
+    [Dependency] private readonly IClyde _displayManager = default!;
+    [Dependency] private readonly IInputManager _inputManager = default!;
+
+    private RCDMenu? _menu;
+
+    public RCDMenuBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+        IoCManager.InjectDependencies(this);
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = new(Owner, this);
+        _menu.OnClose += Close;
+
+        // Open the menu, centered on the mouse
+        var vpSize = _displayManager.ScreenSize;
+        _menu.OpenCenteredAt(_inputManager.MouseScreenPosition.Position / vpSize);
+    }
+
+    public void SendRCDSystemMessage(ProtoId<RCDPrototype> protoId)
+    {
+        // A predicted message cannot be used here as the RCD UI is closed immediately 
+        // after this message is sent, which will stop the server from receiving it
+        SendMessage(new RCDSystemMessage(protoId));
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!disposing) return;
+
+        _menu?.Dispose();
+    }
+}
diff --git a/Content.Client/Shuttles/UI/MapScreen.xaml.cs b/Content.Client/Shuttles/UI/MapScreen.xaml.cs
index 225d1be14e..10800b8c5f 100644
--- a/Content.Client/Shuttles/UI/MapScreen.xaml.cs
+++ b/Content.Client/Shuttles/UI/MapScreen.xaml.cs
@@ -263,9 +263,10 @@ public sealed partial class MapScreen : BoxContainer
 
         while (mapComps.MoveNext(out var mapComp, out var mapXform, out var mapMetadata))
         {
-            if (!_shuttles.CanFTLTo(_shuttleEntity.Value, mapComp.MapId))
-               continue;
-
+            if (_console != null && !_shuttles.CanFTLTo(_shuttleEntity.Value, mapComp.MapId, _console.Value))
+            {
+                continue;
+            }
             var mapName = mapMetadata.EntityName;
 
             if (string.IsNullOrEmpty(mapName))
@@ -310,7 +311,6 @@ public sealed partial class MapScreen : BoxContainer
             };
 
             _mapHeadings.Add(mapComp.MapId, gridContents);
-
             foreach (var grid in _mapManager.GetAllMapGrids(mapComp.MapId))
             {
                 _entManager.TryGetComponent(grid.Owner, out IFFComponent? iffComp);
@@ -327,8 +327,8 @@ public sealed partial class MapScreen : BoxContainer
                 {
                     AddMapObject(mapComp.MapId, gridObj);
                 }
-                else if (iffComp == null ||
-                         (iffComp.Flags & IFFFlags.Hide) == 0x0)
+                else if (!_shuttles.IsBeaconMap(_mapManager.GetMapEntityId(mapComp.MapId)) && (iffComp == null ||
+                         (iffComp.Flags & IFFFlags.Hide) == 0x0))
                 {
                     _pendingMapObjects.Add((mapComp.MapId, gridObj));
                 }
diff --git a/Content.Client/StatusIcon/StatusIconOverlay.cs b/Content.Client/StatusIcon/StatusIconOverlay.cs
index da1ba103b0..471f0b8753 100644
--- a/Content.Client/StatusIcon/StatusIconOverlay.cs
+++ b/Content.Client/StatusIcon/StatusIconOverlay.cs
@@ -4,6 +4,7 @@ using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using System.Numerics;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Client.StatusIcon;
@@ -11,11 +12,13 @@ namespace Content.Client.StatusIcon;
 public sealed class StatusIconOverlay : Overlay
 {
     [Dependency] private readonly IEntityManager _entity = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
     private readonly SpriteSystem _sprite;
     private readonly TransformSystem _transform;
     private readonly StatusIconSystem _statusIcon;
+    private readonly ShaderInstance _unshadedShader;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
 
@@ -26,6 +29,7 @@ public sealed class StatusIconOverlay : Overlay
         _sprite = _entity.System<SpriteSystem>();
         _transform = _entity.System<TransformSystem>();
         _statusIcon = _entity.System<StatusIconSystem>();
+        _unshadedShader = _prototype.Index<ShaderPrototype>("unshaded").Instance();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -103,9 +107,16 @@ public sealed class StatusIconOverlay : Overlay
 
                 }
 
+                if (proto.IsShaded)
+                    handle.UseShader(null);
+                else
+                    handle.UseShader(_unshadedShader);
+
                 var position = new Vector2(xOffset, yOffset);
                 handle.DrawTexture(texture, position);
             }
+
+            handle.UseShader(null);
         }
     }
 }
diff --git a/Content.Client/Store/Ui/StoreBoundUserInterface.cs b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
index b549918d7c..f87b92bc61 100644
--- a/Content.Client/Store/Ui/StoreBoundUserInterface.cs
+++ b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
@@ -1,22 +1,27 @@
 using Content.Shared.Store;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 using System.Linq;
-using System.Threading;
-using Serilog;
-using Timer = Robust.Shared.Timing.Timer;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Store.Ui;
 
 [UsedImplicitly]
 public sealed class StoreBoundUserInterface : BoundUserInterface
 {
+    private IPrototypeManager _prototypeManager = default!;
+
     [ViewVariables]
     private StoreMenu? _menu;
 
     [ViewVariables]
     private string _windowName = Loc.GetString("store-ui-default-title");
 
+    [ViewVariables]
+    private string _search = "";
+
+    [ViewVariables]
+    private HashSet<ListingData> _listings = new();
+
     public StoreBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
     }
@@ -49,6 +54,12 @@ public sealed class StoreBoundUserInterface : BoundUserInterface
             SendMessage(new StoreRequestUpdateInterfaceMessage());
         };
 
+        _menu.SearchTextUpdated += (_, search) =>
+        {
+            _search = search.Trim().ToLowerInvariant();
+            UpdateListingsWithSearchFilter();
+        };
+
         _menu.OnRefundAttempt += (_) =>
         {
             SendMessage(new StoreRequestRefundMessage());
@@ -64,10 +75,10 @@ public sealed class StoreBoundUserInterface : BoundUserInterface
         switch (state)
         {
             case StoreUpdateState msg:
-                _menu.UpdateBalance(msg.Balance);
-                _menu.PopulateStoreCategoryButtons(msg.Listings);
+                _listings = msg.Listings;
 
-                _menu.UpdateListing(msg.Listings.ToList());
+                _menu.UpdateBalance(msg.Balance);
+                UpdateListingsWithSearchFilter();
                 _menu.SetFooterVisibility(msg.ShowFooter);
                 _menu.UpdateRefund(msg.AllowRefund);
                 break;
@@ -89,4 +100,19 @@ public sealed class StoreBoundUserInterface : BoundUserInterface
         _menu?.Close();
         _menu?.Dispose();
     }
+
+    private void UpdateListingsWithSearchFilter()
+    {
+        if (_menu == null)
+            return;
+
+        var filteredListings = new HashSet<ListingData>(_listings);
+        if (!string.IsNullOrEmpty(_search))
+        {
+            filteredListings.RemoveWhere(listingData => !ListingLocalisationHelpers.GetLocalisedNameOrEntityName(listingData, _prototypeManager).Trim().ToLowerInvariant().Contains(_search) &&
+                                                        !ListingLocalisationHelpers.GetLocalisedDescriptionOrEntityDescription(listingData, _prototypeManager).Trim().ToLowerInvariant().Contains(_search));
+        }
+        _menu.PopulateStoreCategoryButtons(filteredListings);
+        _menu.UpdateListing(filteredListings.ToList());
+    }
 }
diff --git a/Content.Client/Store/Ui/StoreMenu.xaml b/Content.Client/Store/Ui/StoreMenu.xaml
index 4b38352a44..fc4cbe444f 100644
--- a/Content.Client/Store/Ui/StoreMenu.xaml
+++ b/Content.Client/Store/Ui/StoreMenu.xaml
@@ -28,7 +28,8 @@
                     HorizontalAlignment="Right"
                     Text="Refund" />
             </BoxContainer>
-            <PanelContainer VerticalExpand="True">
+            <LineEdit Name="SearchBar" Margin="4" PlaceHolder="Search" HorizontalExpand="True"/>
+                <PanelContainer VerticalExpand="True">
                 <PanelContainer.PanelOverride>
                     <gfx:StyleBoxFlat BackgroundColor="#000000FF" />
                 </PanelContainer.PanelOverride>
diff --git a/Content.Client/Store/Ui/StoreMenu.xaml.cs b/Content.Client/Store/Ui/StoreMenu.xaml.cs
index 2686f6fc4c..ec485c8206 100644
--- a/Content.Client/Store/Ui/StoreMenu.xaml.cs
+++ b/Content.Client/Store/Ui/StoreMenu.xaml.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using System.Threading;
 using Content.Client.Actions;
 using Content.Client.GameTicking.Managers;
 using Content.Client.Message;
@@ -27,6 +26,7 @@ public sealed partial class StoreMenu : DefaultWindow
 
     private StoreWithdrawWindow? _withdrawWindow;
 
+    public event EventHandler<string>? SearchTextUpdated;
     public event Action<BaseButton.ButtonEventArgs, ListingData>? OnListingButtonPressed;
     public event Action<BaseButton.ButtonEventArgs, string>? OnCategoryButtonPressed;
     public event Action<BaseButton.ButtonEventArgs, string, int>? OnWithdrawAttempt;
@@ -46,6 +46,7 @@ public sealed partial class StoreMenu : DefaultWindow
         WithdrawButton.OnButtonDown += OnWithdrawButtonDown;
         RefreshButton.OnButtonDown += OnRefreshButtonDown;
         RefundButton.OnButtonDown += OnRefundButtonDown;
+        SearchBar.OnTextChanged += _ => SearchTextUpdated?.Invoke(this, SearchBar.Text);
 
         if (Window != null)
             Window.Title = name;
@@ -59,7 +60,7 @@ public sealed partial class StoreMenu : DefaultWindow
             (type.Key, type.Value), type => _prototypeManager.Index<CurrencyPrototype>(type.Key));
 
         var balanceStr = string.Empty;
-        foreach (var ((type, amount),proto) in currency)
+        foreach (var ((_, amount), proto) in currency)
         {
             balanceStr += Loc.GetString("store-ui-balance-display", ("amount", amount),
                 ("currency", Loc.GetString(proto.DisplayName, ("amount", 1))));
@@ -81,7 +82,6 @@ public sealed partial class StoreMenu : DefaultWindow
     {
         var sorted = listings.OrderBy(l => l.Priority).ThenBy(l => l.Cost.Values.Sum());
 
-
         // should probably chunk these out instead. to-do if this clogs the internet tubes.
         // maybe read clients prototypes instead?
         ClearListings();
@@ -129,8 +129,8 @@ public sealed partial class StoreMenu : DefaultWindow
         if (!listing.Categories.Contains(CurrentCategory))
             return;
 
-        var listingName = Loc.GetString(listing.Name);
-        var listingDesc = Loc.GetString(listing.Description);
+        var listingName = ListingLocalisationHelpers.GetLocalisedNameOrEntityName(listing, _prototypeManager);
+        var listingDesc = ListingLocalisationHelpers.GetLocalisedDescriptionOrEntityDescription(listing, _prototypeManager);
         var listingPrice = listing.Cost;
         var canBuy = CanBuyListing(Balance, listingPrice);
 
@@ -144,12 +144,6 @@ public sealed partial class StoreMenu : DefaultWindow
         {
             if (texture == null)
                 texture = spriteSys.GetPrototypeIcon(listing.ProductEntity).Default;
-
-            var proto = _prototypeManager.Index<EntityPrototype>(listing.ProductEntity);
-            if (listingName == string.Empty)
-                listingName = proto.Name;
-            if (listingDesc == string.Empty)
-                listingDesc = proto.Description;
         }
         else if (listing.ProductAction != null)
         {
@@ -254,13 +248,16 @@ public sealed partial class StoreMenu : DefaultWindow
 
         allCategories = allCategories.OrderBy(c => c.Priority).ToList();
 
+        // This will reset the Current Category selection if nothing matches the search.
+        if (allCategories.All(category => category.ID != CurrentCategory))
+            CurrentCategory = string.Empty;
+
         if (CurrentCategory == string.Empty && allCategories.Count > 0)
             CurrentCategory = allCategories.First().ID;
 
-        if (allCategories.Count <= 1)
-            return;
-
         CategoryListContainer.Children.Clear();
+        if (allCategories.Count < 1)
+            return;
 
         foreach (var proto in allCategories)
         {
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index 033139b821..e9915ec690 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -45,6 +45,7 @@ namespace Content.Client.Stylesheets
         public const string StyleClassBorderedWindowPanel = "BorderedWindowPanel";
         public const string StyleClassInventorySlotBackground = "InventorySlotBackground";
         public const string StyleClassHandSlotHighlight = "HandSlotHighlight";
+        public const string StyleClassChatPanel = "ChatPanel";
         public const string StyleClassChatSubPanel = "ChatSubPanel";
         public const string StyleClassTransparentBorderedWindowPanel = "TransparentBorderedWindowPanel";
         public const string StyleClassHotbarPanel = "HotbarPanel";
@@ -158,6 +159,8 @@ namespace Content.Client.Stylesheets
         public const string StyleClassButtonColorGreen = "ButtonColorGreen";
         public const string StyleClassButtonColorPurple = "ButtonColorPurple";
 
+        public static readonly Color ChatBackgroundColor = Color.FromHex("#25252ADD");
+
         public override Stylesheet Stylesheet { get; }
 
         public StyleNano(IResourceCache resCache) : base(resCache)
@@ -354,7 +357,7 @@ namespace Content.Client.Stylesheets
             var buttonTex = resCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
             var topButtonBase = new StyleBoxTexture
             {
-             Texture = buttonTex,
+                Texture = buttonTex,
             };
             topButtonBase.SetPatchMargin(StyleBox.Margin.All, 10);
             topButtonBase.SetPadding(StyleBox.Margin.All, 0);
@@ -362,19 +365,19 @@ namespace Content.Client.Stylesheets
 
             var topButtonOpenRight = new StyleBoxTexture(topButtonBase)
             {
-             Texture = new AtlasTexture(buttonTex, UIBox2.FromDimensions(new Vector2(0, 0), new Vector2(14, 24))),
+                Texture = new AtlasTexture(buttonTex, UIBox2.FromDimensions(new Vector2(0, 0), new Vector2(14, 24))),
             };
             topButtonOpenRight.SetPatchMargin(StyleBox.Margin.Right, 0);
 
             var topButtonOpenLeft = new StyleBoxTexture(topButtonBase)
             {
-             Texture = new AtlasTexture(buttonTex, UIBox2.FromDimensions(new Vector2(10, 0), new Vector2(14, 24))),
+                Texture = new AtlasTexture(buttonTex, UIBox2.FromDimensions(new Vector2(10, 0), new Vector2(14, 24))),
             };
             topButtonOpenLeft.SetPatchMargin(StyleBox.Margin.Left, 0);
 
             var topButtonSquare = new StyleBoxTexture(topButtonBase)
             {
-             Texture = new AtlasTexture(buttonTex, UIBox2.FromDimensions(new Vector2(10, 0), new Vector2(3, 24))),
+                Texture = new AtlasTexture(buttonTex, UIBox2.FromDimensions(new Vector2(10, 0), new Vector2(3, 24))),
             };
             topButtonSquare.SetPatchMargin(StyleBox.Margin.Horizontal, 0);
 
@@ -410,12 +413,16 @@ namespace Content.Client.Stylesheets
             lineEdit.SetPatchMargin(StyleBox.Margin.All, 3);
             lineEdit.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
 
-            var chatSubBGTex = resCache.GetTexture("/Textures/Interface/Nano/chat_sub_background.png");
-            var chatSubBG = new StyleBoxTexture
+            var chatBg = new StyleBoxFlat
             {
-                Texture = chatSubBGTex,
+                BackgroundColor = ChatBackgroundColor
             };
-            chatSubBG.SetPatchMargin(StyleBox.Margin.All, 3);
+
+            var chatSubBg = new StyleBoxFlat
+            {
+                BackgroundColor = ChatBackgroundColor,
+            };
+            chatSubBg.SetContentMarginOverride(StyleBox.Margin.All, 3);
 
             var actionSearchBoxTex = resCache.GetTexture("/Textures/Interface/Nano/black_panel_dark_thin_border.png");
             var actionSearchBox = new StyleBoxTexture
@@ -494,7 +501,7 @@ namespace Content.Client.Stylesheets
 
             // Placeholder
             var placeholderTexture = resCache.GetTexture("/Textures/Interface/Nano/placeholder.png");
-            var placeholder = new StyleBoxTexture {Texture = placeholderTexture};
+            var placeholder = new StyleBoxTexture { Texture = placeholderTexture };
             placeholder.SetPatchMargin(StyleBox.Margin.All, 19);
             placeholder.SetExpandMargin(StyleBox.Margin.All, -5);
             placeholder.Mode = StyleBoxTexture.StretchMode.Tile;
@@ -508,7 +515,7 @@ namespace Content.Client.Stylesheets
             var itemListItemBackground = new StyleBoxFlat {BackgroundColor = new Color(15, 15, 15)};
             itemListItemBackground.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
             itemListItemBackground.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
-            var itemListItemBackgroundTransparent = new StyleBoxFlat {BackgroundColor = Color.Transparent};
+            var itemListItemBackgroundTransparent = new StyleBoxFlat { BackgroundColor = Color.Transparent };
             itemListItemBackgroundTransparent.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
             itemListItemBackgroundTransparent.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
 
@@ -578,9 +585,9 @@ namespace Content.Client.Stylesheets
             sliderForeBox.SetPatchMargin(StyleBox.Margin.All, 13);
             sliderGrabBox.SetPatchMargin(StyleBox.Margin.All, 13);
 
-            var sliderFillGreen = new StyleBoxTexture(sliderFillBox) {Modulate = Color.LimeGreen};
-            var sliderFillRed = new StyleBoxTexture(sliderFillBox) {Modulate = Color.Red};
-            var sliderFillBlue = new StyleBoxTexture(sliderFillBox) {Modulate = Color.Blue};
+            var sliderFillGreen = new StyleBoxTexture(sliderFillBox) { Modulate = Color.LimeGreen };
+            var sliderFillRed = new StyleBoxTexture(sliderFillBox) { Modulate = Color.Red };
+            var sliderFillBlue = new StyleBoxTexture(sliderFillBox) { Modulate = Color.Blue };
             var sliderFillWhite = new StyleBoxTexture(sliderFillBox) { Modulate = Color.White };
 
             var boxFont13 = resCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
@@ -967,6 +974,13 @@ namespace Content.Client.Stylesheets
                 Element<TextEdit>().Pseudo(TextEdit.StylePseudoClassPlaceholder)
                     .Prop("font-color", Color.Gray),
 
+                // chat subpanels (chat lineedit backing, popup backings)
+                new StyleRule(new SelectorElement(typeof(PanelContainer), new[] {StyleClassChatPanel}, null, null),
+                    new[]
+                    {
+                        new StyleProperty(PanelContainer.StylePropertyPanel, chatBg),
+                    }),
+
                 // Chat lineedit - we don't actually draw a stylebox around the lineedit itself, we put it around the
                 // input + other buttons, so we must clear the default stylebox
                 new StyleRule(new SelectorElement(typeof(LineEdit), new[] {StyleClassChatLineEdit}, null, null),
@@ -975,13 +989,6 @@ namespace Content.Client.Stylesheets
                         new StyleProperty(LineEdit.StylePropertyStyleBox, new StyleBoxEmpty()),
                     }),
 
-                // chat subpanels (chat lineedit backing, popup backings)
-                new StyleRule(new SelectorElement(typeof(PanelContainer), new[] {StyleClassChatSubPanel}, null, null),
-                    new[]
-                    {
-                        new StyleProperty(PanelContainer.StylePropertyPanel, chatSubBG),
-                    }),
-
                 // Action searchbox lineedit
                 new StyleRule(new SelectorElement(typeof(LineEdit), new[] {StyleClassActionSearchBox}, null, null),
                     new[]
@@ -1622,6 +1629,25 @@ namespace Content.Client.Stylesheets
                 Element<Label>().Class("Disabled")
                     .Prop("font-color", DisabledFore),
 
+                // Radial menu buttons
+                Element<TextureButton>().Class("RadialMenuButton")
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Radial/button_normal.png")),
+                Element<TextureButton>().Class("RadialMenuButton")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Radial/button_hover.png")),
+
+                Element<TextureButton>().Class("RadialMenuCloseButton")
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Radial/close_normal.png")),
+                Element<TextureButton>().Class("RadialMenuCloseButton")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Radial/close_hover.png")),
+
+                Element<TextureButton>().Class("RadialMenuBackButton")
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Radial/back_normal.png")),
+                Element<TextureButton>().Class("RadialMenuBackButton")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Radial/back_hover.png")),
+
                 //PDA - Backgrounds
                 Element<PanelContainer>().Class("PdaContentBackground")
                     .Prop(PanelContainer.StylePropertyPanel, BaseButtonOpenBoth)
diff --git a/Content.Client/TextScreen/TextScreenSystem.cs b/Content.Client/TextScreen/TextScreenSystem.cs
index a736933d0f..53a620bd46 100644
--- a/Content.Client/TextScreen/TextScreenSystem.cs
+++ b/Content.Client/TextScreen/TextScreenSystem.cs
@@ -62,6 +62,8 @@ public sealed class TextScreenSystem : VisualizerSystem<TextScreenVisualsCompone
 
         SubscribeLocalEvent<TextScreenVisualsComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<TextScreenTimerComponent, ComponentInit>(OnTimerInit);
+
+        UpdatesOutsidePrediction = true;
     }
 
     private void OnInit(EntityUid uid, TextScreenVisualsComponent component, ComponentInit args)
@@ -110,17 +112,11 @@ public sealed class TextScreenSystem : VisualizerSystem<TextScreenVisualsCompone
         if (args.AppearanceData.TryGetValue(TextScreenVisuals.Color, out var color) && color is Color)
             component.Color = (Color) color;
 
-        // DefaultText: broadcast updates from comms consoles
-        // ScreenText: the text accompanying shuttle timers e.g. "ETA"
+        // DefaultText: fallback text e.g. broadcast updates from comms consoles
         if (args.AppearanceData.TryGetValue(TextScreenVisuals.DefaultText, out var newDefault) && newDefault is string)
-        {
-            string?[] defaultText = SegmentText((string) newDefault, component);
-            component.Text = defaultText;
-            component.TextToDraw = defaultText;
-            ResetText(uid, component);
-            BuildTextLayers(uid, component, args.Sprite);
-            DrawLayers(uid, component.LayerStatesToDraw);
-        }
+            component.Text = SegmentText((string) newDefault, component);
+
+        // ScreenText: currently rendered text e.g. the "ETA" accompanying shuttle timers
         if (args.AppearanceData.TryGetValue(TextScreenVisuals.ScreenText, out var text) && text is string)
         {
             component.TextToDraw = SegmentText((string) text, component);
diff --git a/Content.Client/Toilet/ToiletVisualsSystem.cs b/Content.Client/Toilet/ToiletVisualsSystem.cs
deleted file mode 100644
index 5367772ab0..0000000000
--- a/Content.Client/Toilet/ToiletVisualsSystem.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Shared.Toilet;
-using Robust.Client.GameObjects;
-
-namespace Content.Client.Toilet;
-
-public sealed class ToiletVisualsSystem : VisualizerSystem<ToiletComponent>
-{
-    protected override void OnAppearanceChange(EntityUid uid, ToiletComponent component, ref AppearanceChangeEvent args)
-    {
-        if (args.Sprite == null) return;
-
-        AppearanceSystem.TryGetData<bool>(uid, ToiletVisuals.LidOpen, out var lidOpen, args.Component);
-        AppearanceSystem.TryGetData<bool>(uid, ToiletVisuals.SeatUp, out var seatUp, args.Component);
-
-        var state = (lidOpen, seatUp) switch
-        {
-            (false, false) => "closed_toilet_seat_down",
-            (false, true) => "closed_toilet_seat_up",
-            (true, false) => "open_toilet_seat_down",
-            (true, true) => "open_toilet_seat_up"
-        };
-
-        args.Sprite.LayerSetState(0, state);
-    }
-}
diff --git a/Content.Client/UserInterface/Controls/RadialContainer.cs b/Content.Client/UserInterface/Controls/RadialContainer.cs
new file mode 100644
index 0000000000..be263d1277
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/RadialContainer.cs
@@ -0,0 +1,105 @@
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.Controls;
+using System.Linq;
+using System.Numerics;
+
+namespace Content.Client.UserInterface.Controls;
+
+[Virtual]
+public class RadialContainer : LayoutContainer
+{
+    /// <summary>
+    /// Specifies the anglular range, in radians, in which child elements will be placed.
+    /// The first value denotes the angle at which the first element is to be placed, and
+    /// the second value denotes the angle at which the last element is to be placed.
+    /// Both values must be between 0 and 2 PI radians
+    /// </summary>
+    /// <remarks>
+    /// The top of the screen is at 0 radians, and the bottom of the screen is at PI radians
+    /// </remarks>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public Vector2 AngularRange
+    {
+        get
+        {
+            return _angularRange;
+        }
+
+        set
+        {
+            var x = value.X;
+            var y = value.Y;
+
+            x = x > MathF.Tau ? x % MathF.Tau : x;
+            y = y > MathF.Tau ? y % MathF.Tau : y;
+
+            x = x < 0 ? MathF.Tau + x : x;
+            y = y < 0 ? MathF.Tau + y : y;
+
+            _angularRange = new Vector2(x, y);
+        }
+    }
+
+    private Vector2 _angularRange = new Vector2(0f, MathF.Tau - float.Epsilon);
+
+    /// <summary>
+    /// Determines the direction in which child elements will be arranged
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public RAlignment RadialAlignment { get; set; } = RAlignment.Clockwise;
+
+    /// <summary>
+    /// Determines how far from the radial container's center that its child elements will be placed
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float Radius { get; set; } = 100f;
+
+    /// <summary>
+    /// Sets whether the container should reserve a space on the layout for child which are not currently visible
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public bool ReserveSpaceForHiddenChildren { get; set; } = true;
+
+    /// <summary>
+    /// This container arranges its children, evenly separated, in a radial pattern
+    /// </summary>
+    public RadialContainer()
+    {
+
+    }
+
+    protected override void Draw(DrawingHandleScreen handle)
+    {
+        var children = ReserveSpaceForHiddenChildren ? Children : Children.Where(x => x.Visible);
+        var childCount = children.Count();
+
+        // Determine the size of the arc, accounting for clockwise and anti-clockwise arrangements
+        var arc = AngularRange.Y - AngularRange.X;
+        arc = (arc < 0) ? MathF.Tau + arc : arc;
+        arc = (RadialAlignment == RAlignment.AntiClockwise) ? MathF.Tau - arc : arc;
+
+        // Account for both circular arrangements and arc-based arrangements
+        var childMod = MathHelper.CloseTo(arc, MathF.Tau, 0.01f) ? 0 : 1;
+
+        // Determine the separation between child elements
+        var sepAngle = arc / (childCount - childMod);
+        sepAngle *= (RadialAlignment == RAlignment.AntiClockwise) ? -1f : 1f;
+
+        // Adjust the positions of all the child elements
+        foreach (var (i, child) in children.Select((x, i) => (i, x)))
+        {
+            var position = new Vector2(Radius * MathF.Sin(AngularRange.X + sepAngle * i) + Width / 2f - child.Width / 2f, -Radius * MathF.Cos(AngularRange.X + sepAngle * i) + Height / 2f - child.Height / 2f);
+            SetPosition(child, position);
+        }
+    }
+
+    /// <summary>
+    /// Specifies the different radial alignment modes
+    /// </summary>
+    /// <seealso cref="RadialAlignment"/>
+    public enum RAlignment : byte
+    {
+        Clockwise,
+        AntiClockwise,
+    }
+}
diff --git a/Content.Client/UserInterface/Controls/RadialMenu.cs b/Content.Client/UserInterface/Controls/RadialMenu.cs
new file mode 100644
index 0000000000..5f56ad7f86
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/RadialMenu.cs
@@ -0,0 +1,255 @@
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using System.Linq;
+using System.Numerics;
+
+namespace Content.Client.UserInterface.Controls;
+
+[Virtual]
+public class RadialMenu : BaseWindow
+{
+    /// <summary>
+    /// Contextual button used to traverse through previous layers of the radial menu
+    /// </summary>
+    public TextureButton? ContextualButton { get; set; }
+
+    /// <summary>
+    /// Set a style class to be applied to the contextual button when it is set to move the user back through previous layers of the radial menu
+    /// </summary>  
+    public string? BackButtonStyleClass
+    {
+        get
+        {
+            return _backButtonStyleClass;
+        }
+
+        set
+        {
+            _backButtonStyleClass = value;
+
+            if (_path.Count > 0 && ContextualButton != null && _backButtonStyleClass != null)
+                ContextualButton.SetOnlyStyleClass(_backButtonStyleClass);
+        }
+    }
+
+    /// <summary>
+    /// Set a style class to be applied to the contextual button when it will close the radial menu
+    /// </summary>
+    public string? CloseButtonStyleClass
+    {
+        get
+        {
+            return _closeButtonStyleClass;
+        }
+
+        set
+        {
+            _closeButtonStyleClass = value;
+
+            if (_path.Count == 0 && ContextualButton != null && _closeButtonStyleClass != null)
+                ContextualButton.SetOnlyStyleClass(_closeButtonStyleClass);
+        }
+    }
+
+    private List<Control> _path = new();
+    private string? _backButtonStyleClass;
+    private string? _closeButtonStyleClass;
+
+    /// <summary>
+    /// A free floating menu which enables the quick display of one or more radial containers
+    /// </summary>
+    /// <remarks>
+    /// Only one radial container is visible at a time (each container forming a separate 'layer' within 
+    /// the menu), along with a contextual button at the menu center, which will either return the user  
+    /// to the previous layer or close the menu if there are no previous layers left to traverse.
+    /// To create a functional radial menu, simply parent one or more named radial containers to it,
+    /// and populate the radial containers with RadialMenuButtons. Setting the TargetLayer field of these
+    /// buttons to the name of a radial conatiner will display the container in question to the user
+    /// whenever it is clicked in additon to any other actions assigned to the button
+    /// </remarks>
+    public RadialMenu()
+    {
+        // Hide all starting children (if any) except the first (this is the active layer)
+        if (ChildCount > 1)
+        {
+            for (int i = 1; i < ChildCount; i++)
+                GetChild(i).Visible = false;
+        }
+
+        // Auto generate a contextual button for moving back through visited layers
+        ContextualButton = new TextureButton()
+        {
+            HorizontalAlignment = HAlignment.Center,
+            VerticalAlignment = VAlignment.Center,
+            SetSize = new Vector2(64f, 64f),
+        };
+
+        ContextualButton.OnButtonUp += _ => ReturnToPreviousLayer();
+        AddChild(ContextualButton);
+
+        // Hide any further add children, unless its promoted to the active layer
+        OnChildAdded += child => child.Visible = (GetCurrentActiveLayer() == child);
+    }
+
+    private Control? GetCurrentActiveLayer()
+    {
+        var children = Children.Where(x => x != ContextualButton);
+
+        if (!children.Any())
+            return null;
+
+        return children.First(x => x.Visible);
+    }
+
+    public bool TryToMoveToNewLayer(string newLayer)
+    {
+        if (newLayer == string.Empty)
+            return false;
+
+        var currentLayer = GetCurrentActiveLayer();
+
+        if (currentLayer == null)
+            return false;
+
+        var result = false;
+
+        foreach (var child in Children)
+        {
+            if (child == ContextualButton)
+                continue;
+
+            // Hide layers which are not of interest
+            if (result == true || child.Name != newLayer)
+            {
+                child.Visible = false;
+            }
+
+            // Show the layer of interest
+            else
+            {
+                child.Visible = true;
+                result = true;
+            }
+        }
+
+        // Update the traversal path
+        if (result)
+            _path.Add(currentLayer);
+
+        // Set the style class of the button
+        if (_path.Count > 0 && ContextualButton != null && BackButtonStyleClass != null)
+            ContextualButton.SetOnlyStyleClass(BackButtonStyleClass);
+
+        return result;
+    }
+
+    public void ReturnToPreviousLayer()
+    {
+        // Close the menu if the traversal path is empty
+        if (_path.Count == 0)
+        {
+            Close();
+            return;
+        }
+
+        var lastChild = _path[^1];
+
+        // Hide all children except the contextual button
+        foreach (var child in Children)
+        {
+            if (child != ContextualButton)
+                child.Visible = false;
+        }
+
+        // Make the last visited layer visible, update the path list
+        lastChild.Visible = true;
+        _path.RemoveAt(_path.Count - 1);
+
+        // Set the style class of the button
+        if (_path.Count == 0 && ContextualButton != null && CloseButtonStyleClass != null)
+            ContextualButton.SetOnlyStyleClass(CloseButtonStyleClass);
+    }
+}
+
+[Virtual]
+public class RadialMenuButton : Button
+{
+    /// <summary>
+    /// Upon clicking this button the radial menu will transition to the named layer
+    /// </summary>
+    public string? TargetLayer { get; set; }
+
+    /// <summary>
+    /// A simple button that can move the user to a different layer within a radial menu
+    /// </summary>
+    public RadialMenuButton()
+    {
+        OnButtonUp += OnClicked;
+    }
+
+    private void OnClicked(ButtonEventArgs args)
+    {
+        if (TargetLayer == null || TargetLayer == string.Empty)
+            return;
+
+        var parent = FindParentMultiLayerContainer(this);
+
+        if (parent == null)
+            return;
+
+        parent.TryToMoveToNewLayer(TargetLayer);
+    }
+
+    private RadialMenu? FindParentMultiLayerContainer(Control control)
+    {
+        foreach (var ancestor in control.GetSelfAndLogicalAncestors())
+        {
+            if (ancestor is RadialMenu)
+                return ancestor as RadialMenu;
+        }
+
+        return null;
+    }
+}
+
+[Virtual]
+public class RadialMenuTextureButton : TextureButton
+{
+    /// <summary>
+    /// Upon clicking this button the radial menu will be moved to the named layer
+    /// </summary>
+    public string TargetLayer { get; set; } = string.Empty;
+
+    /// <summary>
+    /// A simple texture button that can move the user to a different layer within a radial menu
+    /// </summary>
+    public RadialMenuTextureButton()
+    {
+        OnButtonUp += OnClicked;
+    }
+
+    private void OnClicked(ButtonEventArgs args)
+    {
+        if (TargetLayer == string.Empty)
+            return;
+
+        var parent = FindParentMultiLayerContainer(this);
+
+        if (parent == null)
+            return;
+
+        parent.TryToMoveToNewLayer(TargetLayer);
+    }
+
+    private RadialMenu? FindParentMultiLayerContainer(Control control)
+    {
+        foreach (var ancestor in control.GetSelfAndLogicalAncestors())
+        {
+            if (ancestor is RadialMenu)
+                return ancestor as RadialMenu;
+        }
+
+        return null;
+    }
+}
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 8da306e78b..12782bdfd8 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -8,6 +8,7 @@ using Content.Client.Chat.UI;
 using Content.Client.Examine;
 using Content.Client.Gameplay;
 using Content.Client.Ghost;
+using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Screens;
 using Content.Client.UserInterface.Systems.Chat.Widgets;
 using Content.Client.UserInterface.Systems.Gameplay;
@@ -56,7 +57,6 @@ public sealed class ChatUIController : UIController
     [Dependency] private readonly IStateManager _state = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
-    [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IEntityManager _entities = default!;
 
     [UISystemDependency] private readonly ExamineSystem? _examine = default;
@@ -187,8 +187,8 @@ public sealed class ChatUIController : UIController
         _net.RegisterNetMessage<MsgChatMessage>(OnChatMessage);
         _net.RegisterNetMessage<MsgDeleteChatMessagesBy>(OnDeleteChatMessagesBy);
         SubscribeNetworkEvent<DamageForceSayEvent>(OnDamageForceSay);
-        _cfg.OnValueChanged(CCVars.ChatEnableColorName, (value) => { _chatNameColorsEnabled = value; });
-        _chatNameColorsEnabled = _cfg.GetCVar(CCVars.ChatEnableColorName);
+        _config.OnValueChanged(CCVars.ChatEnableColorName, (value) => { _chatNameColorsEnabled = value; });
+        _chatNameColorsEnabled = _config.GetCVar(CCVars.ChatEnableColorName);
 
         _speechBubbleRoot = new LayoutContainer();
 
@@ -251,6 +251,9 @@ public sealed class ChatUIController : UIController
         {
             _chatNameColors[i] = nameColors[i].ToHex();
         }
+
+        _config.OnValueChanged(CCVars.ChatWindowOpacity, OnChatWindowOpacityChanged);
+
     }
 
     private void OnUpdateChangelingChat(ChangelingUserStart ev)
@@ -271,6 +274,8 @@ public sealed class ChatUIController : UIController
 
         var viewportContainer = UIManager.ActiveScreen!.FindControl<LayoutContainer>("ViewportContainer");
         SetSpeechBubbleRoot(viewportContainer);
+
+        SetChatWindowOpacity(_config.GetCVar(CCVars.ChatWindowOpacity));
     }
 
     public void OnScreenUnload()
@@ -278,6 +283,34 @@ public sealed class ChatUIController : UIController
         SetMainChat(false);
     }
 
+    private void OnChatWindowOpacityChanged(float opacity)
+    {
+        SetChatWindowOpacity(opacity);
+    }
+
+    private void SetChatWindowOpacity(float opacity)
+    {
+        var chatBox = UIManager.ActiveScreen?.GetWidget<ChatBox>() ?? UIManager.ActiveScreen?.GetWidget<ResizableChatBox>();
+
+        var panel = chatBox?.ChatWindowPanel;
+        if (panel is null)
+            return;
+
+        Color color;
+        if (panel.PanelOverride is StyleBoxFlat styleBoxFlat)
+            color = styleBoxFlat.BackgroundColor;
+        else if (panel.TryGetStyleProperty<StyleBox>(PanelContainer.StylePropertyPanel, out var style)
+                 && style is StyleBoxFlat propStyleBoxFlat)
+            color = propStyleBoxFlat.BackgroundColor;
+        else
+            color = StyleNano.ChatBackgroundColor;
+
+        panel.PanelOverride = new StyleBoxFlat
+        {
+            BackgroundColor = color.WithAlpha(opacity)
+        };
+    }
+
     public void SetMainChat(bool setting)
     {
         if (UIManager.ActiveScreen == null)
@@ -823,7 +856,7 @@ public sealed class ChatUIController : UIController
         ProcessChatMessage(msg);
 
         if ((msg.Channel & ChatChannel.AdminRelated) == 0 ||
-            _cfg.GetCVar(CCVars.ReplayRecordAdminChat))
+            _config.GetCVar(CCVars.ReplayRecordAdminChat))
         {
             _replayRecording.RecordClientMessage(msg);
         }
@@ -882,7 +915,7 @@ public sealed class ChatUIController : UIController
                 break;
 
             case ChatChannel.LOOC:
-                if (_cfg.GetCVar(CCVars.LoocAboveHeadShow))
+                if (_config.GetCVar(CCVars.LoocAboveHeadShow))
                     AddSpeechBubble(msg, SpeechBubble.SpeechType.Looc);
                 break;
         }
diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.xaml.cs
similarity index 95%
rename from Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.cs
rename to Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.xaml.cs
index 843fd46c1a..0326664bd6 100644
--- a/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.xaml.cs
@@ -1,4 +1,5 @@
-using Content.Shared.Chat;
+using Content.Client.Stylesheets;
+using Content.Shared.Chat;
 using Content.Shared.Input;
 using Robust.Client.UserInterface.Controls;
 
@@ -44,6 +45,7 @@ public class ChatInputBox : PanelContainer
             StyleClasses = {"chatFilterOptionButton"}
         };
         Container.AddChild(FilterButton);
+        AddStyleClass(StyleNano.StyleClassChatSubPanel);
         ChannelSelector.OnChannelSelect += UpdateActiveChannel;
     }
 
diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
index 2bcd1a4fa0..c9a16bad83 100644
--- a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
+++ b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
@@ -7,7 +7,8 @@
     HorizontalExpand="True"
     VerticalExpand="True"
     MinSize="465 225">
-    <PanelContainer HorizontalExpand="True" VerticalExpand="True" StyleClasses="FuckyWuckyBackground" >
+    <PanelContainer Name="ChatWindowPanel" Access="Public" HorizontalExpand="True" VerticalExpand="True"
+                    StyleClasses="StyleNano.StyleClassChatPanel">
         <BoxContainer Orientation="Vertical" SeparationOverride="4" HorizontalExpand="True" VerticalExpand="True">
             <OutputPanel Name="Contents" HorizontalExpand="True" VerticalExpand="True" Margin="2 2 2 2" >
                 <OutputPanel.StyleBoxOverride>
diff --git a/Content.Client/UserInterface/Systems/Inventory/Controls/ItemStatusPanel.xaml b/Content.Client/UserInterface/Systems/Inventory/Controls/ItemStatusPanel.xaml
index 2c622b82b9..d469e6ced0 100644
--- a/Content.Client/UserInterface/Systems/Inventory/Controls/ItemStatusPanel.xaml
+++ b/Content.Client/UserInterface/Systems/Inventory/Controls/ItemStatusPanel.xaml
@@ -1,4 +1,4 @@
-<controls:ItemStatusPanel
+<controls:ItemStatusPanel
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Systems.Inventory.Controls"
     xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
@@ -18,7 +18,7 @@
         </PanelContainer.PanelOverride>
         <BoxContainer Orientation="Vertical" SeparationOverride="0">
             <BoxContainer Name="StatusContents" Orientation="Vertical"/>
-            <Label Name="ItemNameLabel" ClipText="True" StyleClasses="ItemStatus"/>
+            <Label Name="ItemNameLabel" StyleClasses="ItemStatus"/>
         </BoxContainer>
     </PanelContainer>
 </controls:ItemStatusPanel>
diff --git a/Content.Client/Zombies/ZombieSystem.cs b/Content.Client/Zombies/ZombieSystem.cs
index 7c1fb38e74..49b5d6aec1 100644
--- a/Content.Client/Zombies/ZombieSystem.cs
+++ b/Content.Client/Zombies/ZombieSystem.cs
@@ -46,7 +46,7 @@ public sealed class ZombieSystem : EntitySystem
         args.Cancelled = true;
     }
 
-    private void OnCanDisplayStatusIcons(EntityUid uid, InitialInfectedComponent component, CanDisplayStatusIconsEvent args)
+    private void OnCanDisplayStatusIcons(EntityUid uid, InitialInfectedComponent component, ref CanDisplayStatusIconsEvent args)
     {
         if (HasComp<InitialInfectedComponent>(args.User) && !HasComp<ZombieComponent>(args.User))
             return;
diff --git a/Content.IntegrationTests/Tests/Access/AccessReaderTest.cs b/Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
index 7d86fc2f6c..895bb2cf87 100644
--- a/Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
+++ b/Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
@@ -57,9 +57,9 @@ namespace Content.IntegrationTests.Tests.Access
                 var reader = new AccessReaderComponent();
                 Assert.Multiple(() =>
                 {
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "Foo" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "Bar" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<string>(), reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "Foo" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "Bar" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<ProtoId<AccessLevelPrototype>>(), reader), Is.True);
                 });
 
                 // test deny
@@ -67,58 +67,58 @@ namespace Content.IntegrationTests.Tests.Access
                 reader.DenyTags.Add("A");
                 Assert.Multiple(() =>
                 {
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "Foo" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A", "Foo" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<string>(), reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "Foo" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A", "Foo" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<ProtoId<AccessLevelPrototype>>(), reader), Is.True);
                 });
 
                 // test one list
                 reader = new AccessReaderComponent();
-                reader.AccessLists.Add(new HashSet<string> { "A" });
+                reader.AccessLists.Add(new HashSet<ProtoId<AccessLevelPrototype>> { "A" });
                 Assert.Multiple(() =>
                 {
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "B" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A", "B" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<string>(), reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "B" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A", "B" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<ProtoId<AccessLevelPrototype>>(), reader), Is.False);
                 });
 
                 // test one list - two items
                 reader = new AccessReaderComponent();
-                reader.AccessLists.Add(new HashSet<string> { "A", "B" });
+                reader.AccessLists.Add(new HashSet<ProtoId<AccessLevelPrototype>> { "A", "B" });
                 Assert.Multiple(() =>
                 {
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "B" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A", "B" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<string>(), reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "B" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A", "B" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<ProtoId<AccessLevelPrototype>>(), reader), Is.False);
                 });
 
                 // test two list
                 reader = new AccessReaderComponent();
-                reader.AccessLists.Add(new HashSet<string> { "A" });
-                reader.AccessLists.Add(new HashSet<string> { "B", "C" });
+                reader.AccessLists.Add(new HashSet<ProtoId<AccessLevelPrototype>> { "A" });
+                reader.AccessLists.Add(new HashSet<ProtoId<AccessLevelPrototype>> { "B", "C" });
                 Assert.Multiple(() =>
                 {
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "B" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A", "B" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "C", "B" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "C", "B", "A" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<string>(), reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "B" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A", "B" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "C", "B" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "C", "B", "A" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<ProtoId<AccessLevelPrototype>>(), reader), Is.False);
                 });
 
                 // test deny list
                 reader = new AccessReaderComponent();
-                reader.AccessLists.Add(new HashSet<string> { "A" });
+                reader.AccessLists.Add(new HashSet<ProtoId<AccessLevelPrototype>> { "A" });
                 reader.DenyTags.Add("B");
                 Assert.Multiple(() =>
                 {
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "B" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A", "B" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<string>(), reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "B" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A", "B" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<ProtoId<AccessLevelPrototype>>(), reader), Is.False);
                 });
             });
             await pair.CleanReturnAsync();
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs b/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs
index df51078ef0..fd5426478b 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs
@@ -56,7 +56,7 @@ public sealed class CraftingTests : InteractionTest
 
         // Player's hands should be full of the remaining rods, except those dropped during the failed crafting attempt.
         // Spear and left over stacks should be on the floor.
-        await AssertEntityLookup((Rod, 2), (Cable, 8), (ShardGlass, 2), (Spear, 1));
+        await AssertEntityLookup((Rod, 2), (Cable, 7), (ShardGlass, 2), (Spear, 1));
     }
 
     // The following is wrapped in an if DEBUG. This is because of cursed state handling bugs. Tests don't (de)serialize
@@ -100,7 +100,7 @@ public sealed class CraftingTests : InteractionTest
             Assert.That(sys.IsEntityInContainer(rods), Is.False);
             Assert.That(sys.IsEntityInContainer(wires), Is.False);
             Assert.That(rodStack, Has.Count.EqualTo(8));
-            Assert.That(wireStack, Has.Count.EqualTo(8));
+            Assert.That(wireStack, Has.Count.EqualTo(7));
 
             await FindEntity(Spear, shouldSucceed: false);
         });
diff --git a/Content.Server/Access/Systems/AccessOverriderSystem.cs b/Content.Server/Access/Systems/AccessOverriderSystem.cs
index 684312c7c1..25f2e4c1b0 100644
--- a/Content.Server/Access/Systems/AccessOverriderSystem.cs
+++ b/Content.Server/Access/Systems/AccessOverriderSystem.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Server.Popups;
+using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Administration.Logs;
@@ -12,6 +13,7 @@ using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.AccessOverriderComponent;
 
 namespace Content.Server.Access.Systems;
@@ -26,6 +28,7 @@ public sealed class AccessOverriderSystem : SharedAccessOverriderSystem
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
 
     public override void Initialize()
     {
@@ -108,17 +111,20 @@ public sealed class AccessOverriderSystem : SharedAccessOverriderSystem
         var targetLabel = Loc.GetString("access-overrider-window-no-target");
         var targetLabelColor = Color.Red;
 
-        string[]? possibleAccess = null;
-        string[]? currentAccess = null;
-        string[]? missingAccess = null;
+        ProtoId<AccessLevelPrototype>[]? possibleAccess = null;
+        ProtoId<AccessLevelPrototype>[]? currentAccess = null;
+        ProtoId<AccessLevelPrototype>[]? missingAccess = null;
 
         if (component.TargetAccessReaderId is { Valid: true } accessReader)
         {
             targetLabel = Loc.GetString("access-overrider-window-target-label") + " " + EntityManager.GetComponent<MetaDataComponent>(component.TargetAccessReaderId).EntityName;
             targetLabelColor = Color.White;
 
-            List<HashSet<string>> currentAccessHashsets = EntityManager.GetComponent<AccessReaderComponent>(accessReader).AccessLists;
-            currentAccess = ConvertAccessHashSetsToList(currentAccessHashsets)?.ToArray();
+            if (!_accessReader.GetMainAccessReader(accessReader, out var accessReaderComponent))
+                return;
+
+            var currentAccessHashsets = accessReaderComponent.AccessLists;
+            currentAccess = ConvertAccessHashSetsToList(currentAccessHashsets).ToArray();
         }
 
         if (component.PrivilegedIdSlot.Item is { Valid: true } idCard)
@@ -151,15 +157,15 @@ public sealed class AccessOverriderSystem : SharedAccessOverriderSystem
         _userInterface.TrySetUiState(uid, AccessOverriderUiKey.Key, newState);
     }
 
-    private List<string> ConvertAccessHashSetsToList(List<HashSet<string>> accessHashsets)
+    private List<ProtoId<AccessLevelPrototype>> ConvertAccessHashSetsToList(List<HashSet<ProtoId<AccessLevelPrototype>>> accessHashsets)
     {
-        List<string> accessList = new List<string>();
+        List<ProtoId<AccessLevelPrototype>> accessList = new List<ProtoId<AccessLevelPrototype>>();
 
         if (accessHashsets != null && accessHashsets.Any())
         {
-            foreach (HashSet<string> hashSet in accessHashsets)
+            foreach (HashSet<ProtoId<AccessLevelPrototype>> hashSet in accessHashsets)
             {
-                foreach (string hash in hashSet.ToArray())
+                foreach (ProtoId<AccessLevelPrototype> hash in hashSet.ToArray())
                 {
                     accessList.Add(hash);
                 }
@@ -169,15 +175,15 @@ public sealed class AccessOverriderSystem : SharedAccessOverriderSystem
         return accessList;
     }
 
-    private List<HashSet<string>> ConvertAccessListToHashSet(List<string> accessList)
+    private List<HashSet<ProtoId<AccessLevelPrototype>>> ConvertAccessListToHashSet(List<ProtoId<AccessLevelPrototype>> accessList)
     {
-        List<HashSet<string>> accessHashsets = new List<HashSet<string>>();
+        List<HashSet<ProtoId<AccessLevelPrototype>>> accessHashsets = new List<HashSet<ProtoId<AccessLevelPrototype>>>();
 
         if (accessList != null && accessList.Any())
         {
-            foreach (string access in accessList)
+            foreach (ProtoId<AccessLevelPrototype> access in accessList)
             {
-                accessHashsets.Add(new HashSet<string>() { access });
+                accessHashsets.Add(new HashSet<ProtoId<AccessLevelPrototype>>() { access });
             }
         }
 
@@ -188,7 +194,7 @@ public sealed class AccessOverriderSystem : SharedAccessOverriderSystem
     /// Called whenever an access button is pressed, adding or removing that access requirement from the target access reader.
     /// </summary>
     private void TryWriteToTargetAccessReaderId(EntityUid uid,
-        List<string> newAccessList,
+        List<ProtoId<AccessLevelPrototype>> newAccessList,
         EntityUid player,
         AccessOverriderComponent? component = null)
     {
@@ -211,9 +217,7 @@ public sealed class AccessOverriderSystem : SharedAccessOverriderSystem
             return;
         }
 
-        TryComp(component.TargetAccessReaderId, out AccessReaderComponent? accessReader);
-
-        if (accessReader == null)
+        if (!_accessReader.GetMainAccessReader(component.TargetAccessReaderId, out var accessReader))
             return;
 
         var oldTags = ConvertAccessHashSetsToList(accessReader.AccessLists);
@@ -262,10 +266,10 @@ public sealed class AccessOverriderSystem : SharedAccessOverriderSystem
         if (!Resolve(uid, ref component))
             return true;
 
-        if (!EntityManager.TryGetComponent<AccessReaderComponent>(uid, out var reader))
+        if (_accessReader.GetMainAccessReader(uid, out var accessReader))
             return true;
 
         var privilegedId = component.PrivilegedIdSlot.Item;
-        return privilegedId != null && _accessReader.IsAllowed(privilegedId.Value, uid, reader);
+        return privilegedId != null && _accessReader.IsAllowed(privilegedId.Value, uid, accessReader);
     }
 }
diff --git a/Content.Server/Access/Systems/IdCardConsoleSystem.cs b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
index 79b7f4c1e8..4b4967db2a 100644
--- a/Content.Server/Access/Systems/IdCardConsoleSystem.cs
+++ b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
@@ -12,6 +12,7 @@ using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using System.Linq;
 using static Content.Shared.Access.Components.IdCardConsoleComponent;
+using Content.Shared.Access;
 
 namespace Content.Server.Access.Systems;
 
@@ -55,11 +56,11 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
             return;
 
         var privilegedIdName = string.Empty;
-        string[]? possibleAccess = null;
+        List<ProtoId<AccessLevelPrototype>>? possibleAccess = null;
         if (component.PrivilegedIdSlot.Item is { Valid: true } item)
         {
             privilegedIdName = EntityManager.GetComponent<MetaDataComponent>(item).EntityName;
-            possibleAccess = _accessReader.FindAccessTags(item).ToArray();
+            possibleAccess = _accessReader.FindAccessTags(item).ToList();
         }
 
         IdCardConsoleBoundUserInterfaceState newState;
@@ -84,7 +85,7 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
             var targetIdComponent = EntityManager.GetComponent<IdCardComponent>(targetId);
             var targetAccessComponent = EntityManager.GetComponent<AccessComponent>(targetId);
 
-            var jobProto = string.Empty;
+            var jobProto = new ProtoId<AccessLevelPrototype>(string.Empty);
             var jobIcon = targetIdComponent.JobIcon; //WD-EDIT
 
             if (TryComp<StationRecordKeyStorageComponent>(targetId, out var keyStorage)
@@ -101,7 +102,7 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
                 true,
                 targetIdComponent.FullName,
                 targetIdComponent.JobTitle,
-                targetAccessComponent.Tags.ToArray(),
+                targetAccessComponent.Tags.ToList(),
                 possibleAccess,
                 jobProto,
                 privilegedIdName,
@@ -122,8 +123,8 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
         EntityUid uid,
         string newFullName,
         string newJobTitle,
-        List<string> newAccessList,
-        string newJobProto,
+        List<ProtoId<AccessLevelPrototype>> newAccessList,
+        ProtoId<AccessLevelPrototype> newJobProto,
         string? newJobIcon,
         EntityUid player,
         IdCardConsoleComponent? component = null)
@@ -153,7 +154,7 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
             return;
         }
 
-        var oldTags = _access.TryGetTags(targetId) ?? new List<string>();
+        var oldTags = _access.TryGetTags(targetId) ?? new List<ProtoId<AccessLevelPrototype>>();
         oldTags = oldTags.ToList();
 
         var privilegedId = component.PrivilegedIdSlot.Item;
@@ -209,7 +210,7 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
         EntityUid uid,
         EntityUid targetId,
         string newFullName,
-        string newJobTitle,
+        ProtoId<AccessLevelPrototype> newJobTitle,
         JobPrototype? newJobProto,
         string? newJobIcon) // WD EDIT
     {
diff --git a/Content.Server/Administration/Commands/AGhost.cs b/Content.Server/Administration/Commands/AGhost.cs
index 6740eedfcc..4f0c49bd95 100644
--- a/Content.Server/Administration/Commands/AGhost.cs
+++ b/Content.Server/Administration/Commands/AGhost.cs
@@ -1,77 +1,123 @@
-using Content.Server.GameTicking;
+using System.Linq;
+using Content.Server.GameTicking;
+using Content.Server.Ghost;
+using Content.Server.Mind;
 using Content.Shared.Administration;
 using Content.Shared.Ghost;
 using Content.Shared.Mind;
+using Robust.Server.GameObjects;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
 
-namespace Content.Server.Administration.Commands
+namespace Content.Server.Administration.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class AGhost : LocalizedCommands
 {
-    [AdminCommand(AdminFlags.Admin)]
-    public sealed class AGhost : IConsoleCommand
+    [Dependency] private readonly IEntityManager _entities = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+
+    public override string Command => "aghost";
+    public override string Description => LocalizationManager.GetString("aghost-description");
+    public override string Help => "aghost";
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
     {
-        [Dependency] private readonly IEntityManager _entities = default!;
-
-        public string Command => "aghost";
-        public string Description => "Makes you an admin ghost.";
-        public string Help => "aghost";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        if (args.Length == 1)
         {
-            var player = shell.Player;
-            if (player == null)
-            {
-                shell.WriteLine("Nah");
-                return;
-            }
-
-            var mindSystem = _entities.System<SharedMindSystem>();
-            if (!mindSystem.TryGetMind(player, out var mindId, out var mind))
-            {
-                shell.WriteLine("You can't ghost here!");
-                return;
-            }
-
-            var metaDataSystem = _entities.System<MetaDataSystem>();
-
-            EntityCoordinates? coordinates = null;
-            if (player.AttachedEntity != null)
-                coordinates = _entities.GetComponent<TransformComponent>(player.AttachedEntity.Value).Coordinates;
-
-            if (mind.VisitingEntity != default && _entities.TryGetComponent<GhostComponent>(mind.VisitingEntity, out var oldGhostComponent))
-            {
-                mindSystem.UnVisit(mindId, mind);
-                // If already an admin ghost, then return to body.
-                if (oldGhostComponent.CanGhostInteract)
-                    return;
-            }
-
-            var canReturn = mind.CurrentEntity != null
-                            && !_entities.HasComponent<GhostComponent>(mind.CurrentEntity);
-            coordinates ??= player.AttachedEntity != null
-                ? _entities.GetComponent<TransformComponent>(player.AttachedEntity.Value).Coordinates
-                : EntitySystem.Get<GameTicker>().GetObserverSpawnPoint();
-            var ghost = _entities.SpawnEntity(GameTicker.AdminObserverPrototypeName, coordinates.Value);
-            _entities.GetComponent<TransformComponent>(ghost).AttachToGridOrMap();
-
-            if (canReturn)
-            {
-                // TODO: Remove duplication between all this and "GamePreset.OnGhostAttempt()"...
-                if (!string.IsNullOrWhiteSpace(mind.CharacterName))
-                    metaDataSystem.SetEntityName(ghost, mind.CharacterName);
-                else if (!string.IsNullOrWhiteSpace(mind.Session?.Name))
-                    metaDataSystem.SetEntityName(ghost, mind.Session.Name);
-
-                mindSystem.Visit(mindId, ghost, mind);
-            }
-            else
-            {
-                metaDataSystem.SetEntityName(ghost, player.Name);
-                mindSystem.TransferTo(mindId, ghost, mind: mind);
-            }
-
-            var comp = _entities.GetComponent<GhostComponent>(ghost);
-            EntitySystem.Get<SharedGhostSystem>().SetCanReturnToBody(comp, canReturn);
+            var names = _playerManager.Sessions.OrderBy(c => c.Name).Select(c => c.Name).ToArray();
+            return CompletionResult.FromHintOptions(names, LocalizationManager.GetString("shell-argument-username-optional-hint"));
         }
+
+        return CompletionResult.Empty;
+    }
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length > 1)
+        {
+            shell.WriteError(LocalizationManager.GetString("shell-wrong-arguments-number"));
+            return;
+        }
+
+        var player = shell.Player;
+        var self = player != null;
+        if (player == null)
+        {
+            // If you are not a player, you require a player argument.
+            if (args.Length == 0)
+            {
+                shell.WriteError(LocalizationManager.GetString("shell-need-exactly-one-argument"));
+                return;
+            }
+
+            var didFind = _playerManager.TryGetSessionByUsername(args[0], out player);
+            if (!didFind)
+            {
+                shell.WriteError(LocalizationManager.GetString("shell-target-player-does-not-exist"));
+                return;
+            }
+        }
+
+        // If you are a player and a username is provided, a lookup is done to find the target player.
+        if (args.Length == 1)
+        {
+            var didFind = _playerManager.TryGetSessionByUsername(args[0], out player);
+            if (!didFind)
+            {
+                shell.WriteError(LocalizationManager.GetString("shell-target-player-does-not-exist"));
+                return;
+            }
+        }
+
+        var mindSystem = _entities.System<SharedMindSystem>();
+        var metaDataSystem = _entities.System<MetaDataSystem>();
+        var ghostSystem = _entities.System<SharedGhostSystem>();
+        var transformSystem = _entities.System<TransformSystem>();
+        var gameTicker = _entities.System<GameTicker>();
+
+        if (!mindSystem.TryGetMind(player, out var mindId, out var mind))
+        {
+            shell.WriteError(self
+                ? LocalizationManager.GetString("aghost-no-mind-self")
+                : LocalizationManager.GetString("aghost-no-mind-other"));
+            return;
+        }
+
+        if (mind.VisitingEntity != default && _entities.TryGetComponent<GhostComponent>(mind.VisitingEntity, out var oldGhostComponent))
+        {
+            mindSystem.UnVisit(mindId, mind);
+            // If already an admin ghost, then return to body.
+            if (oldGhostComponent.CanGhostInteract)
+                return;
+        }
+
+        var canReturn = mind.CurrentEntity != null
+                        && !_entities.HasComponent<GhostComponent>(mind.CurrentEntity);
+        var coordinates = player!.AttachedEntity != null
+            ? _entities.GetComponent<TransformComponent>(player.AttachedEntity.Value).Coordinates
+            : gameTicker.GetObserverSpawnPoint();
+        var ghost = _entities.SpawnEntity(GameTicker.AdminObserverPrototypeName, coordinates);
+        transformSystem.AttachToGridOrMap(ghost, _entities.GetComponent<TransformComponent>(ghost));
+
+        if (canReturn)
+        {
+            // TODO: Remove duplication between all this and "GamePreset.OnGhostAttempt()"...
+            if (!string.IsNullOrWhiteSpace(mind.CharacterName))
+                metaDataSystem.SetEntityName(ghost, mind.CharacterName);
+            else if (!string.IsNullOrWhiteSpace(mind.Session?.Name))
+                metaDataSystem.SetEntityName(ghost, mind.Session.Name);
+
+            mindSystem.Visit(mindId, ghost, mind);
+        }
+        else
+        {
+            metaDataSystem.SetEntityName(ghost, player.Name);
+            mindSystem.TransferTo(mindId, ghost, mind: mind);
+        }
+
+        var comp = _entities.GetComponent<GhostComponent>(ghost);
+        ghostSystem.SetCanReturnToBody(comp, canReturn);
     }
 }
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index 9d66338c8b..328fa74484 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -35,6 +35,7 @@ using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Administration.Systems;
@@ -844,14 +845,14 @@ public sealed partial class AdminVerbSystem
     {
         var allAccess = _prototypeManager
             .EnumeratePrototypes<AccessLevelPrototype>()
-            .Select(p => p.ID).ToArray();
+            .Select(p => new ProtoId<AccessLevelPrototype>(p.ID)).ToArray();
 
         _accessSystem.TrySetTags(entity, allAccess);
     }
 
     private void RevokeAllAccess(EntityUid entity)
     {
-        _accessSystem.TrySetTags(entity, Array.Empty<string>());
+        _accessSystem.TrySetTags(entity, new List<ProtoId<AccessLevelPrototype>>());
     }
 
     public enum TricksVerbPriorities
diff --git a/Content.Server/Advertise/Components/AdvertiseComponent.cs b/Content.Server/Advertise/Components/AdvertiseComponent.cs
index 140bc6b902..531b31031d 100644
--- a/Content.Server/Advertise/Components/AdvertiseComponent.cs
+++ b/Content.Server/Advertise/Components/AdvertiseComponent.cs
@@ -1,7 +1,6 @@
 using Content.Server.Advertise.EntitySystems;
 using Content.Shared.Advertise;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Advertise.Components;
 
@@ -37,9 +36,4 @@ public sealed partial class AdvertiseComponent : Component
     [DataField]
     public TimeSpan NextAdvertisementTime { get; set; } = TimeSpan.Zero;
 
-    /// <summary>
-    /// Whether the entity will say advertisements or not.
-    /// </summary>
-    [DataField]
-    public bool Enabled { get; set; } = true;
 }
diff --git a/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs b/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
index bb254d11ef..12eac72cfe 100644
--- a/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
+++ b/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
@@ -23,115 +23,83 @@ public sealed class AdvertiseSystem : EntitySystem
     /// <summary>
     /// The next time the game will check if advertisements should be displayed
     /// </summary>
-    private TimeSpan _nextCheckTime = TimeSpan.MaxValue;
+    private TimeSpan _nextCheckTime = TimeSpan.MinValue;
 
     public override void Initialize()
     {
         SubscribeLocalEvent<AdvertiseComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<AdvertiseComponent, PowerChangedEvent>(OnPowerChanged);
 
-        SubscribeLocalEvent<ApcPowerReceiverComponent, AdvertiseEnableChangeAttemptEvent>(OnPowerReceiverEnableChangeAttempt);
-        SubscribeLocalEvent<VendingMachineComponent, AdvertiseEnableChangeAttemptEvent>(OnVendingEnableChangeAttempt);
+        SubscribeLocalEvent<ApcPowerReceiverComponent, AttemptAdvertiseEvent>(OnPowerReceiverAttemptAdvertiseEvent);
+        SubscribeLocalEvent<VendingMachineComponent, AttemptAdvertiseEvent>(OnVendingAttemptAdvertiseEvent);
 
-        // The component inits will lower this.
-        _nextCheckTime = TimeSpan.MaxValue;
+        _nextCheckTime = TimeSpan.MinValue;
     }
 
-    private void OnMapInit(EntityUid uid, AdvertiseComponent advertise, MapInitEvent args)
+    private void OnMapInit(EntityUid uid, AdvertiseComponent advert, MapInitEvent args)
     {
-        RefreshTimer(uid, advertise);
+        RandomizeNextAdvertTime(advert);
+        _nextCheckTime = MathHelper.Min(advert.NextAdvertisementTime, _nextCheckTime);
     }
 
-    private void OnPowerChanged(EntityUid uid, AdvertiseComponent advertise, ref PowerChangedEvent args)
+    private void RandomizeNextAdvertTime(AdvertiseComponent advert)
     {
-        SetEnabled(uid, args.Powered, advertise);
-    }
-
-    public void RefreshTimer(EntityUid uid, AdvertiseComponent? advertise = null)
-    {
-        if (!Resolve(uid, ref advertise))
-            return;
-
-        if (!advertise.Enabled)
-            return;
-
-        var minDuration = Math.Max(1, advertise.MinimumWait);
-        var maxDuration = Math.Max(minDuration, advertise.MaximumWait);
+        var minDuration = Math.Max(1, advert.MinimumWait);
+        var maxDuration = Math.Max(minDuration, advert.MaximumWait);
         var waitDuration = TimeSpan.FromSeconds(_random.Next(minDuration, maxDuration));
-        var nextTime = _gameTiming.CurTime + waitDuration;
 
-        advertise.NextAdvertisementTime = nextTime;
-
-        _nextCheckTime = MathHelper.Min(nextTime, _nextCheckTime);
+        advert.NextAdvertisementTime = _gameTiming.CurTime + waitDuration;
     }
 
-    public void SayAdvertisement(EntityUid uid, AdvertiseComponent? advertise = null)
+    public void SayAdvertisement(EntityUid uid, AdvertiseComponent? advert = null)
     {
-        if (!Resolve(uid, ref advertise))
+        if (!Resolve(uid, ref advert))
             return;
 
-        if (_prototypeManager.TryIndex(advertise.Pack, out var advertisements))
-            _chat.TrySendInGameICMessage(uid, Loc.GetString(_random.Pick(advertisements.Messages)), InGameICChatType.Speak, hideChat: true);
-    }
-
-    public void SetEnabled(EntityUid uid, bool enable, AdvertiseComponent? advertise = null)
-    {
-        if (!Resolve(uid, ref advertise))
-            return;
-
-        if (advertise.Enabled == enable)
-            return;
-
-        var attemptEvent = new AdvertiseEnableChangeAttemptEvent(enable);
-        RaiseLocalEvent(uid, attemptEvent);
-
+        var attemptEvent = new AttemptAdvertiseEvent(uid);
+        RaiseLocalEvent(uid, ref attemptEvent);
         if (attemptEvent.Cancelled)
             return;
 
-        advertise.Enabled = enable;
-        RefreshTimer(uid, advertise);
-    }
-
-    private static void OnPowerReceiverEnableChangeAttempt(EntityUid uid, ApcPowerReceiverComponent component, AdvertiseEnableChangeAttemptEvent args)
-    {
-        if (args.Enabling && !component.Powered)
-            args.Cancel();
-    }
-
-    private static void OnVendingEnableChangeAttempt(EntityUid uid, VendingMachineComponent component, AdvertiseEnableChangeAttemptEvent args)
-    {
-        if (args.Enabling && component.Broken)
-            args.Cancel();
+        if (_prototypeManager.TryIndex(advert.Pack, out var advertisements))
+            _chat.TrySendInGameICMessage(uid, Loc.GetString(_random.Pick(advertisements.Messages)), InGameICChatType.Speak, hideChat: true);
     }
 
     public override void Update(float frameTime)
     {
-        var curTime = _gameTiming.CurTime;
-        if (_nextCheckTime > curTime)
+        var currentGameTime = _gameTiming.CurTime;
+        if (_nextCheckTime > currentGameTime)
             return;
 
-        _nextCheckTime = curTime + _maximumNextCheckDuration;
+        // _nextCheckTime starts at TimeSpan.MinValue, so this has to SET the value, not just increment it.
+        _nextCheckTime = currentGameTime + _maximumNextCheckDuration;
 
         var query = EntityQueryEnumerator<AdvertiseComponent>();
         while (query.MoveNext(out var uid, out var advert))
         {
-            if (!advert.Enabled)
-                continue;
-
-            // If this isn't advertising yet
-            if (advert.NextAdvertisementTime > curTime)
+            if (currentGameTime > advert.NextAdvertisementTime)
             {
-                _nextCheckTime = MathHelper.Min(advert.NextAdvertisementTime, _nextCheckTime);
-                continue;
+                SayAdvertisement(uid, advert);
+                // The timer is always refreshed when it expires, to prevent mass advertising (ex: all the vending machines have no power, and get it back at the same time).
+                RandomizeNextAdvertTime(advert);
             }
-
-            SayAdvertisement(uid, advert);
-            RefreshTimer(uid, advert);
+            _nextCheckTime = MathHelper.Min(advert.NextAdvertisementTime, _nextCheckTime);
         }
     }
+
+
+    private static void OnPowerReceiverAttemptAdvertiseEvent(EntityUid uid, ApcPowerReceiverComponent powerReceiver, ref AttemptAdvertiseEvent args)
+    {
+        args.Cancelled |= !powerReceiver.Powered;
+    }
+
+    private static void OnVendingAttemptAdvertiseEvent(EntityUid uid, VendingMachineComponent machine, ref AttemptAdvertiseEvent args)
+    {
+        args.Cancelled |= machine.Broken;
+    }
 }
 
-public sealed class AdvertiseEnableChangeAttemptEvent(bool enabling) : CancellableEntityEventArgs
+[ByRefEvent]
+public record struct AttemptAdvertiseEvent(EntityUid? Advertiser)
 {
-    public bool Enabling { get; } = enabling;
+    public bool Cancelled = false;
 }
diff --git a/Content.Server/Anomaly/AnomalySystem.Scanner.cs b/Content.Server/Anomaly/AnomalySystem.Scanner.cs
index 74af8e67e3..bce508903d 100644
--- a/Content.Server/Anomaly/AnomalySystem.Scanner.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Scanner.cs
@@ -1,4 +1,4 @@
-using Content.Server.Anomaly.Components;
+using Content.Server.Anomaly.Components;
 using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
 using Content.Shared.DoAfter;
@@ -21,6 +21,7 @@ public sealed partial class AnomalySystem
 
         SubscribeLocalEvent<AnomalySeverityChangedEvent>(OnScannerAnomalySeverityChanged);
         SubscribeLocalEvent<AnomalyHealthChangedEvent>(OnScannerAnomalyHealthChanged);
+        SubscribeLocalEvent<AnomalyBehaviorChangedEvent>(OnScannerAnomalyBehaviorChanged);
     }
 
     private void OnScannerAnomalyShutdown(ref AnomalyShutdownEvent args)
@@ -67,6 +68,17 @@ public sealed partial class AnomalySystem
         }
     }
 
+    private void OnScannerAnomalyBehaviorChanged(ref AnomalyBehaviorChangedEvent args)
+    {
+        var query = EntityQueryEnumerator<AnomalyScannerComponent>();
+        while (query.MoveNext(out var uid, out var component))
+        {
+            if (component.ScannedAnomaly != args.Anomaly)
+                continue;
+            UpdateScannerUi(uid, component);
+        }
+    }
+
     private void OnScannerUiOpened(EntityUid uid, AnomalyScannerComponent component, BoundUIOpenedEvent args)
     {
         UpdateScannerUi(uid, component);
@@ -132,29 +144,95 @@ public sealed partial class AnomalySystem
             return msg;
         }
 
-        msg.AddMarkup(Loc.GetString("anomaly-scanner-severity-percentage", ("percent", anomalyComp.Severity.ToString("P"))));
-        msg.PushNewline();
-        string stateLoc;
-        if (anomalyComp.Stability < anomalyComp.DecayThreshold)
-            stateLoc = Loc.GetString("anomaly-scanner-stability-low");
-        else if (anomalyComp.Stability > anomalyComp.GrowthThreshold)
-            stateLoc =  Loc.GetString("anomaly-scanner-stability-high");
+        TryComp<SecretDataAnomalyComponent>(anomaly, out var secret);
+
+        //Severity
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.Severity))
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-severity-percentage-unknown"));
         else
-            stateLoc =  Loc.GetString("anomaly-scanner-stability-medium");
-        msg.AddMarkup(stateLoc);
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-severity-percentage", ("percent", anomalyComp.Severity.ToString("P"))));
         msg.PushNewline();
 
-        msg.AddMarkup(Loc.GetString("anomaly-scanner-point-output", ("point", GetAnomalyPointValue(anomaly, anomalyComp))));
+        //Stability
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.Stability))
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-stability-unknown"));
+        else
+        {
+            string stateLoc;
+            if (anomalyComp.Stability < anomalyComp.DecayThreshold)
+                stateLoc = Loc.GetString("anomaly-scanner-stability-low");
+            else if (anomalyComp.Stability > anomalyComp.GrowthThreshold)
+                stateLoc = Loc.GetString("anomaly-scanner-stability-high");
+            else
+                stateLoc = Loc.GetString("anomaly-scanner-stability-medium");
+            msg.AddMarkup(stateLoc);
+        }
+        msg.PushNewline();
+
+        //Point output
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.OutputPoint))
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-point-output-unknown"));
+        else
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-point-output", ("point", GetAnomalyPointValue(anomaly, anomalyComp))));
         msg.PushNewline();
         msg.PushNewline();
 
+        //Particles title
         msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-readout"));
         msg.PushNewline();
-        msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-danger", ("type", GetParticleLocale(anomalyComp.SeverityParticleType))));
+
+        //Danger
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleDanger))
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-danger-unknown"));
+        else
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-danger", ("type", GetParticleLocale(anomalyComp.SeverityParticleType))));
         msg.PushNewline();
-        msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-unstable", ("type", GetParticleLocale(anomalyComp.DestabilizingParticleType))));
+
+        //Unstable
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleUnstable))
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-unstable-unknown"));
+        else
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-unstable", ("type", GetParticleLocale(anomalyComp.DestabilizingParticleType))));
         msg.PushNewline();
-        msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-containment", ("type", GetParticleLocale(anomalyComp.WeakeningParticleType))));
+
+        //Containment
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleContainment))
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-containment-unknown"));
+        else
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-containment", ("type", GetParticleLocale(anomalyComp.WeakeningParticleType))));
+        msg.PushNewline();
+
+        //Transformation
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleTransformation))
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-transformation-unknown"));
+        else
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-transformation", ("type", GetParticleLocale(anomalyComp.TransformationParticleType))));
+
+
+        //Behavior
+        msg.PushNewline();
+        msg.PushNewline();
+        msg.AddMarkup(Loc.GetString("anomaly-behavior-title"));
+        msg.PushNewline();
+
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.Behavior))
+            msg.AddMarkup(Loc.GetString("anomaly-behavior-unknown"));
+        else
+        {
+            if (anomalyComp.CurrentBehavior != null)
+            {
+                var behavior = _prototype.Index(anomalyComp.CurrentBehavior.Value);
+
+                msg.AddMarkup("- " + Loc.GetString(behavior.Description));
+                msg.PushNewline();
+                var mod = Math.Floor((behavior.EarnPointModifier) * 100);
+                msg.AddMarkup("- " + Loc.GetString("anomaly-behavior-point", ("mod", mod)));
+            }
+            else
+            {
+                msg.AddMarkup(Loc.GetString("anomaly-behavior-balanced"));
+            }
+        }
 
         //The timer at the end here is actually added in the ui itself.
         return msg;
diff --git a/Content.Server/Anomaly/AnomalySystem.cs b/Content.Server/Anomaly/AnomalySystem.cs
index c3f19aa177..bae101de87 100644
--- a/Content.Server/Anomaly/AnomalySystem.cs
+++ b/Content.Server/Anomaly/AnomalySystem.cs
@@ -8,13 +8,18 @@ using Content.Server.Radio.EntitySystems;
 using Content.Server.Station.Systems;
 using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
+using Content.Shared.Anomaly.Prototypes;
 using Content.Shared.DoAfter;
+using Content.Shared.Random;
+using Content.Shared.Random.Helpers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Shared.Serialization.Manager;
+using System.Linq;
 
 namespace Content.Server.Anomaly;
 
@@ -33,13 +38,20 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
     [Dependency] private readonly SharedPointLightSystem _pointLight = default!;
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly RadioSystem _radio = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly RadiationSystem _radiation = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
+    [Dependency] private readonly IComponentFactory _componentFactory = default!;
+    [Dependency] private readonly ISerializationManager _serialization = default!;
+    [Dependency] private readonly IEntityManager _entity = default!;
 
     public const float MinParticleVariation = 0.8f;
     public const float MaxParticleVariation = 1.2f;
 
+    [ValidatePrototypeId<WeightedRandomPrototype>]
+    const string WeightListProto = "AnomalyBehaviorList";
+
     /// <inheritdoc/>
     public override void Initialize()
     {
@@ -54,25 +66,34 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
         InitializeCommands();
     }
 
-    private void OnMapInit(EntityUid uid, AnomalyComponent component, MapInitEvent args)
+    private void OnMapInit(Entity<AnomalyComponent> anomaly, ref MapInitEvent args)
     {
-        component.NextPulseTime = Timing.CurTime + GetPulseLength(component) * 3; // longer the first time
-        ChangeAnomalyStability(uid, Random.NextFloat(component.InitialStabilityRange.Item1 , component.InitialStabilityRange.Item2), component);
-        ChangeAnomalySeverity(uid, Random.NextFloat(component.InitialSeverityRange.Item1, component.InitialSeverityRange.Item2), component);
+        anomaly.Comp.NextPulseTime = Timing.CurTime + GetPulseLength(anomaly.Comp) * 3; // longer the first time
+        ChangeAnomalyStability(anomaly, Random.NextFloat(anomaly.Comp.InitialStabilityRange.Item1 , anomaly.Comp.InitialStabilityRange.Item2), anomaly.Comp);
+        ChangeAnomalySeverity(anomaly, Random.NextFloat(anomaly.Comp.InitialSeverityRange.Item1, anomaly.Comp.InitialSeverityRange.Item2), anomaly.Comp);
 
+        ShuffleParticlesEffect(anomaly.Comp);
+        anomaly.Comp.Continuity = _random.NextFloat(anomaly.Comp.MinContituty, anomaly.Comp.MaxContituty);
+        SetBehavior(anomaly, GetRandomBehavior());
+    }
+
+    public void ShuffleParticlesEffect(AnomalyComponent anomaly)
+    {
         var particles = new List<AnomalousParticleType>
-            { AnomalousParticleType.Delta, AnomalousParticleType.Epsilon, AnomalousParticleType.Zeta };
-        component.SeverityParticleType = Random.PickAndTake(particles);
-        component.DestabilizingParticleType = Random.PickAndTake(particles);
-        component.WeakeningParticleType = Random.PickAndTake(particles);
+            { AnomalousParticleType.Delta, AnomalousParticleType.Epsilon, AnomalousParticleType.Zeta, AnomalousParticleType.Sigma };
+
+        anomaly.SeverityParticleType = Random.PickAndTake(particles);
+        anomaly.DestabilizingParticleType = Random.PickAndTake(particles);
+        anomaly.WeakeningParticleType = Random.PickAndTake(particles);
+        anomaly.TransformationParticleType = Random.PickAndTake(particles);
     }
 
-    private void OnShutdown(EntityUid uid, AnomalyComponent component, ComponentShutdown args)
+    private void OnShutdown(Entity<AnomalyComponent> anomaly, ref ComponentShutdown args)
     {
-        EndAnomaly(uid, component);
+        EndAnomaly(anomaly);
     }
 
-    private void OnStartCollide(EntityUid uid, AnomalyComponent component, ref StartCollideEvent args)
+    private void OnStartCollide(Entity<AnomalyComponent> anomaly, ref StartCollideEvent args)
     {
         if (!TryComp<AnomalousParticleComponent>(args.OtherEntity, out var particle))
             return;
@@ -80,21 +101,33 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
         if (args.OtherFixtureId != particle.FixtureId)
             return;
 
+        var behaviorMod = 1f;
+        if (anomaly.Comp.CurrentBehavior != null)
+        {
+            var b = _prototype.Index(anomaly.Comp.CurrentBehavior.Value);
+            behaviorMod = b.ParticleSensivity;
+        }
         // small function to randomize because it's easier to read like this
-        float VaryValue(float v) => v * Random.NextFloat(MinParticleVariation, MaxParticleVariation);
+        float VaryValue(float v) => v * behaviorMod * Random.NextFloat(MinParticleVariation, MaxParticleVariation);
 
-        if (particle.ParticleType == component.DestabilizingParticleType || particle.DestabilzingOverride)
+        if (particle.ParticleType == anomaly.Comp.DestabilizingParticleType || particle.DestabilzingOverride)
         {
-            ChangeAnomalyStability(uid, VaryValue(particle.StabilityPerDestabilizingHit), component);
+            ChangeAnomalyStability(anomaly, VaryValue(particle.StabilityPerDestabilizingHit), anomaly.Comp);
         }
-        if (particle.ParticleType == component.SeverityParticleType || particle.SeverityOverride)
+        if (particle.ParticleType == anomaly.Comp.SeverityParticleType || particle.SeverityOverride)
         {
-            ChangeAnomalySeverity(uid, VaryValue(particle.SeverityPerSeverityHit), component);
+            ChangeAnomalySeverity(anomaly, VaryValue(particle.SeverityPerSeverityHit), anomaly.Comp);
         }
-        if (particle.ParticleType == component.WeakeningParticleType || particle.WeakeningOverride)
+        if (particle.ParticleType == anomaly.Comp.WeakeningParticleType || particle.WeakeningOverride)
         {
-            ChangeAnomalyHealth(uid, VaryValue(particle.HealthPerWeakeningeHit), component);
-            ChangeAnomalyStability(uid, VaryValue(particle.StabilityPerWeakeningeHit), component);
+            ChangeAnomalyHealth(anomaly, VaryValue(particle.HealthPerWeakeningeHit), anomaly.Comp);
+            ChangeAnomalyStability(anomaly, VaryValue(particle.StabilityPerWeakeningeHit), anomaly.Comp);
+        }
+        if (particle.ParticleType == anomaly.Comp.TransformationParticleType || particle.TransmutationOverride)
+        {
+            ChangeAnomalySeverity(anomaly, VaryValue(particle.SeverityPerSeverityHit), anomaly.Comp);
+            if (_random.Prob(anomaly.Comp.Continuity))
+                SetBehavior(anomaly, GetRandomBehavior());
         }
     }
 
@@ -116,6 +149,13 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
         //penalty of up to 50% based on health
         multiplier *= MathF.Pow(1.5f, component.Health) - 0.5f;
 
+        //Apply behavior modifier
+        if (component.CurrentBehavior != null)
+        {
+            var behavior = _prototype.Index(component.CurrentBehavior.Value);
+            multiplier *= behavior.EarnPointModifier;
+        }
+
         var severityValue = 1 / (1 + MathF.Pow(MathF.E, -7 * (component.Severity - 0.5f)));
 
         return (int) ((component.MaxPointsPerSecond - component.MinPointsPerSecond) * severityValue * multiplier) + component.MinPointsPerSecond;
@@ -133,6 +173,7 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
             AnomalousParticleType.Delta => Loc.GetString("anomaly-particles-delta"),
             AnomalousParticleType.Epsilon => Loc.GetString("anomaly-particles-epsilon"),
             AnomalousParticleType.Zeta => Loc.GetString("anomaly-particles-zeta"),
+            AnomalousParticleType.Sigma => Loc.GetString("anomaly-particles-sigma"),
             _ => throw new ArgumentOutOfRangeException()
         };
     }
@@ -144,4 +185,40 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
         UpdateGenerator();
         UpdateVessels();
     }
+
+    #region Behavior
+    private string GetRandomBehavior()
+    {
+        var weightList = _prototype.Index<WeightedRandomPrototype>(WeightListProto);
+        return weightList.Pick(_random);
+    }
+
+    private void SetBehavior(Entity<AnomalyComponent> anomaly, ProtoId<AnomalyBehaviorPrototype> behaviorProto)
+    {
+        if (anomaly.Comp.CurrentBehavior == behaviorProto)
+            return;
+
+        if (anomaly.Comp.CurrentBehavior != null)
+            RemoveBehavior(anomaly, anomaly.Comp.CurrentBehavior.Value);
+
+        //event broadcast
+        var ev = new AnomalyBehaviorChangedEvent(anomaly, anomaly.Comp.CurrentBehavior, behaviorProto);
+        anomaly.Comp.CurrentBehavior = behaviorProto;
+        RaiseLocalEvent(anomaly, ref ev, true);
+
+        var behavior = _prototype.Index(behaviorProto);
+
+        EntityManager.AddComponents(anomaly, behavior.Components);
+    }
+
+    private void RemoveBehavior(Entity<AnomalyComponent> anomaly, ProtoId<AnomalyBehaviorPrototype> behaviorProto)
+    {
+        if (anomaly.Comp.CurrentBehavior == null)
+            return;
+
+        var behavior = _prototype.Index(anomaly.Comp.CurrentBehavior.Value);
+
+        EntityManager.RemoveComponents(anomaly, behavior.Components);
+    }
+    #endregion
 }
diff --git a/Content.Server/Anomaly/Components/AnomalousParticleComponent.cs b/Content.Server/Anomaly/Components/AnomalousParticleComponent.cs
index 9141ca6529..5b05522bb9 100644
--- a/Content.Server/Anomaly/Components/AnomalousParticleComponent.cs
+++ b/Content.Server/Anomaly/Components/AnomalousParticleComponent.cs
@@ -13,58 +13,64 @@ public sealed partial class AnomalousParticleComponent : Component
     /// The type of particle that the projectile
     /// imbues onto the anomaly on contact.
     /// </summary>
-    [DataField("particleType", required: true)]
+    [DataField(required: true)]
     public AnomalousParticleType ParticleType;
 
     /// <summary>
     /// The fixture that's checked on collision.
     /// </summary>
-    [DataField("fixtureId")]
+    [DataField]
     public string FixtureId = "projectile";
 
     /// <summary>
     /// The amount that the <see cref="AnomalyComponent.Severity"/> increases by when hit
     /// of an anomalous particle of <seealso cref="AnomalyComponent.SeverityParticleType"/>.
     /// </summary>
-    [DataField("severityPerSeverityHit")]
+    [DataField]
     public float SeverityPerSeverityHit = 0.025f;
 
     /// <summary>
     /// The amount that the <see cref="AnomalyComponent.Stability"/> increases by when hit
     /// of an anomalous particle of <seealso cref="AnomalyComponent.DestabilizingParticleType"/>.
     /// </summary>
-    [DataField("stabilityPerDestabilizingHit")]
+    [DataField]
     public float StabilityPerDestabilizingHit = 0.04f;
 
     /// <summary>
     /// The amount that the <see cref="AnomalyComponent.Stability"/> increases by when hit
     /// of an anomalous particle of <seealso cref="AnomalyComponent.DestabilizingParticleType"/>.
     /// </summary>
-    [DataField("healthPerWeakeningeHit")]
+    [DataField]
     public float HealthPerWeakeningeHit = -0.05f;
 
     /// <summary>
     /// The amount that the <see cref="AnomalyComponent.Stability"/> increases by when hit
     /// of an anomalous particle of <seealso cref="AnomalyComponent.DestabilizingParticleType"/>.
     /// </summary>
-    [DataField("stabilityPerWeakeningeHit")]
+    [DataField]
     public float StabilityPerWeakeningeHit = -0.1f;
 
     /// <summary>
     /// If this is true then the particle will always affect the stability of the anomaly.
     /// </summary>
-    [DataField("destabilzingOverride")]
+    [DataField]
     public bool DestabilzingOverride = false;
 
     /// <summary>
     /// If this is true then the particle will always affect the weakeness of the anomaly.
     /// </summary>
-    [DataField("weakeningOverride")]
+    [DataField]
     public bool WeakeningOverride = false;
 
     /// <summary>
     /// If this is true then the particle will always affect the severity of the anomaly.
     /// </summary>
-    [DataField("severityOverride")]
+    [DataField]
     public bool SeverityOverride = false;
+
+    /// <summary>
+    /// If this is true then the particle will always affect the behaviour.
+    /// </summary>
+    [DataField]
+    public bool TransmutationOverride = false;
 }
diff --git a/Content.Server/Anomaly/Components/SecretDataAnomalyComponent.cs b/Content.Server/Anomaly/Components/SecretDataAnomalyComponent.cs
new file mode 100644
index 0000000000..80eecaafc7
--- /dev/null
+++ b/Content.Server/Anomaly/Components/SecretDataAnomalyComponent.cs
@@ -0,0 +1,45 @@
+using Content.Server.Anomaly.Effects;
+
+namespace Content.Server.Anomaly.Components;
+
+/// <summary>
+/// Hides some information about the anomaly when scanning it
+/// </summary>
+[RegisterComponent, Access(typeof(SecretDataAnomalySystem), typeof(AnomalySystem))]
+public sealed partial class SecretDataAnomalyComponent : Component
+{
+    /// <summary>
+    /// Minimum hidden data elements on MapInit
+    /// </summary>
+    [DataField]
+    public int RandomStartSecretMin = 0;
+
+    /// <summary>
+    /// Maximum hidden data elements on MapInit
+    /// </summary>
+    [DataField]
+    public int RandomStartSecretMax = 0;
+
+    /// <summary>
+    /// Current secret data
+    /// </summary>
+    [DataField]
+    public List<AnomalySecretData> Secret = new();
+}
+
+/// <summary>
+/// Enum with secret data field variants
+/// </summary>
+[Serializable]
+public enum AnomalySecretData : byte
+{
+    Severity,
+    Stability,
+    OutputPoint,
+    ParticleDanger,
+    ParticleUnstable,
+    ParticleContainment,
+    ParticleTransformation,
+    Behavior,
+    Default
+}
diff --git a/Content.Server/Anomaly/Components/ShuffleParticlesAnomalyComponent.cs b/Content.Server/Anomaly/Components/ShuffleParticlesAnomalyComponent.cs
new file mode 100644
index 0000000000..00db76d486
--- /dev/null
+++ b/Content.Server/Anomaly/Components/ShuffleParticlesAnomalyComponent.cs
@@ -0,0 +1,28 @@
+using Content.Server.Anomaly.Effects;
+
+namespace Content.Server.Anomaly.Components;
+
+/// <summary>
+/// Shuffle Particle types in some situations
+/// </summary>
+[RegisterComponent, Access(typeof(ShuffleParticlesAnomalySystem))]
+public sealed partial class ShuffleParticlesAnomalyComponent : Component
+{
+    /// <summary>
+    /// Prob() chance to randomize particle types after Anomaly pulation
+    /// </summary>
+    [DataField]
+    public bool ShuffleOnPulse = false;
+
+    /// <summary>
+    /// Prob() chance to randomize particle types after APE or CHIMP projectile
+    /// </summary>
+    [DataField]
+    public bool ShuffleOnParticleHit = false;
+
+    /// <summary>
+    /// Chance to random particles
+    /// </summary>
+    [DataField]
+    public float Prob = 0.5f;
+}
diff --git a/Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs b/Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs
index dd2da82c9d..bd8c2f3c7d 100644
--- a/Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Numerics;
 using Content.Server.Anomaly.Components;
 using Content.Shared.Administration.Logs;
@@ -33,7 +33,7 @@ public sealed class BluespaceAnomalySystem : EntitySystem
     {
         var xformQuery = GetEntityQuery<TransformComponent>();
         var xform = xformQuery.GetComponent(uid);
-        var range = component.MaxShuffleRadius * args.Severity;
+        var range = component.MaxShuffleRadius * args.Severity * args.PowerModifier;
         var mobs = new HashSet<Entity<MobStateComponent>>();
         _lookup.GetEntitiesInRange(xform.Coordinates, range, mobs);
         var allEnts = new ValueList<EntityUid>(mobs.Select(m => m.Owner)) { uid };
@@ -56,7 +56,7 @@ public sealed class BluespaceAnomalySystem : EntitySystem
     {
         var xform = Transform(uid);
         var mapPos = _xform.GetWorldPosition(xform);
-        var radius = component.SupercriticalTeleportRadius;
+        var radius = component.SupercriticalTeleportRadius * args.PowerModifier;
         var gridBounds = new Box2(mapPos - new Vector2(radius, radius), mapPos + new Vector2(radius, radius));
         var mobs = new HashSet<Entity<MobStateComponent>>();
         _lookup.GetEntitiesInRange(xform.Coordinates, component.MaxShuffleRadius, mobs);
diff --git a/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs b/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs
index 8b5a72449f..f2a060d629 100644
--- a/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs
@@ -28,7 +28,7 @@ public sealed class ElectricityAnomalySystem : EntitySystem
 
     private void OnPulse(Entity<ElectricityAnomalyComponent> anomaly, ref AnomalyPulseEvent args)
     {
-        var range = anomaly.Comp.MaxElectrocuteRange * args.Stability;
+        var range = anomaly.Comp.MaxElectrocuteRange * args.Stability * args.PowerModifier;
 
         int boltCount = (int)MathF.Floor(MathHelper.Lerp((float)anomaly.Comp.MinBoltCount, (float)anomaly.Comp.MaxBoltCount, args.Severity));
 
@@ -37,7 +37,7 @@ public sealed class ElectricityAnomalySystem : EntitySystem
 
     private void OnSupercritical(Entity<ElectricityAnomalyComponent> anomaly, ref AnomalySupercriticalEvent args)
     {
-        var range = anomaly.Comp.MaxElectrocuteRange * 3;
+        var range = anomaly.Comp.MaxElectrocuteRange * 3 * args.PowerModifier;
 
         _emp.EmpPulse(_transform.GetMapCoordinates(anomaly), range, anomaly.Comp.EmpEnergyConsumption, anomaly.Comp.EmpDisabledDuration);
         _lightning.ShootRandomLightnings(anomaly, range, anomaly.Comp.MaxBoltCount * 3, arcDepth: 3);
diff --git a/Content.Server/Anomaly/Effects/EntityAnomalySystem.cs b/Content.Server/Anomaly/Effects/EntityAnomalySystem.cs
index 90a655fbba..86d6937af5 100644
--- a/Content.Server/Anomaly/Effects/EntityAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/EntityAnomalySystem.cs
@@ -35,7 +35,7 @@ public sealed class EntityAnomalySystem : SharedEntityAnomalySystem
             if (!entry.Settings.SpawnOnPulse)
                 continue;
 
-            SpawnEntities(component, entry, args.Stability, args.Severity);
+            SpawnEntities(component, entry, args.Stability, args.Severity, args.PowerModifier);
         }
     }
 
@@ -46,7 +46,7 @@ public sealed class EntityAnomalySystem : SharedEntityAnomalySystem
             if (!entry.Settings.SpawnOnSuperCritical)
                 continue;
 
-            SpawnEntities(component, entry, 1, 1);
+            SpawnEntities(component, entry, 1, 1, args.PowerModifier);
         }
     }
 
@@ -57,7 +57,7 @@ public sealed class EntityAnomalySystem : SharedEntityAnomalySystem
             if (!entry.Settings.SpawnOnShutdown || args.Supercritical)
                 continue;
 
-            SpawnEntities(component, entry, 1, 1);
+            SpawnEntities(component, entry, 1, 1, 1);
         }
     }
 
@@ -68,7 +68,7 @@ public sealed class EntityAnomalySystem : SharedEntityAnomalySystem
             if (!entry.Settings.SpawnOnStabilityChanged)
                 continue;
 
-            SpawnEntities(component, entry, args.Stability, args.Severity);
+            SpawnEntities(component, entry, args.Stability, args.Severity, 1);
         }
     }
 
@@ -79,17 +79,17 @@ public sealed class EntityAnomalySystem : SharedEntityAnomalySystem
             if (!entry.Settings.SpawnOnSeverityChanged)
                 continue;
 
-            SpawnEntities(component, entry, args.Stability, args.Severity);
+            SpawnEntities(component, entry, args.Stability, args.Severity, 1);
         }
     }
 
-    private void SpawnEntities(Entity<EntitySpawnAnomalyComponent> anomaly, EntitySpawnSettingsEntry entry, float stability, float severity)
+    private void SpawnEntities(Entity<EntitySpawnAnomalyComponent> anomaly, EntitySpawnSettingsEntry entry, float stability, float severity, float powerMod)
     {
         var xform = Transform(anomaly);
         if (!TryComp(xform.GridUid, out MapGridComponent? grid))
             return;
 
-        var tiles = _anomaly.GetSpawningPoints(anomaly, stability, severity, entry.Settings);
+        var tiles = _anomaly.GetSpawningPoints(anomaly, stability, severity, entry.Settings, powerMod);
         if (tiles == null)
             return;
 
diff --git a/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs b/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs
index 2bef32e322..731d853280 100644
--- a/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs
@@ -29,12 +29,12 @@ public sealed class InjectionAnomalySystem : EntitySystem
 
     private void OnPulse(Entity<InjectionAnomalyComponent> entity, ref AnomalyPulseEvent args)
     {
-        PulseScalableEffect(entity, entity.Comp.InjectRadius, entity.Comp.MaxSolutionInjection * args.Severity);
+        PulseScalableEffect(entity, entity.Comp.InjectRadius * args.PowerModifier, entity.Comp.MaxSolutionInjection * args.Severity * args.PowerModifier);
     }
 
     private void OnSupercritical(Entity<InjectionAnomalyComponent> entity, ref AnomalySupercriticalEvent args)
     {
-        PulseScalableEffect(entity, entity.Comp.SuperCriticalInjectRadius, entity.Comp.SuperCriticalSolutionInjection);
+        PulseScalableEffect(entity, entity.Comp.SuperCriticalInjectRadius * args.PowerModifier, entity.Comp.SuperCriticalSolutionInjection * args.PowerModifier);
     }
 
     private void PulseScalableEffect(Entity<InjectionAnomalyComponent> entity, float injectRadius, float maxInject)
diff --git a/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs b/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs
index 8483c86dbb..23e0e472f0 100644
--- a/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs
@@ -31,12 +31,12 @@ public sealed class ProjectileAnomalySystem : EntitySystem
 
     private void OnPulse(EntityUid uid, ProjectileAnomalyComponent component, ref AnomalyPulseEvent args)
     {
-        ShootProjectilesAtEntities(uid, component, args.Severity);
+        ShootProjectilesAtEntities(uid, component, args.Severity * args.PowerModifier);
     }
 
     private void OnSupercritical(EntityUid uid, ProjectileAnomalyComponent component, ref AnomalySupercriticalEvent args)
     {
-        ShootProjectilesAtEntities(uid, component, 1.0f);
+        ShootProjectilesAtEntities(uid, component, args.PowerModifier);
     }
 
     private void ShootProjectilesAtEntities(EntityUid uid, ProjectileAnomalyComponent component, float severity)
diff --git a/Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs b/Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs
index 90177bae8e..d460e6f4b0 100644
--- a/Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs
@@ -25,9 +25,10 @@ public sealed class PuddleCreateAnomalySystem : EntitySystem
             return;
 
         var xform = Transform(entity.Owner);
-        var puddleSol = _solutionContainer.SplitSolution(sol.Value, entity.Comp.MaxPuddleSize * args.Severity);
+        var puddleSol = _solutionContainer.SplitSolution(sol.Value, entity.Comp.MaxPuddleSize * args.Severity * args.PowerModifier);
         _puddle.TrySplashSpillAt(entity.Owner, xform.Coordinates, puddleSol, out _);
     }
+
     private void OnSupercritical(Entity<PuddleCreateAnomalyComponent> entity, ref AnomalySupercriticalEvent args)
     {
         if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var sol))
diff --git a/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs b/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs
index 6bd8be002e..d38bda562b 100644
--- a/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos.Components;
+using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Anomaly.Effects.Components;
@@ -24,14 +24,14 @@ public sealed class PyroclasticAnomalySystem : EntitySystem
     private void OnPulse(EntityUid uid, PyroclasticAnomalyComponent component, ref AnomalyPulseEvent args)
     {
         var xform = Transform(uid);
-        var ignitionRadius = component.MaximumIgnitionRadius * args.Stability;
+        var ignitionRadius = component.MaximumIgnitionRadius * args.Stability * args.PowerModifier;
         IgniteNearby(uid, xform.Coordinates, args.Severity, ignitionRadius);
     }
 
     private void OnSupercritical(EntityUid uid, PyroclasticAnomalyComponent component, ref AnomalySupercriticalEvent args)
     {
         var xform = Transform(uid);
-        IgniteNearby(uid, xform.Coordinates, 1, component.MaximumIgnitionRadius * 2);
+        IgniteNearby(uid, xform.Coordinates, 1, component.MaximumIgnitionRadius * 2 * args.PowerModifier);
     }
 
     public void IgniteNearby(EntityUid uid, EntityCoordinates coordinates, float severity, float radius)
diff --git a/Content.Server/Anomaly/Effects/SecretDataAnomalySystem.cs b/Content.Server/Anomaly/Effects/SecretDataAnomalySystem.cs
new file mode 100644
index 0000000000..cbdc4b04df
--- /dev/null
+++ b/Content.Server/Anomaly/Effects/SecretDataAnomalySystem.cs
@@ -0,0 +1,40 @@
+using Content.Server.Anomaly.Components;
+using Robust.Shared.Random;
+
+namespace Content.Server.Anomaly.Effects;
+
+public sealed class SecretDataAnomalySystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    private readonly List<AnomalySecretData> _deita = new();
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<SecretDataAnomalyComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(EntityUid uid, SecretDataAnomalyComponent anomaly, MapInitEvent args)
+    {
+        RandomizeSecret(uid,_random.Next(anomaly.RandomStartSecretMin, anomaly.RandomStartSecretMax), anomaly);
+    }
+
+    public void RandomizeSecret(EntityUid uid, int count, SecretDataAnomalyComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        component.Secret.Clear();
+
+        // I also considered just adding all the enum values and pruning but that seems more wasteful.
+        _deita.Clear();
+        _deita.AddRange(Enum.GetValues<AnomalySecretData>());
+        var actualCount = Math.Min(count, _deita.Count);
+
+        for (int i = 0; i < actualCount; i++)
+        {
+            component.Secret.Add(_random.PickAndTake(_deita));
+        }
+    }
+}
+
diff --git a/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs b/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs
new file mode 100644
index 0000000000..7d4d9a2ee5
--- /dev/null
+++ b/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs
@@ -0,0 +1,41 @@
+using Content.Server.Anomaly.Components;
+using Content.Shared.Anomaly.Components;
+using Robust.Shared.Physics.Events;
+using Robust.Shared.Random;
+
+namespace Content.Server.Anomaly.Effects;
+public sealed class ShuffleParticlesAnomalySystem : EntitySystem
+{
+    [Dependency] private readonly AnomalySystem _anomaly = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<ShuffleParticlesAnomalyComponent, AnomalyPulseEvent>(OnPulse);
+        SubscribeLocalEvent<ShuffleParticlesAnomalyComponent, StartCollideEvent>(OnStartCollide);
+    }
+
+    private void OnStartCollide(EntityUid uid, ShuffleParticlesAnomalyComponent shuffle, StartCollideEvent args)
+    {
+        if (!TryComp<AnomalyComponent>(uid, out var anomaly))
+            return;
+
+        if (shuffle.ShuffleOnParticleHit && _random.Prob(shuffle.Prob))
+            _anomaly.ShuffleParticlesEffect(anomaly);
+
+        if (!TryComp<AnomalousParticleComponent>(args.OtherEntity, out var particle))
+            return;
+    }
+
+    private void OnPulse(EntityUid uid, ShuffleParticlesAnomalyComponent shuffle, AnomalyPulseEvent args)
+    {
+        if (!TryComp<AnomalyComponent>(uid, out var anomaly))
+            return;
+
+        if (shuffle.ShuffleOnPulse && _random.Prob(shuffle.Prob))
+        {
+            _anomaly.ShuffleParticlesEffect(anomaly);
+        }
+    }
+}
+
diff --git a/Content.Server/Anomaly/Effects/TileAnomalySystem.cs b/Content.Server/Anomaly/Effects/TileAnomalySystem.cs
index c1487cfc8c..92f5415252 100644
--- a/Content.Server/Anomaly/Effects/TileAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/TileAnomalySystem.cs
@@ -34,7 +34,7 @@ public sealed class TileAnomalySystem : SharedTileAnomalySystem
             if (!entry.Settings.SpawnOnPulse)
                 continue;
 
-            SpawnTiles(component, entry, args.Stability, args.Severity);
+            SpawnTiles(component, entry, args.Stability, args.Severity, args.PowerModifier);
         }
     }
 
@@ -45,7 +45,7 @@ public sealed class TileAnomalySystem : SharedTileAnomalySystem
             if (!entry.Settings.SpawnOnSuperCritical)
                 continue;
 
-            SpawnTiles(component, entry, 1, 1);
+            SpawnTiles(component, entry, 1, 1, args.PowerModifier);
         }
     }
 
@@ -56,7 +56,7 @@ public sealed class TileAnomalySystem : SharedTileAnomalySystem
             if (!entry.Settings.SpawnOnShutdown || args.Supercritical)
                 continue;
 
-            SpawnTiles(component, entry, 1, 1);
+            SpawnTiles(component, entry, 1, 1, 1);
         }
     }
 
@@ -67,7 +67,7 @@ public sealed class TileAnomalySystem : SharedTileAnomalySystem
             if (!entry.Settings.SpawnOnStabilityChanged)
                 continue;
 
-            SpawnTiles(component, entry, args.Stability, args.Severity);
+            SpawnTiles(component, entry, args.Stability, args.Severity, 1);
         }
     }
 
@@ -78,17 +78,17 @@ public sealed class TileAnomalySystem : SharedTileAnomalySystem
             if (!entry.Settings.SpawnOnSeverityChanged)
                 continue;
 
-            SpawnTiles(component, entry, args.Stability, args.Severity);
+            SpawnTiles(component, entry, args.Stability, args.Severity, 1);
         }
     }
 
-    private void SpawnTiles(Entity<TileSpawnAnomalyComponent> anomaly, TileSpawnSettingsEntry entry, float stability, float severity)
+    private void SpawnTiles(Entity<TileSpawnAnomalyComponent> anomaly, TileSpawnSettingsEntry entry, float stability, float severity, float powerMod)
     {
         var xform = Transform(anomaly);
         if (!TryComp<MapGridComponent>(xform.GridUid, out var grid))
             return;
 
-        var tiles = _anomaly.GetSpawningPoints(anomaly, stability, severity, entry.Settings);
+        var tiles = _anomaly.GetSpawningPoints(anomaly, stability, severity, entry.Settings, powerMod);
         if (tiles == null)
             return;
 
diff --git a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
index c42cfd08da..89b9c52078 100644
--- a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
@@ -432,14 +432,16 @@ namespace Content.Server.Atmos.EntitySystems
                         if (!overlay.Chunks.TryGetValue(gIndex, out var value))
                             continue;
 
-                        if (previousChunks != null &&
-                            previousChunks.Contains(gIndex) &&
-                            value.LastUpdate > LastSessionUpdate)
+                        // If the chunk was updated since we last sent it, send it again
+                        if (value.LastUpdate > LastSessionUpdate)
                         {
+                            dataToSend.Add(value);
                             continue;
                         }
 
-                        dataToSend.Add(value);
+                        // Always send it if we didn't previously send it
+                        if (previousChunks == null || !previousChunks.Contains(gIndex))
+                            dataToSend.Add(value);
                     }
 
                     previouslySent[netGrid] = gridChunks;
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
index f856946a92..fbd4260469 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
@@ -53,7 +53,7 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
         private void OnFilterUpdated(EntityUid uid, GasFilterComponent filter, ref AtmosDeviceUpdateEvent args)
         {
             if (!filter.Enabled
-                || !_nodeContainer.TryGetNodes(uid, filter.InletName, filter.OutletName, filter.FilterName, out PipeNode? inletNode, out PipeNode? filterNode, out PipeNode? outletNode)
+                || !_nodeContainer.TryGetNodes(uid, filter.InletName, filter.FilterName, filter.OutletName, out PipeNode? inletNode, out PipeNode? filterNode, out PipeNode? outletNode)
                 || outletNode.Air.Pressure >= Atmospherics.MaxOutputPressure) // No need to transfer if target is full.
             {
                 _ambientSoundSystem.SetAmbience(uid, false);
diff --git a/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs b/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
index d26794a632..a7735787cb 100644
--- a/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
+++ b/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Cargo;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.Cargo.Components;
 
@@ -32,4 +33,16 @@ public sealed partial class StationCargoBountyDatabaseComponent : Component
     /// </summary>
     [DataField]
     public HashSet<string> CheckedBounties = new();
+
+    /// <summary>
+    /// The time at which players will be able to skip the next bounty.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan NextSkipTime = TimeSpan.Zero;
+
+    /// <summary>
+    /// The time between skipping bounties.
+    /// </summary>
+    [DataField]
+    public TimeSpan SkipDelay = TimeSpan.FromMinutes(15);
 }
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index ee5ae631fd..22e5c67e17 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -4,7 +4,7 @@ using Content.Server.Cargo.Components;
 using Content.Server.Labels;
 using Content.Server.NameIdentifier;
 using Content.Server.Paper;
-using Content.Server.Station.Systems;
+using Content.Shared.Access.Components;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Prototypes;
@@ -35,6 +35,7 @@ public sealed partial class CargoSystem
     {
         SubscribeLocalEvent<CargoBountyConsoleComponent, BoundUIOpenedEvent>(OnBountyConsoleOpened);
         SubscribeLocalEvent<CargoBountyConsoleComponent, BountyPrintLabelMessage>(OnPrintLabelMessage);
+        SubscribeLocalEvent<CargoBountyConsoleComponent, BountySkipMessage>(OnSkipBountyMessage);
         SubscribeLocalEvent<CargoBountyLabelComponent, PriceCalculationEvent>(OnGetBountyPrice);
         SubscribeLocalEvent<EntitySoldEvent>(OnSold);
         SubscribeLocalEvent<StationCargoBountyDatabaseComponent, MapInitEvent>(OnMapInit);
@@ -50,7 +51,8 @@ public sealed partial class CargoSystem
             !TryComp<StationCargoBountyDatabaseComponent>(station, out var bountyDb))
             return;
 
-        _uiSystem.TrySetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(bountyDb.Bounties));
+        var untilNextSkip = bountyDb.NextSkipTime - _timing.CurTime;
+        _uiSystem.TrySetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(bountyDb.Bounties, untilNextSkip));
     }
 
     private void OnPrintLabelMessage(EntityUid uid, CargoBountyConsoleComponent component, BountyPrintLabelMessage args)
@@ -70,6 +72,37 @@ public sealed partial class CargoSystem
         _audio.PlayPvs(component.PrintSound, uid);
     }
 
+    private void OnSkipBountyMessage(EntityUid uid, CargoBountyConsoleComponent component, BountySkipMessage args)
+    {
+        if (_station.GetOwningStation(uid) is not { } station || !TryComp<StationCargoBountyDatabaseComponent>(station, out var db))
+            return;
+
+        if (_timing.CurTime < db.NextSkipTime)
+            return;
+
+        if (!TryGetBountyFromId(station, args.BountyId, out var bounty))
+            return;
+
+        if (args.Session.AttachedEntity is not { Valid: true } mob)
+            return;
+
+        if (TryComp<AccessReaderComponent>(uid, out var accessReaderComponent) &&
+            !_accessReaderSystem.IsAllowed(mob, uid, accessReaderComponent))
+        {
+            _audio.PlayPvs(component.DenySound, uid);
+            return;
+        }
+
+        if (!TryRemoveBounty(station, bounty.Value))
+            return;
+
+        FillBountyDatabase(station);
+        db.NextSkipTime = _timing.CurTime + db.SkipDelay;
+        var untilNextSkip = db.NextSkipTime - _timing.CurTime;
+        _uiSystem.TrySetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(db.Bounties, untilNextSkip));
+        _audio.PlayPvs(component.SkipSound, uid);
+    }
+
     public void SetupBountyLabel(EntityUid uid, EntityUid stationId, CargoBountyData bounty, PaperComponent? paper = null, CargoBountyLabelComponent? label = null)
     {
         if (!Resolve(uid, ref paper, ref label) || !_protoMan.TryIndex<CargoBountyPrototype>(bounty.Bounty, out var prototype))
@@ -431,7 +464,8 @@ public sealed partial class CargoSystem
                 !TryComp<StationCargoBountyDatabaseComponent>(station, out var db))
                 continue;
 
-            _uiSystem.TrySetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(db.Bounties), ui: ui);
+            var untilNextSkip = db.NextSkipTime - _timing.CurTime;
+            _uiSystem.TrySetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(db.Bounties, untilNextSkip), ui: ui);
         }
     }
 
diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
index 872925151a..bda6f20576 100644
--- a/Content.Server/Chat/Managers/ChatManager.cs
+++ b/Content.Server/Chat/Managers/ChatManager.cs
@@ -312,8 +312,7 @@ namespace Content.Server.Chat.Managers
                 var prefs = _preferencesManager.GetPreferences(player.UserId);
                 colorOverride = prefs.AdminOOCColor;
             }
-            if (player.Channel.UserData.PatronTier is { } patron &&
-                     PatronOocColors.TryGetValue(patron, out var patronColor))
+            if (  _netConfigManager.GetClientCVar(player.Channel, CCVars.ShowOocPatronColor) && player.Channel.UserData.PatronTier is { } patron && PatronOocColors.TryGetValue(patron, out var patronColor))
             {
                 wrappedMessage = Loc.GetString("chat-manager-send-ooc-patron-wrap-message", ("patronColor", patronColor),("playerName", player.Name), ("message", FormattedMessage.EscapeText(message)), ("rep", reputation));
             }
diff --git a/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs b/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs
new file mode 100644
index 0000000000..708c1ef005
--- /dev/null
+++ b/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs
@@ -0,0 +1,60 @@
+using Content.Shared.FixedPoint;
+using Content.Shared.Inventory;
+
+namespace Content.Server.Chemistry.Components;
+
+/// <summary>
+/// Base class for components that inject a solution into a target's bloodstream in response to an event.
+/// </summary>
+public abstract partial class BaseSolutionInjectOnEventComponent : Component
+{
+    /// <summary>
+    /// How much solution to remove from this entity per target when transferring.
+    /// </summary>
+    /// <remarks>
+    /// Note that this amount is per target, so the total amount removed will be
+    /// multiplied by the number of targets hit.
+    /// </remarks>
+    [DataField]
+    public FixedPoint2 TransferAmount = FixedPoint2.New(1);
+
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float TransferEfficiency { get => _transferEfficiency; set => _transferEfficiency = Math.Clamp(value, 0, 1); }
+
+    /// <summary>
+    /// Proportion of the <see cref="TransferAmount"/> that will actually be injected
+    /// into the target's bloodstream. The rest is lost.
+    /// 0 means none of the transferred solution will enter the bloodstream.
+    /// 1 means the entire amount will enter the bloodstream.
+    /// </summary>
+    [DataField("transferEfficiency")]
+    private float _transferEfficiency = 1f;
+
+    /// <summary>
+    /// Solution to inject from.
+    /// </summary>
+    [DataField]
+    public string Solution = "default";
+
+    /// <summary>
+    /// Whether this will inject through hardsuits or not.
+    /// </summary>
+    [DataField]
+    public bool PierceArmor = true;
+
+    /// <summary>
+    /// Contents of popup message to display to the attacker when injection
+    /// fails due to the target wearing a hardsuit.
+    /// </summary>
+    /// <remarks>
+    /// Passed values: $weapon and $target
+    /// </remarks>
+    [DataField]
+    public LocId BlockedByHardsuitPopupMessage = "melee-inject-failed-hardsuit";
+
+    /// <summary>
+    /// If anything covers any of these slots then the injection fails.
+    /// </summary>
+    [DataField]
+    public SlotFlags BlockSlots = SlotFlags.NONE;
+}
diff --git a/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs b/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs
index 6b6ce830a9..6b64b82f78 100644
--- a/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs
+++ b/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs
@@ -1,31 +1,8 @@
-using Content.Shared.FixedPoint;
+namespace Content.Server.Chemistry.Components;
 
-namespace Content.Server.Chemistry.Components
-{
-    [RegisterComponent]
-    public sealed partial class MeleeChemicalInjectorComponent : Component
-    {
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("transferAmount")]
-        public FixedPoint2 TransferAmount { get; set; } = FixedPoint2.New(1);
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float TransferEfficiency { get => _transferEfficiency; set => _transferEfficiency = Math.Clamp(value, 0, 1); }
-
-        [DataField("transferEfficiency")]
-        private float _transferEfficiency = 1f;
-
-        /// <summary>
-        /// Whether this will inject through hardsuits or not.
-        /// </summary>
-        [DataField("pierceArmor"), ViewVariables(VVAccess.ReadWrite)]
-        public bool PierceArmor = true;
-
-        /// <summary>
-        ///     Solution to inject from.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("solution")]
-        public string Solution { get; set; } = "default";
-    }
-}
+/// <summary>
+/// Used for melee weapon entities that should try to inject a
+/// contained solution into a target when used to hit it.
+/// </summary>
+[RegisterComponent]
+public sealed partial class MeleeChemicalInjectorComponent : BaseSolutionInjectOnEventComponent { }
diff --git a/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs b/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs
deleted file mode 100644
index 76bb5294bc..0000000000
--- a/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.FixedPoint;
-using Content.Shared.Inventory;
-using Content.Shared.Projectiles;
-
-namespace Content.Server.Chemistry.Components;
-
-/// <summary>
-/// On colliding with an entity that has a bloodstream will dump its solution onto them.
-/// </summary>
-[RegisterComponent]
-public sealed partial class SolutionInjectOnCollideComponent : Component
-{
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("transferAmount")]
-    public FixedPoint2 TransferAmount = FixedPoint2.New(1);
-
-    [ViewVariables(VVAccess.ReadWrite)]
-    public float TransferEfficiency { get => _transferEfficiency; set => _transferEfficiency = Math.Clamp(value, 0, 1); }
-
-    [DataField("transferEfficiency")]
-    private float _transferEfficiency = 1f;
-
-    /// <summary>
-    /// If anything covers any of these slots then the injection fails.
-    /// </summary>
-    [DataField("blockSlots"), ViewVariables(VVAccess.ReadWrite)]
-    public SlotFlags BlockSlots = SlotFlags.MASK;
-}
diff --git a/Content.Server/Chemistry/Components/SolutionInjectOnEmbedComponent.cs b/Content.Server/Chemistry/Components/SolutionInjectOnEmbedComponent.cs
new file mode 100644
index 0000000000..241da38045
--- /dev/null
+++ b/Content.Server/Chemistry/Components/SolutionInjectOnEmbedComponent.cs
@@ -0,0 +1,8 @@
+namespace Content.Server.Chemistry.Components;
+
+/// <summary>
+/// Used for embeddable entities that should try to inject a
+/// contained solution into a target when they become embedded in it.
+/// </summary>
+[RegisterComponent]
+public sealed partial class SolutionInjectOnEmbedComponent : BaseSolutionInjectOnEventComponent { }
diff --git a/Content.Server/Chemistry/Components/SolutionInjectOnProjectileHitComponent.cs b/Content.Server/Chemistry/Components/SolutionInjectOnProjectileHitComponent.cs
new file mode 100644
index 0000000000..395a075298
--- /dev/null
+++ b/Content.Server/Chemistry/Components/SolutionInjectOnProjectileHitComponent.cs
@@ -0,0 +1,8 @@
+namespace Content.Server.Chemistry.Components;
+
+/// <summary>
+/// Used for projectile entities that should try to inject a
+/// contained solution into a target when they hit it.
+/// </summary>
+[RegisterComponent]
+public sealed partial class SolutionInjectOnProjectileHitComponent : BaseSolutionInjectOnEventComponent { }
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
deleted file mode 100644
index fb84aca3e4..0000000000
--- a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Shared.Inventory;
-using Content.Shared.Projectiles;
-
-namespace Content.Server.Chemistry.EntitySystems;
-
-public sealed class SolutionInjectOnCollideSystem : EntitySystem
-{
-    [Dependency] private readonly SolutionContainerSystem _solutionContainersSystem = default!;
-    [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
-    [Dependency] private readonly InventorySystem _inventorySystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<SolutionInjectOnCollideComponent, ProjectileHitEvent>(HandleInjection);
-    }
-
-    private void HandleInjection(Entity<SolutionInjectOnCollideComponent> ent, ref ProjectileHitEvent args)
-    {
-        var component = ent.Comp;
-        var target = args.Target;
-
-        if (!TryComp<BloodstreamComponent>(target, out var bloodstream) ||
-            !_solutionContainersSystem.TryGetInjectableSolution(ent.Owner, out var solution, out _))
-        {
-            return;
-        }
-
-        if (component.BlockSlots != 0x0)
-        {
-            var containerEnumerator = _inventorySystem.GetSlotEnumerator(target, component.BlockSlots);
-
-            // TODO add a helper method for this?
-            if (containerEnumerator.MoveNext(out _))
-                return;
-        }
-
-        var solRemoved = _solutionContainersSystem.SplitSolution(solution.Value, component.TransferAmount);
-        var solRemovedVol = solRemoved.Volume;
-
-        var solToInject = solRemoved.SplitSolution(solRemovedVol * component.TransferEfficiency);
-
-        _bloodstreamSystem.TryAddToChemicals(target, solToInject, bloodstream);
-    }
-}
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
new file mode 100644
index 0000000000..3c57cc31af
--- /dev/null
+++ b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
@@ -0,0 +1,148 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Server.Chemistry.Components;
+using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Shared.Inventory;
+using Content.Shared.Popups;
+using Content.Shared.Projectiles;
+using Content.Shared.Tag;
+using Content.Shared.Weapons.Melee.Events;
+using Robust.Shared.Collections;
+
+namespace Content.Server.Chemistry.EntitySystems;
+
+/// <summary>
+/// System for handling the different inheritors of <see cref="BaseSolutionInjectOnEventComponent"/>.
+/// Subscribes to relevent events and performs solution injections when they are raised.
+/// </summary>
+public sealed class SolutionInjectOnCollideSystem : EntitySystem
+{
+    [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<SolutionInjectOnProjectileHitComponent, ProjectileHitEvent>(HandleProjectileHit);
+        SubscribeLocalEvent<SolutionInjectOnEmbedComponent, EmbedEvent>(HandleEmbed);
+        SubscribeLocalEvent<MeleeChemicalInjectorComponent, MeleeHitEvent>(HandleMeleeHit);
+    }
+
+    private void HandleProjectileHit(Entity<SolutionInjectOnProjectileHitComponent> entity, ref ProjectileHitEvent args)
+    {
+        DoInjection((entity.Owner, entity.Comp), args.Target, args.Shooter);
+    }
+
+    private void HandleEmbed(Entity<SolutionInjectOnEmbedComponent> entity, ref EmbedEvent args)
+    {
+        DoInjection((entity.Owner, entity.Comp), args.Embedded, args.Shooter);
+    }
+
+    private void HandleMeleeHit(Entity<MeleeChemicalInjectorComponent> entity, ref MeleeHitEvent args)
+    {
+        // MeleeHitEvent is weird, so we have to filter to make sure we actually
+        // hit something and aren't just examining the weapon.
+        if (args.IsHit)
+            TryInjectTargets((entity.Owner, entity.Comp), args.HitEntities, args.User);
+    }
+
+    private void DoInjection(Entity<BaseSolutionInjectOnEventComponent> injectorEntity, EntityUid target, EntityUid? source = null)
+    {
+        TryInjectTargets(injectorEntity, [target], source);
+    }
+
+    /// <summary>
+    /// Filters <paramref name="targets"/> for valid targets and tries to inject a portion of <see cref="BaseSolutionInjectOnEventComponent.Solution"/> into
+    /// each valid target's bloodstream.
+    /// </summary>
+    /// <remarks>
+    /// Targets are invalid if any of the following are true:
+    /// <list type="bullet">
+    ///     <item>The target does not have a bloodstream.</item>
+    ///     <item><see cref="BaseSolutionInjectOnEventComponent.PierceArmor"/> is false and the target is wearing a hardsuit.</item>
+    ///     <item><see cref="BaseSolutionInjectOnEventComponent.BlockSlots"/> is not NONE and the target has an item equipped in any of the specified slots.</item>
+    /// </list>
+    /// </remarks>
+    /// <returns>true if at least one target was successfully injected, otherwise false</returns>
+    private bool TryInjectTargets(Entity<BaseSolutionInjectOnEventComponent> injector, IReadOnlyList<EntityUid> targets, EntityUid? source = null)
+    {
+        // Make sure we have at least one target
+        if (targets.Count == 0)
+            return false;
+
+        // Get the solution to inject
+        if (!_solutionContainer.TryGetSolution(injector.Owner, injector.Comp.Solution, out var injectorSolution))
+            return false;
+
+        // Build a list of bloodstreams to inject into
+        var targetBloodstreams = new ValueList<Entity<BloodstreamComponent>>();
+        foreach (var target in targets)
+        {
+            if (Deleted(target))
+                continue;
+
+            // Yuck, this is way to hardcodey for my tastes
+            // TODO blocking injection with a hardsuit should probably done with a cancellable event or something
+            if (!injector.Comp.PierceArmor && _inventory.TryGetSlotEntity(target, "outerClothing", out var suit) && _tag.HasTag(suit.Value, "Hardsuit"))
+            {
+                // Only show popup to attacker
+                if (source != null)
+                    _popup.PopupEntity(Loc.GetString(injector.Comp.BlockedByHardsuitPopupMessage, ("weapon", injector.Owner), ("target", target)), target, source.Value, PopupType.SmallCaution);
+
+                continue;
+            }
+
+            // Check if the target has anything equipped in a slot that would block injection
+            if (injector.Comp.BlockSlots != SlotFlags.NONE)
+            {
+                var blocked = false;
+                var containerEnumerator = _inventory.GetSlotEnumerator(target, injector.Comp.BlockSlots);
+                while (containerEnumerator.MoveNext(out var container))
+                {
+                    if (container.ContainedEntity != null)
+                    {
+                        blocked = true;
+                        break;
+                    }
+                }
+                if (blocked)
+                    continue;
+            }
+
+            // Make sure the target has a bloodstream
+            if (!TryComp<BloodstreamComponent>(target, out var bloodstream))
+                continue;
+
+
+            // Checks passed; add this target's bloodstream to the list
+            targetBloodstreams.Add((target, bloodstream));
+        }
+
+        // Make sure we got at least one bloodstream
+        if (targetBloodstreams.Count == 0)
+            return false;
+
+        // Extract total needed solution from the injector
+        var removedSolution = _solutionContainer.SplitSolution(injectorSolution.Value, injector.Comp.TransferAmount * targetBloodstreams.Count);
+        // Adjust solution amount based on transfer efficiency
+        var solutionToInject = removedSolution.SplitSolution(removedSolution.Volume * injector.Comp.TransferEfficiency);
+        // Calculate how much of the adjusted solution each target will get
+        var volumePerBloodstream = solutionToInject.Volume * (1f / targetBloodstreams.Count);
+
+        var anySuccess = false;
+        foreach (var targetBloodstream in targetBloodstreams)
+        {
+            // Take our portion of the adjusted solution for this target
+            var individualInjection = solutionToInject.SplitSolution(volumePerBloodstream);
+            // Inject our portion into the target's bloodstream
+            if (_bloodstream.TryAddToChemicals(targetBloodstream.Owner, individualInjection, targetBloodstream.Comp))
+                anySuccess = true;
+        }
+
+        // Huzzah!
+        return anySuccess;
+    }
+}
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs
deleted file mode 100644
index 1ed5cec8dd..0000000000
--- a/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-using Content.Server.Administration.Logs;
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Database;
-using Content.Shared.FixedPoint;
-using Content.Shared.Interaction;
-using Content.Shared.Popups;
-using Content.Shared.Verbs;
-using JetBrains.Annotations;
-using Robust.Server.GameObjects;
-using Robust.Shared.Player;
-
-namespace Content.Server.Chemistry.EntitySystems
-{
-    [UsedImplicitly]
-    public sealed class SolutionTransferSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-        [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
-        [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
-        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-
-        /// <summary>
-        ///     Default transfer amounts for the set-transfer verb.
-        /// </summary>
-        public static readonly List<int> DefaultTransferAmounts = new() { 1, 5, 10, 25, 50, 100, 250, 500, 1000 };
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<SolutionTransferComponent, GetVerbsEvent<AlternativeVerb>>(AddSetTransferVerbs);
-            SubscribeLocalEvent<SolutionTransferComponent, AfterInteractEvent>(OnAfterInteract);
-            SubscribeLocalEvent<SolutionTransferComponent, TransferAmountSetValueMessage>(OnTransferAmountSetValueMessage);
-        }
-
-        private void OnTransferAmountSetValueMessage(Entity<SolutionTransferComponent> entity, ref TransferAmountSetValueMessage message)
-        {
-            var newTransferAmount = FixedPoint2.Clamp(message.Value, entity.Comp.MinimumTransferAmount, entity.Comp.MaximumTransferAmount);
-            entity.Comp.TransferAmount = newTransferAmount;
-
-            if (message.Session.AttachedEntity is { Valid: true } user)
-                _popupSystem.PopupEntity(Loc.GetString("comp-solution-transfer-set-amount", ("amount", newTransferAmount)), entity.Owner, user);
-        }
-
-        private void AddSetTransferVerbs(Entity<SolutionTransferComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
-        {
-            var (uid, component) = entity;
-
-            if (!args.CanAccess || !args.CanInteract || !component.CanChangeTransferAmount || args.Hands == null)
-                return;
-
-            if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
-                return;
-
-            // Custom transfer verb
-            AlternativeVerb custom = new();
-            custom.Text = Loc.GetString("comp-solution-transfer-verb-custom-amount");
-            custom.Category = VerbCategory.SetTransferAmount;
-            custom.Act = () => _userInterfaceSystem.TryOpen(uid, TransferAmountUiKey.Key, actor.PlayerSession);
-            custom.Priority = 1;
-            args.Verbs.Add(custom);
-
-            // Add specific transfer verbs according to the container's size
-            var priority = 0;
-            var user = args.User;
-            foreach (var amount in DefaultTransferAmounts)
-            {
-                if (amount < component.MinimumTransferAmount.Int() || amount > component.MaximumTransferAmount.Int())
-                    continue;
-
-                AlternativeVerb verb = new();
-                verb.Text = Loc.GetString("comp-solution-transfer-verb-amount", ("amount", amount));
-                verb.Category = VerbCategory.SetTransferAmount;
-                verb.Act = () =>
-                {
-                    component.TransferAmount = FixedPoint2.New(amount);
-                    _popupSystem.PopupEntity(Loc.GetString("comp-solution-transfer-set-amount", ("amount", amount)), uid, user);
-                };
-
-                // we want to sort by size, not alphabetically by the verb text.
-                verb.Priority = priority;
-                priority--;
-
-                args.Verbs.Add(verb);
-            }
-        }
-
-        private void OnAfterInteract(Entity<SolutionTransferComponent> entity, ref AfterInteractEvent args)
-        {
-            if (!args.CanReach || args.Target == null)
-                return;
-
-            var target = args.Target!.Value;
-            var (uid, component) = entity;
-
-            //Special case for reagent tanks, because normally clicking another container will give solution, not take it.
-            if (component.CanReceive && !EntityManager.HasComponent<RefillableSolutionComponent>(target) // target must not be refillable (e.g. Reagent Tanks)
-                                     && _solutionContainerSystem.TryGetDrainableSolution(target, out var targetSoln, out _) // target must be drainable
-                                     && EntityManager.TryGetComponent(uid, out RefillableSolutionComponent? refillComp)
-                                     && _solutionContainerSystem.TryGetRefillableSolution((uid, refillComp, null), out var ownerSoln, out var ownerRefill))
-
-            {
-
-                var transferAmount = component.TransferAmount; // This is the player-configurable transfer amount of "uid," not the target reagent tank.
-
-                if (EntityManager.TryGetComponent(uid, out RefillableSolutionComponent? refill) && refill.MaxRefill != null) // uid is the entity receiving solution from target.
-                {
-                    transferAmount = FixedPoint2.Min(transferAmount, (FixedPoint2) refill.MaxRefill); // if the receiver has a smaller transfer limit, use that instead
-                }
-
-                var transferred = Transfer(args.User, target, targetSoln.Value, uid, ownerSoln.Value, transferAmount);
-                if (transferred > 0)
-                {
-                    var toTheBrim = ownerRefill.AvailableVolume == 0;
-                    var msg = toTheBrim
-                        ? "comp-solution-transfer-fill-fully"
-                        : "comp-solution-transfer-fill-normal";
-
-                    _popupSystem.PopupEntity(Loc.GetString(msg, ("owner", args.Target), ("amount", transferred), ("target", uid)), uid, args.User);
-
-                    args.Handled = true;
-                    return;
-                }
-            }
-
-            // if target is refillable, and owner is drainable
-            if (component.CanSend && _solutionContainerSystem.TryGetRefillableSolution(target, out targetSoln, out var targetRefill)
-                                  && _solutionContainerSystem.TryGetDrainableSolution(uid, out ownerSoln, out var ownerDrain))
-            {
-                var transferAmount = component.TransferAmount;
-
-                if (EntityManager.TryGetComponent(target, out RefillableSolutionComponent? refill) && refill.MaxRefill != null)
-                {
-                    transferAmount = FixedPoint2.Min(transferAmount, (FixedPoint2) refill.MaxRefill);
-                }
-
-                var transferred = Transfer(args.User, uid, ownerSoln.Value, target, targetSoln.Value, transferAmount);
-
-                if (transferred > 0)
-                {
-                    var message = Loc.GetString("comp-solution-transfer-transfer-solution", ("amount", transferred), ("target", target));
-                    _popupSystem.PopupEntity(message, uid, args.User);
-
-                    args.Handled = true;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Transfer from a solution to another.
-        /// </summary>
-        /// <returns>The actual amount transferred.</returns>
-        public FixedPoint2 Transfer(EntityUid user,
-            EntityUid sourceEntity,
-            Entity<SolutionComponent> source,
-            EntityUid targetEntity,
-            Entity<SolutionComponent> target,
-            FixedPoint2 amount)
-        {
-            var transferAttempt = new SolutionTransferAttemptEvent(sourceEntity, targetEntity);
-
-            // Check if the source is cancelling the transfer
-            RaiseLocalEvent(sourceEntity, transferAttempt, broadcast: true);
-            if (transferAttempt.Cancelled)
-            {
-                _popupSystem.PopupEntity(transferAttempt.CancelReason!, sourceEntity, user);
-                return FixedPoint2.Zero;
-            }
-
-            var sourceSolution = source.Comp.Solution;
-            if (sourceSolution.Volume == 0)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("comp-solution-transfer-is-empty", ("target", sourceEntity)), sourceEntity, user);
-                return FixedPoint2.Zero;
-            }
-
-            // Check if the target is cancelling the transfer
-            RaiseLocalEvent(targetEntity, transferAttempt, broadcast: true);
-            if (transferAttempt.Cancelled)
-            {
-                _popupSystem.PopupEntity(transferAttempt.CancelReason!, sourceEntity, user);
-                return FixedPoint2.Zero;
-            }
-
-            var targetSolution = target.Comp.Solution;
-            if (targetSolution.AvailableVolume == 0)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("comp-solution-transfer-is-full", ("target", targetEntity)), targetEntity, user);
-                return FixedPoint2.Zero;
-            }
-
-            var actualAmount = FixedPoint2.Min(amount, FixedPoint2.Min(sourceSolution.Volume, targetSolution.AvailableVolume));
-
-            var solution = _solutionContainerSystem.Drain(sourceEntity, source, actualAmount);
-            _solutionContainerSystem.Refill(targetEntity, target, solution);
-
-            _adminLogger.Add(LogType.Action, LogImpact.Medium,
-                $"{EntityManager.ToPrettyString(user):player} transferred {string.Join(", ", solution.Contents)} to {EntityManager.ToPrettyString(targetEntity):entity}, which now contains {SolutionContainerSystem.ToPrettyString(targetSolution)}");
-
-            return actualAmount;
-        }
-    }
-
-    /// <summary>
-    /// Raised when attempting to transfer from one solution to another.
-    /// </summary>
-    public sealed class SolutionTransferAttemptEvent : CancellableEntityEventArgs
-    {
-        public SolutionTransferAttemptEvent(EntityUid from, EntityUid to)
-        {
-            From = from;
-            To = to;
-        }
-
-        public EntityUid From { get; }
-        public EntityUid To { get; }
-
-        /// <summary>
-        /// Why the transfer has been cancelled.
-        /// </summary>
-        public string? CancelReason { get; private set; }
-
-        /// <summary>
-        /// Cancels the transfer.
-        /// </summary>
-        public void Cancel(string reason)
-        {
-            base.Cancel();
-            CancelReason = reason;
-        }
-    }
-}
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index 61834ba245..16ed57fb12 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
+using System.Runtime.InteropServices;
 using System.Linq;
-using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using Content.Server.Database;
 using Content.Server.GameTicking;
@@ -13,6 +13,7 @@ using Content.Shared._White;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
+using Robust.Shared.Timing;
 
 
 namespace Content.Server.Connection
@@ -21,6 +22,18 @@ namespace Content.Server.Connection
     {
         void Initialize();
         Task<bool> HavePrivilegedJoin(NetUserId userId); // WD-EDIT
+    
+        /// <summary>
+        /// Temporarily allow a user to bypass regular connection requirements.
+        /// </summary>
+        /// <remarks>
+        /// The specified user will be allowed to bypass regular player cap,
+        /// whitelist and panic bunker restrictions for <paramref name="duration"/>.
+        /// Bans are not bypassed.
+        /// </remarks>
+        /// <param name="user">The user to give a temporary bypass.</param>
+        /// <param name="duration">How long the bypass should last for.</param>
+        void AddTemporaryConnectBypass(NetUserId user, TimeSpan duration);
     }
 
     /// <summary>
@@ -35,19 +48,36 @@ namespace Content.Server.Connection
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly ILocalizationManager _loc = default!;
         [Dependency] private readonly ServerDbEntryManager _serverDbEntry = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
+
+        private readonly Dictionary<NetUserId, TimeSpan> _temporaryBypasses = [];
+        private ISawmill _sawmill = default!;
 
         //WD-EDIT
+        [Dependency] private readonly GameTicker _gameTicker = default!;
         [Dependency] private readonly SponsorsManager _sponsorsManager = default!;
         //WD-EDIT
 
         public void Initialize()
         {
+            _sawmill = _logManager.GetSawmill("connections");
+
             _netMgr.Connecting += NetMgrOnConnecting;
             _netMgr.AssignUserIdCallback = AssignUserIdCallback;
             // Approval-based IP bans disabled because they don't play well with Happy Eyeballs.
             // _netMgr.HandleApprovalCallback = HandleApproval;
         }
 
+        public void AddTemporaryConnectBypass(NetUserId user, TimeSpan duration)
+        {
+            ref var time = ref CollectionsMarshal.GetValueRefOrAddDefault(_temporaryBypasses, user, out _);
+            var newTime = _gameTiming.RealTime + duration;
+            // Make sure we only update the time if we wouldn't shrink it.
+            if (newTime > time)
+                time = newTime;
+        }
+
         /*
         private async Task<NetApproval> HandleApproval(NetApprovalEventArgs eventArgs)
         {
@@ -117,6 +147,20 @@ namespace Content.Server.Connection
                 hwId = null;
             }
 
+            var bans = await _db.GetServerBansAsync(addr, userId, hwId, includeUnbanned: false);
+            if (bans.Count > 0 && bans.Any(x=> x.ExpirationTime == null)) // Miracle Edit
+            {
+                var firstBan = bans[0];
+                var message = firstBan.FormatBanMessage(_cfg, _loc);
+                return (ConnectionDenyReason.Ban, message, bans);
+            }
+
+            if (HasTemporaryBypass(userId))
+            {
+                _sawmill.Verbose("User {UserId} has temporary bypass, skipping further connection checks", userId);
+                return null;
+            }
+
             var adminData = await _dbManager.GetAdminDataForAsync(e.UserId);
 
             if (_cfg.GetCVar(CCVars.PanicBunkerEnabled) && adminData == null)
@@ -175,14 +219,6 @@ namespace Content.Server.Connection
             }
             //WD-EDIT
 
-            var bans = await _db.GetServerBansAsync(addr, userId, hwId, includeUnbanned: false, _cfg.GetCVar(CCVars.AdminLogsServerName));
-            if (bans.Count > 0 && bans.Any(x=> x.ExpirationTime == null)) //Miracle edit
-            {
-                var firstBan = bans[0];
-                var message = firstBan.FormatBanMessage(_cfg, _loc);
-                return (ConnectionDenyReason.Ban, message, bans);
-            }
-
             if (_cfg.GetCVar(CCVars.WhitelistEnabled))
             {
                 var min = _cfg.GetCVar(CCVars.WhitelistMinPlayers);
@@ -203,6 +239,11 @@ namespace Content.Server.Connection
             return null;
         }
 
+        private bool HasTemporaryBypass(NetUserId user)
+        {
+            return _temporaryBypasses.TryGetValue(user, out var time) && time > _gameTiming.RealTime;
+        }
+
         private async Task<NetUserId?> AssignUserIdCallback(string name)
         {
             if (!_cfg.GetCVar(CCVars.GamePersistGuests))
@@ -227,8 +268,7 @@ namespace Content.Server.Connection
             var adminData = await _dbManager.GetAdminDataForAsync(userId);
 
             var havePriorityJoin = _sponsorsManager.TryGetInfo(userId, out var sponsorData) && sponsorData.HavePriorityJoin;
-            var wasInGame = EntitySystem.TryGet<GameTicker>(out var ticker) &&
-                            ticker.PlayerGameStatuses.TryGetValue(userId, out var status) &&
+            var wasInGame = _gameTicker.PlayerGameStatuses.TryGetValue(userId, out var status) &&
                             status == PlayerGameStatus.JoinedGame;
             return adminData != null ||
                    havePriorityJoin ||
diff --git a/Content.Server/Connection/GrantConnectBypassCommand.cs b/Content.Server/Connection/GrantConnectBypassCommand.cs
new file mode 100644
index 0000000000..e2d0d7338a
--- /dev/null
+++ b/Content.Server/Connection/GrantConnectBypassCommand.cs
@@ -0,0 +1,60 @@
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+
+namespace Content.Server.Connection;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class GrantConnectBypassCommand : LocalizedCommands
+{
+    private static readonly TimeSpan DefaultDuration = TimeSpan.FromHours(1);
+
+    [Dependency] private readonly IPlayerLocator _playerLocator = default!;
+    [Dependency] private readonly IConnectionManager _connectionManager = default!;
+
+    public override string Command => "grant_connect_bypass";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length is not (1 or 2))
+        {
+            shell.WriteError(Loc.GetString("cmd-grant_connect_bypass-invalid-args"));
+            return;
+        }
+
+        var argPlayer = args[0];
+        var info = await _playerLocator.LookupIdByNameOrIdAsync(argPlayer);
+        if (info == null)
+        {
+            shell.WriteError(Loc.GetString("cmd-grant_connect_bypass-unknown-user", ("user", argPlayer)));
+            return;
+        }
+
+        var duration = DefaultDuration;
+        if (args.Length > 1)
+        {
+            var argDuration = args[2];
+            if (!uint.TryParse(argDuration, out var minutes))
+            {
+                shell.WriteLine(Loc.GetString("cmd-grant_connect_bypass-invalid-duration", ("duration", argDuration)));
+                return;
+            }
+
+            duration = TimeSpan.FromMinutes(minutes);
+        }
+
+        _connectionManager.AddTemporaryConnectBypass(info.UserId, duration);
+        shell.WriteLine(Loc.GetString("cmd-grant_connect_bypass-success", ("user", argPlayer)));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+            return CompletionResult.FromHint(Loc.GetString("cmd-grant_connect_bypass-arg-user"));
+
+        if (args.Length == 2)
+            return CompletionResult.FromHint(Loc.GetString("cmd-grant_connect_bypass-arg-duration"));
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/Construction/Conditions/ToiletLidClosed.cs b/Content.Server/Construction/Conditions/ToiletLidClosed.cs
deleted file mode 100644
index 40a3be006b..0000000000
--- a/Content.Server/Construction/Conditions/ToiletLidClosed.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Shared.Construction;
-using Content.Shared.Examine;
-using Content.Shared.Toilet;
-using JetBrains.Annotations;
-
-namespace Content.Server.Construction.Conditions
-{
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class ToiletLidClosed : IGraphCondition
-    {
-        public bool Condition(EntityUid uid, IEntityManager entityManager)
-        {
-            if (!entityManager.TryGetComponent(uid, out ToiletComponent? toilet))
-                return false;
-
-            return !toilet.LidOpen;
-        }
-
-        public bool DoExamine(ExaminedEvent args)
-        {
-            var entity = args.Examined;
-
-            if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ToiletComponent? toilet)) return false;
-            if (!toilet.LidOpen) return false;
-
-            args.PushMarkup(Loc.GetString("construction-examine-condition-toilet-lid-closed") + "\n");
-            return true;
-        }
-
-        public IEnumerable<ConstructionGuideEntry> GenerateGuideEntry()
-        {
-            yield return new ConstructionGuideEntry()
-            {
-                Localization = "construction-step-condition-toilet-lid-closed"
-            };
-        }
-    }
-}
diff --git a/Content.Server/Damage/Components/DamagePopupComponent.cs b/Content.Server/Damage/Components/DamagePopupComponent.cs
index b1216069f5..37c5d57cf4 100644
--- a/Content.Server/Damage/Components/DamagePopupComponent.cs
+++ b/Content.Server/Damage/Components/DamagePopupComponent.cs
@@ -5,6 +5,11 @@ namespace Content.Server.Damage.Components;
 [RegisterComponent, Access(typeof(DamagePopupSystem))]
 public sealed partial class DamagePopupComponent : Component
 {
+    /// <summary>
+    /// Bool that will be used to determine if the popup type can be changed with a left click.
+    /// </summary>
+    [DataField("allowTypeChange")] [ViewVariables(VVAccess.ReadWrite)]
+    public bool AllowTypeChange = false;
     /// <summary>
     /// Enum that will be used to determine the type of damage popup displayed.
     /// </summary>
diff --git a/Content.Server/Damage/Systems/DamagePopupSystem.cs b/Content.Server/Damage/Systems/DamagePopupSystem.cs
index 7ef0dfdda9..fbaf2149c4 100644
--- a/Content.Server/Damage/Systems/DamagePopupSystem.cs
+++ b/Content.Server/Damage/Systems/DamagePopupSystem.cs
@@ -1,7 +1,8 @@
+using System.Linq;
 using Content.Server.Damage.Components;
 using Content.Server.Popups;
 using Content.Shared.Damage;
-using Robust.Shared.Player;
+using Content.Shared.Interaction;
 
 namespace Content.Server.Damage.Systems;
 
@@ -13,6 +14,7 @@ public sealed class DamagePopupSystem : EntitySystem
     {
         base.Initialize();
         SubscribeLocalEvent<DamagePopupComponent, DamageChangedEvent>(OnDamageChange);
+        SubscribeLocalEvent<DamagePopupComponent, InteractHandEvent>(OnInteractHand);
     }
 
     private void OnDamageChange(EntityUid uid, DamagePopupComponent component, DamageChangedEvent args)
@@ -38,4 +40,20 @@ public sealed class DamagePopupSystem : EntitySystem
 
         }
     }
+
+    private void OnInteractHand(EntityUid uid, DamagePopupComponent component, InteractHandEvent args)
+    {
+        if (component.AllowTypeChange)
+        {
+            if (component.Type == Enum.GetValues(typeof(DamagePopupType)).Cast<DamagePopupType>().Last())
+            {
+                component.Type = Enum.GetValues(typeof(DamagePopupType)).Cast<DamagePopupType>().First();
+            }
+            else
+            {
+                component.Type = (DamagePopupType) (int) component.Type + 1;
+            }
+            _popupSystem.PopupEntity("Target set to type: " + component.Type.ToString(), uid);
+        }
+    }
 }
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/OpenBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/OpenBehavior.cs
index f01e4f7048..7ab1fe11b0 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/OpenBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/OpenBehavior.cs
@@ -1,4 +1,4 @@
-using Content.Server.Nutrition.EntitySystems;
+using Content.Shared.Nutrition.EntitySystems;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors;
 
diff --git a/Content.Server/DeviceLinking/Components/SignalTimerComponent.cs b/Content.Server/DeviceLinking/Components/SignalTimerComponent.cs
index 785e7d3f36..642ec41113 100644
--- a/Content.Server/DeviceLinking/Components/SignalTimerComponent.cs
+++ b/Content.Server/DeviceLinking/Components/SignalTimerComponent.cs
@@ -24,6 +24,12 @@ public sealed partial class SignalTimerComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public string Label = string.Empty;
 
+    /// <summary>
+    ///     Default max width of a label (how many letters can this render?)
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public int MaxLength = 5;
+
     /// <summary>
     ///     The port that gets signaled when the timer triggers.
     /// </summary>
diff --git a/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs b/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
index 5f9ef617ff..190c582c31 100644
--- a/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
@@ -44,6 +44,7 @@ public sealed class SignalTimerSystem : EntitySystem
 
     private void OnInit(EntityUid uid, SignalTimerComponent component, ComponentInit args)
     {
+        _appearanceSystem.SetData(uid, TextScreenVisuals.DefaultText, component.Label);
         _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, component.Label);
         _signalSystem.EnsureSinkPorts(uid, component.Trigger);
     }
@@ -74,11 +75,6 @@ public sealed class SignalTimerSystem : EntitySystem
     {
         RemComp<ActiveSignalTimerComponent>(uid);
 
-        if (TryComp<AppearanceComponent>(uid, out var appearance))
-        {
-            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, signalTimer.Label, appearance);
-        }
-
         var announceMessage = signalTimer.Label;
         if (string.IsNullOrWhiteSpace(announceMessage)) { announceMessage = Loc.GetString("label-none"); }
 
@@ -152,10 +148,15 @@ public sealed class SignalTimerSystem : EntitySystem
         if (!IsMessageValid(uid, args))
             return;
 
-        component.Label = args.Text[..Math.Min(5, args.Text.Length)];
+        component.Label = args.Text[..Math.Min(component.MaxLength, args.Text.Length)];
 
         if (!HasComp<ActiveSignalTimerComponent>(uid))
+        {
+            // could maybe move the defaulttext update out of this block,
+            // if you delved deep into appearance update batching
+            _appearanceSystem.SetData(uid, TextScreenVisuals.DefaultText, component.Label);
             _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, component.Label);
+        }
     }
 
     /// <summary>
@@ -183,7 +184,14 @@ public sealed class SignalTimerSystem : EntitySystem
         if (!IsMessageValid(uid, args))
             return;
 
-        OnStartTimer(uid, component);
+        // feedback received: pressing the timer button while a timer is running should cancel the timer.
+        if (HasComp<ActiveSignalTimerComponent>(uid))
+        {
+            _appearanceSystem.SetData(uid, TextScreenVisuals.TargetTime, _gameTiming.CurTime);
+            Trigger(uid, component);
+        }
+        else
+            OnStartTimer(uid, component);
     }
 
     private void OnSignalReceived(EntityUid uid, SignalTimerComponent component, ref SignalReceivedEvent args)
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index 48cf239417..a052c5b526 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -136,8 +136,7 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
     {
         // This is not an interaction, activation, or alternative verb type because unfortunately most users are
         // unwilling to accept that this is where they belong and don't want to accidentally climb inside.
-        if (!component.MobsCanEnter ||
-            !args.CanAccess ||
+        if (!args.CanAccess ||
             !args.CanInteract ||
             component.Container.ContainedEntities.Contains(args.User) ||
             !_actionBlockerSystem.CanMove(args.User))
@@ -628,10 +627,10 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
         switch (state)
         {
             case DisposalsPressureState.Flushed:
-                _appearance.SetData(uid, SharedDisposalUnitComponent.Visuals.VisualState, SharedDisposalUnitComponent.VisualState.Flushing, appearance);
+                _appearance.SetData(uid, SharedDisposalUnitComponent.Visuals.VisualState, SharedDisposalUnitComponent.VisualState.OverlayFlushing, appearance);
                 break;
             case DisposalsPressureState.Pressurizing:
-                _appearance.SetData(uid, SharedDisposalUnitComponent.Visuals.VisualState, SharedDisposalUnitComponent.VisualState.Charging, appearance);
+                _appearance.SetData(uid, SharedDisposalUnitComponent.Visuals.VisualState, SharedDisposalUnitComponent.VisualState.OverlayCharging, appearance);
                 break;
             case DisposalsPressureState.Ready:
                 _appearance.SetData(uid, SharedDisposalUnitComponent.Visuals.VisualState, SharedDisposalUnitComponent.VisualState.Anchored, appearance);
diff --git a/Content.Server/Doors/Electronics/Systems/DoorElectronicsSystem.cs b/Content.Server/Doors/Electronics/Systems/DoorElectronicsSystem.cs
new file mode 100644
index 0000000000..56e8bd50b3
--- /dev/null
+++ b/Content.Server/Doors/Electronics/Systems/DoorElectronicsSystem.cs
@@ -0,0 +1,69 @@
+using System.Linq;
+using Content.Server.Doors.Electronics;
+using Content.Shared.Access;
+using Content.Shared.Access.Components;
+using Content.Shared.Access.Systems;
+using Content.Shared.DeviceNetwork.Components;
+using Content.Shared.Doors.Electronics;
+using Content.Shared.Doors;
+using Content.Shared.Interaction;
+using Robust.Server.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Doors.Electronics;
+
+public sealed class DoorElectronicsSystem : EntitySystem
+{
+    [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly AccessReaderSystem _accessReader = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<DoorElectronicsComponent, DoorElectronicsUpdateConfigurationMessage>(OnChangeConfiguration);
+        SubscribeLocalEvent<DoorElectronicsComponent, AccessReaderConfigurationChangedEvent>(OnAccessReaderChanged);
+        SubscribeLocalEvent<DoorElectronicsComponent, BoundUIOpenedEvent>(OnBoundUIOpened);
+    }
+
+    public void UpdateUserInterface(EntityUid uid, DoorElectronicsComponent component)
+    {
+        var accesses = new List<ProtoId<AccessLevelPrototype>>();
+
+        if (TryComp<AccessReaderComponent>(uid, out var accessReader))
+        {
+            foreach (var accessList in accessReader.AccessLists)
+            {
+                var access = accessList.FirstOrDefault();
+                accesses.Add(access);
+            }
+        }
+
+        var state = new DoorElectronicsConfigurationState(accesses);
+        _uiSystem.TrySetUiState(uid, DoorElectronicsConfigurationUiKey.Key, state);
+    }
+
+    private void OnChangeConfiguration(
+        EntityUid uid,
+        DoorElectronicsComponent component,
+        DoorElectronicsUpdateConfigurationMessage args)
+    {
+        var accessReader = EnsureComp<AccessReaderComponent>(uid);
+        _accessReader.SetAccesses(uid, accessReader, args.AccessList);
+    }
+
+    private void OnAccessReaderChanged(
+        EntityUid uid,
+        DoorElectronicsComponent component,
+        AccessReaderConfigurationChangedEvent args)
+    {
+        UpdateUserInterface(uid, component);
+    }
+
+    private void OnBoundUIOpened(
+        EntityUid uid,
+        DoorElectronicsComponent component,
+        BoundUIOpenedEvent args)
+    {
+        UpdateUserInterface(uid, component);
+    }
+}
diff --git a/Content.Server/Extinguisher/FireExtinguisherSystem.cs b/Content.Server/Extinguisher/FireExtinguisherSystem.cs
index dfecd72398..b33a1af157 100644
--- a/Content.Server/Extinguisher/FireExtinguisherSystem.cs
+++ b/Content.Server/Extinguisher/FireExtinguisherSystem.cs
@@ -73,6 +73,7 @@ public sealed class FireExtinguisherSystem : EntitySystem
 
         args.Handled = true;
 
+        // TODO: why is this copy paste shit here just have fire extinguisher cancel transfer when safety is on
         var transfer = containerSolution.AvailableVolume;
         if (TryComp<SolutionTransferComponent>(entity.Owner, out var solTrans))
         {
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
index ce5b5b3637..7780e5d467 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
@@ -1,5 +1,5 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Nutrition.EntitySystems;
+using Content.Server.Fluids.Components;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
@@ -11,6 +11,7 @@ using Content.Shared.FixedPoint;
 using Content.Shared.Fluids.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Inventory.Events;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Spillable;
 using Content.Shared.Throwing;
@@ -29,6 +30,7 @@ public sealed partial class PuddleSystem
         // Openable handles the event if it's closed
         SubscribeLocalEvent<SpillableComponent, MeleeHitEvent>(SplashOnMeleeHit, after: [typeof(OpenableSystem)]);
         SubscribeLocalEvent<SpillableComponent, GotEquippedEvent>(OnGotEquipped);
+        SubscribeLocalEvent<SpillableComponent, GotUnequippedEvent>(OnGotUnequipped);
         SubscribeLocalEvent<SpillableComponent, SolutionContainerOverflowEvent>(OnOverflow);
         SubscribeLocalEvent<SpillableComponent, SpillDoAfterEvent>(OnDoAfter);
         SubscribeLocalEvent<SpillableComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
@@ -114,6 +116,9 @@ public sealed partial class PuddleSystem
         if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln, out var solution))
             return;
 
+        // block access to the solution while worn
+        AddComp<BlockSolutionAccessComponent>(entity);
+
         if (solution.Volume == 0)
             return;
 
@@ -122,6 +127,14 @@ public sealed partial class PuddleSystem
         TrySplashSpillAt(entity.Owner, Transform(args.Equipee).Coordinates, drainedSolution, out _);
     }
 
+    private void OnGotUnequipped(Entity<SpillableComponent> entity, ref GotUnequippedEvent args)
+    {
+        if (!entity.Comp.SpillWorn)
+            return;
+
+        RemCompDeferred<BlockSolutionAccessComponent>(entity);
+    }
+
     private void SpillOnLand(Entity<SpillableComponent> entity, ref LandEvent args)
     {
         if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln, out var solution))
@@ -130,6 +143,9 @@ public sealed partial class PuddleSystem
         if (Openable.IsClosed(entity.Owner))
             return;
 
+        if (!entity.Comp.SpillWhenThrown)
+            return;
+
         if (args.User != null)
         {
             _adminLogger.Add(LogType.Landed,
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 62b203729c..dfa81b4035 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -5,6 +5,7 @@ using Content.Server.Discord;
 using Content.Server.GameTicking.Events;
 using Content.Server.Ghost;
 using Content.Server.Maps;
+using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.GameTicking;
 using Content.Shared.Mind;
@@ -212,21 +213,9 @@ namespace Content.Server.GameTicking
 
             SendServerMessage(Loc.GetString("game-ticker-start-round"));
 
-            // Just in case it hasn't been loaded previously we'll try loading it.
-            LoadMaps();
-
-            // map has been selected so update the lobby info text
-            // applies to players who didn't ready up
-            UpdateInfoText();
-
-            StartGamePresetRules();
-
-            RoundLengthMetric.Set(0);
-
-            var startingEvent = new RoundStartingEvent(RoundId);
-            RaiseLocalEvent(startingEvent);
             var readyPlayers = new List<ICommonSession>();
             var readyPlayerProfiles = new Dictionary<NetUserId, HumanoidCharacterProfile>();
+            var autoDeAdmin = _cfg.GetCVar(CCVars.AdminDeadminOnJoin);
             var stalinBunkerEnabled = _configurationManager.GetCVar(WhiteCVars.StalinEnabled);
 
             foreach (var (userId, status) in _playerGameStatuses)
@@ -234,6 +223,11 @@ namespace Content.Server.GameTicking
                 if (LobbyEnabled && status != PlayerGameStatus.ReadyToPlay) continue;
                 if (!_playerManager.TryGetSessionById(userId, out var session)) continue;
 
+                if (autoDeAdmin && _adminManager.IsAdmin(session))
+                {
+                    _adminManager.DeAdmin(session);
+                }
+
                 if (stalinBunkerEnabled)
                 {
                     await _stalinManager.RefreshUsersData();
@@ -247,7 +241,7 @@ namespace Content.Server.GameTicking
                 }
 #if DEBUG
                 DebugTools.Assert(_userDb.IsLoadComplete(session),
-                    $"Player was readied up but didn't have user DB data loaded yet??");
+                    "Player was readied up but didn't have user DB data loaded yet??");
 #endif
                 if (_banManager.GetRoleBans(userId) == null)
                 {
@@ -269,6 +263,20 @@ namespace Content.Server.GameTicking
                 readyPlayerProfiles.Add(userId, profile);
             }
 
+            // Just in case it hasn't been loaded previously we'll try loading it.
+            LoadMaps();
+
+            // map has been selected so update the lobby info text
+            // applies to players who didn't ready up
+            UpdateInfoText();
+
+            StartGamePresetRules();
+
+            RoundLengthMetric.Set(0);
+
+            var startingEvent = new RoundStartingEvent(RoundId);
+            RaiseLocalEvent(startingEvent);
+
             var origReadyPlayers = readyPlayers.ToArray();
 
             if (!StartPreset(origReadyPlayers, force))
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index 2535befaea..6885df85ca 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -4,17 +4,12 @@ using System.Numerics;
 using Content.Server.Administration.Managers;
 using System.Text;
 using Content.Server.Ghost;
-using Content.Server.Mind;
-using Content.Server.Players;
 using Content.Server.Spawners.Components;
 using Content.Server.Speech.Components;
 using Content.Server.Station.Components;
-using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Database;
-using Content.Shared.GameTicking;
 using Content.Shared.Players;
-using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Mind;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
@@ -220,17 +215,13 @@ namespace Content.Server.GameTicking
                         : Loc.GetString("ghost-respawn-same-character");
                     var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", message));
                     _chatManager.ChatMessageToOne(ChatChannel.Server, message, wrappedMessage,
-                        default, false, player.ConnectedClient, Color.Red);
+                        default, false, player.Channel, Color.Red);
 
                     return;
                 }
             }
             //WD end
 
-            // Automatically de-admin players who are joining.
-            if (_cfg.GetCVar(CCVars.AdminDeadminOnJoin) && _adminManager.IsAdmin(player))
-                _adminManager.DeAdmin(player);
-
             // We raise this event to allow other systems to handle spawning this player themselves. (e.g. late-join wizard, etc)
             var bev = new PlayerBeforeSpawnEvent(player, character, jobId, lateJoin, station);
             RaiseLocalEvent(bev);
@@ -296,16 +287,24 @@ namespace Content.Server.GameTicking
             var mob = mobMaybe!.Value;
 
             if (jobId.Contains("Clown"))
+            {
                 if (newMind.Comp.ClownName != null)
                     _metaData.SetEntityName(mob, newMind.Comp.ClownName);
+            }
+
             if (jobId.Contains("Mime"))
+            {
                 if (newMind.Comp.MimeName != null)
                     _metaData.SetEntityName(mob, newMind.Comp.MimeName);
+            }
+
             if (jobId.Contains("Borg"))
+            {
                 if (newMind.Comp.BorgName != null && TryComp(mob, out NameIdentifierComponent? identifier))
                 {
                     _metaData.SetEntityName(mob, $"{newMind.Comp.BorgName} {identifier.FullIdentifier}");
                 }
+            }
 
             _mind.TransferTo(newMind, mob);
 
@@ -416,7 +415,7 @@ namespace Content.Server.GameTicking
                 var availableSpeciesLoc = new StringBuilder();
                 foreach (var specie in whitelistedSpecies)
                 {
-                    availableSpeciesLoc.AppendLine("- " + Loc.GetString($"species-name-{specie.ToLower()}"));
+                    availableSpeciesLoc.AppendLine("- " + Loc.GetString($"species-name-{specie.ToString().ToLower()}"));
                 }
 
                 _chatManager.DispatchServerMessage(player, $"Доступные виды:\n{availableSpeciesLoc}");
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index f6f857340e..e5a75f0f0e 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -791,10 +791,6 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
                 _roles.MindAddRole(newMind,
                     new NukeopsRoleComponent { PrototypeId = nukieSession.Type.AntagRoleProto });
 
-                // Automatically de-admin players who are being made nukeops
-                if (_cfg.GetCVar(CCVars.AdminDeadminOnJoin) && _adminManager.IsAdmin(nukieSession.Session))
-                    _adminManager.DeAdmin(nukieSession.Session);
-
                 _mind.TransferTo(newMind, mob);
             }
             //Otherwise, spawn as a ghost role
diff --git a/Content.Server/GameTicking/Rules/VariationPass/Components/CutWireVariationPassComponent.cs b/Content.Server/GameTicking/Rules/VariationPass/Components/CutWireVariationPassComponent.cs
new file mode 100644
index 0000000000..dc9a582ec9
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/VariationPass/Components/CutWireVariationPassComponent.cs
@@ -0,0 +1,29 @@
+using Content.Shared.Whitelist;
+
+namespace Content.Server.GameTicking.Rules.VariationPass.Components;
+
+/// <summary>
+/// Handles cutting a random wire on random devices around the station.
+/// </summary>
+[RegisterComponent]
+public sealed partial class CutWireVariationPassComponent : Component
+{
+    /// <summary>
+    /// Blacklist of hackable entities that should not be chosen to
+    /// have wires cut.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist Blacklist = new();
+
+    /// <summary>
+    /// Chance for an individual wire to be cut.
+    /// </summary>
+    [DataField]
+    public float WireCutChance = 0.05f;
+
+    /// <summary>
+    /// Maximum number of wires that can be cut stationwide.
+    /// </summary>
+    [DataField]
+    public int MaxWiresCut = 10;
+}
diff --git a/Content.Server/GameTicking/Rules/VariationPass/CutWireVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/CutWireVariationPassSystem.cs
new file mode 100644
index 0000000000..fd94c74ac8
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/VariationPass/CutWireVariationPassSystem.cs
@@ -0,0 +1,39 @@
+using Content.Server.GameTicking.Rules.VariationPass.Components;
+using Content.Server.Wires;
+using Robust.Shared.Random;
+
+namespace Content.Server.GameTicking.Rules.VariationPass;
+
+/// <summary>
+/// Handles cutting a random wire on random devices around the station.
+/// This system identifies target devices and adds <see cref="CutWireOnMapInitComponent"/> to them.
+/// The actual wire cutting is handled by <see cref="CutWireOnMapInitSystem"/>.
+/// </summary>
+public sealed class CutWireVariationPassSystem : VariationPassSystem<CutWireVariationPassComponent>
+{
+    protected override void ApplyVariation(Entity<CutWireVariationPassComponent> ent, ref StationVariationPassEvent args)
+    {
+        var wiresCut = 0;
+        var query = AllEntityQuery<WiresComponent, TransformComponent>();
+        while (query.MoveNext(out var uid, out _, out var transform))
+        {
+            // Ignore if not part of the station
+            if (!IsMemberOfStation((uid, transform), ref args))
+                continue;
+
+            // Check against blacklist
+            if (ent.Comp.Blacklist.IsValid(uid))
+                continue;
+
+            if (Random.Prob(ent.Comp.WireCutChance))
+            {
+                EnsureComp<CutWireOnMapInitComponent>(uid);
+                wiresCut++;
+
+                // Limit max wires cut
+                if (wiresCut >= ent.Comp.MaxWiresCut)
+                    break;
+            }
+        }
+    }
+}
diff --git a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
index 0b7cb9cf8f..54e8bcf8b7 100644
--- a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
@@ -249,7 +249,7 @@ public sealed class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponent>
             _playerManager.Sessions,
             component.PatientZeroPrototypeId,
             includeAllJobs: false,
-            customExcludeCondition: player => HasComp<ZombieImmuneComponent>(player) || HasComp<InitialInfectedExemptComponent>(player) 
+            customExcludeCondition: player => HasComp<ZombieImmuneComponent>(player) || HasComp<InitialInfectedExemptComponent>(player)
             );
 
         //And get all players, excluding ZombieImmune and roles with CanBeAntag = False - to fill any leftover initial infected slots
@@ -259,7 +259,7 @@ public sealed class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponent>
             acceptableAntags: Shared.Antag.AntagAcceptability.All,
             includeAllJobs: false ,
             ignorePreferences: true,
-            customExcludeCondition: HasComp<ZombieImmuneComponent> 
+            customExcludeCondition: HasComp<ZombieImmuneComponent>
             );
 
         //If there are no players to choose, abort
@@ -293,6 +293,7 @@ public sealed class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponent>
 
         //Add the role to the mind silently (to avoid repeating job assignment)
         _roles.MindAddRole(mind, new InitialInfectedRoleComponent { PrototypeId = component.PatientZeroPrototypeId }, silent: true);
+        EnsureComp<InitialInfectedComponent>(entity);
 
         //Add the zombie components and grace period
         var pending = EnsureComp<PendingZombieComponent>(entity);
diff --git a/Content.Server/Glue/GlueSystem.cs b/Content.Server/Glue/GlueSystem.cs
index 44ff4e5459..ff53ef91ca 100644
--- a/Content.Server/Glue/GlueSystem.cs
+++ b/Content.Server/Glue/GlueSystem.cs
@@ -1,12 +1,12 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Nutrition.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.Glue;
 using Content.Shared.Hands;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Item;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index 47f1e177b4..3d82cede83 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -73,6 +73,9 @@ namespace Content.Server.Hands.Systems
         
         private void OnExploded(Entity<HandsComponent> ent, ref BeforeExplodeEvent args)
         {
+            if (ent.Comp.DisableExplosionRecursion)
+                return;
+
             foreach (var hand in ent.Comp.Hands.Values)
             {
                 if (hand.HeldEntity is { } uid)
diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
index 7f8d5c6f7f..b09783e315 100644
--- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
+++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
@@ -1,9 +1,6 @@
-using Content.Shared.Examine;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Preferences;
 using Content.Shared.Verbs;
 using Robust.Shared.GameObjects.Components.Localization;
 using Robust.Shared.Prototypes;
@@ -18,20 +15,10 @@ public sealed partial class HumanoidAppearanceSystem : SharedHumanoidAppearanceS
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<HumanoidAppearanceComponent, HumanoidMarkingModifierMarkingSetMessage>(OnMarkingsSet);
         SubscribeLocalEvent<HumanoidAppearanceComponent, HumanoidMarkingModifierBaseLayersSetMessage>(OnBaseLayersSet);
         SubscribeLocalEvent<HumanoidAppearanceComponent, GetVerbsEvent<Verb>>(OnVerbsRequest);
-        SubscribeLocalEvent<HumanoidAppearanceComponent, ExaminedEvent>(OnExamined);
-    }
-
-    private void OnExamined(EntityUid uid, HumanoidAppearanceComponent component, ExaminedEvent args)
-    {
-        var identity = Identity.Entity(uid, EntityManager);
-        var species = GetSpeciesRepresentation(component.Species).ToLower();
-        var age = GetAgeRepresentation(component.Species, component.Age);
-
-        args.PushText(Loc.GetString("humanoid-appearance-component-examine", ("user", identity), ("age", age),
-            ("species", species)));
     }
 
     // this was done enough times that it only made sense to do it here
@@ -213,29 +200,4 @@ public sealed partial class HumanoidAppearanceSystem : SharedHumanoidAppearanceS
 
         Dirty(uid, humanoid);
     }
-
-    /// <summary>
-    /// Takes ID of the species prototype, returns UI-friendly name of the species.
-    /// </summary>
-    public string GetSpeciesRepresentation(string speciesId)
-    {
-        return Loc.GetString(_prototypeManager.TryIndex<SpeciesPrototype>(speciesId, out var species)
-            ? species.Name
-            : "humanoid-appearance-component-unknown-species");
-    }
-
-    public string GetAgeRepresentation(string species, int age)
-    {
-        _prototypeManager.TryIndex<SpeciesPrototype>(species, out var speciesPrototype);
-
-        if (speciesPrototype != null)
-        {
-            return age < speciesPrototype.YoungAge
-                ? Loc.GetString("identity-age-young")
-                : Loc.GetString(age < speciesPrototype.OldAge ? "identity-age-middle-aged" : "identity-age-old");
-        }
-
-        Log.Error("Tried to get age representation of species that couldn't be indexed: " + species);
-        return Loc.GetString("identity-age-young");
-    }
 }
diff --git a/Content.Server/Implants/Components/ScramImplantComponent.cs b/Content.Server/Implants/Components/ScramImplantComponent.cs
index 88c433abfb..f3bbc9e584 100644
--- a/Content.Server/Implants/Components/ScramImplantComponent.cs
+++ b/Content.Server/Implants/Components/ScramImplantComponent.cs
@@ -15,12 +15,6 @@ public sealed partial class ScramImplantComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float TeleportRadius = 100f;
 
-    /// <summary>
-    /// How many times to check for a valid tile to teleport to
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadOnly)]
-    public int TeleportAttempts = 20;
-
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public SoundSpecifier TeleportSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg");
 }
diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs
index fd95720732..e8af08b2eb 100644
--- a/Content.Server/Implants/SubdermalImplantSystem.cs
+++ b/Content.Server/Implants/SubdermalImplantSystem.cs
@@ -14,13 +14,14 @@ using Content.Shared.Popups;
 using Content.Shared.Preferences;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Random;
 using System.Numerics;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Systems;
+using Robust.Shared.Collections;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Implants;
 
@@ -28,7 +29,6 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem
 {
     [Dependency] private readonly CuffableSystem _cuffable = default!;
     [Dependency] private readonly HumanoidAppearanceSystem _humanoidAppearance = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly StoreSystem _store = default!;
@@ -37,8 +37,11 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem
     [Dependency] private readonly SharedTransformSystem _xform = default!;
     [Dependency] private readonly ForensicsSystem _forensicsSystem = default!;
     [Dependency] private readonly PullingSystem _pullingSystem = default!;
+    [Dependency] private readonly EntityLookupSystem _lookupSystem = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
 
     private EntityQuery<PhysicsComponent> _physicsQuery;
+    private HashSet<Entity<MapGridComponent>> _targetGrids = [];
 
     public override void Initialize()
     {
@@ -107,41 +110,92 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem
             _pullingSystem.TryStopPull(ent, pull);
 
         var xform = Transform(ent);
-        var entityCoords = xform.Coordinates.ToMap(EntityManager, _xform);
+        var targetCoords = SelectRandomTileInRange(xform, implant.TeleportRadius);
 
-        // try to find a valid position to teleport to, teleport to whatever works if we can't
-        var targetCoords = new MapCoordinates();
-        for (var i = 0; i < implant.TeleportAttempts; i++)
+        if (targetCoords != null)
         {
-            var distance = implant.TeleportRadius * MathF.Sqrt(_random.NextFloat()); // to get an uniform distribution
-            targetCoords = entityCoords.Offset(_random.NextAngle().ToVec() * distance);
-
-            // prefer teleporting to grids
-            if (!_mapManager.TryFindGridAt(targetCoords, out var gridUid, out var grid))
-                continue;
-
-            // the implant user probably does not want to be in your walls
-            var valid = true;
-            foreach (var entity in grid.GetAnchoredEntities(targetCoords))
-            {
-                if (!_physicsQuery.TryGetComponent(entity, out var body))
-                    continue;
-
-                if (body.BodyType != BodyType.Static ||
-                    !body.Hard ||
-                    (body.CollisionLayer & (int) CollisionGroup.Impassable) == 0)
-                    continue;
-
-                valid = false;
-                break;
-            }
-            if (valid)
-                break;
+            _xform.SetCoordinates(ent, targetCoords.Value);
+            _audio.PlayPvs(implant.TeleportSound, ent);
+            args.Handled = true;
         }
-        _xform.SetWorldPosition(ent, targetCoords.Position);
-        _audio.PlayPvs(implant.TeleportSound, ent);
+    }
 
-        args.Handled = true;
+    private EntityCoordinates? SelectRandomTileInRange(TransformComponent userXform, float radius)
+    {
+        var userCoords = userXform.Coordinates.ToMap(EntityManager, _xform);
+        _targetGrids.Clear();
+        _lookupSystem.GetEntitiesInRange(userCoords, radius, _targetGrids);
+        Entity<MapGridComponent>? targetGrid = null;
+
+        if (_targetGrids.Count == 0)
+            return null;
+
+        // Give preference to the grid the entity is currently on.
+        // This does not guarantee that if the probability fails that the owner's grid won't be picked.
+        // In reality the probability is higher and depends on the number of grids.
+        if (userXform.GridUid != null && TryComp<MapGridComponent>(userXform.GridUid, out var gridComp))
+        {
+            var userGrid = new Entity<MapGridComponent>(userXform.GridUid.Value, gridComp);
+            if (_random.Prob(0.5f))
+            {
+                _targetGrids.Remove(userGrid);
+                targetGrid = userGrid;
+            }
+        }
+
+        if (targetGrid == null)
+            targetGrid = _random.GetRandom().PickAndTake(_targetGrids);
+
+        EntityCoordinates? targetCoords = null;
+
+        do
+        {
+            var valid = false;
+
+            var range = (float) Math.Sqrt(radius);
+            var box = Box2.CenteredAround(userCoords.Position, new Vector2(range, range));
+            var tilesInRange = _mapSystem.GetTilesEnumerator(targetGrid.Value.Owner, targetGrid.Value.Comp, box, false);
+            var tileList = new ValueList<Vector2i>();
+
+            while (tilesInRange.MoveNext(out var tile))
+            {
+                tileList.Add(tile.GridIndices);
+            }
+
+            while (tileList.Count != 0)
+            {
+                var tile = tileList.RemoveSwap(_random.Next(tileList.Count));
+                valid = true;
+                foreach (var entity in _mapSystem.GetAnchoredEntities(targetGrid.Value.Owner, targetGrid.Value.Comp,
+                             tile))
+                {
+                    if (!_physicsQuery.TryGetComponent(entity, out var body))
+                        continue;
+
+                    if (body.BodyType != BodyType.Static ||
+                        !body.Hard ||
+                        (body.CollisionLayer & (int) CollisionGroup.MobMask) == 0)
+                        continue;
+
+                    valid = false;
+                    break;
+                }
+
+                if (valid)
+                {
+                    targetCoords = new EntityCoordinates(targetGrid.Value.Owner,
+                        _mapSystem.TileCenterToVector(targetGrid.Value, tile));
+                    break;
+                }
+            }
+
+            if (valid || _targetGrids.Count == 0) // if we don't do the check here then PickAndTake will blow up on an empty set.
+                break;
+
+            targetGrid = _random.GetRandom().PickAndTake(_targetGrids);
+        } while (true);
+
+        return targetCoords;
     }
 
     private void OnDnaScramblerImplant(EntityUid uid, SubdermalImplantComponent component, UseDnaScramblerImplantEvent args)
diff --git a/Content.Server/Lube/LubeSystem.cs b/Content.Server/Lube/LubeSystem.cs
index 5285cb389c..06d6456a57 100644
--- a/Content.Server/Lube/LubeSystem.cs
+++ b/Content.Server/Lube/LubeSystem.cs
@@ -1,12 +1,12 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Nutrition.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.Glue;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Item;
 using Content.Shared.Lube;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio;
diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs
index ae4444e059..0d6d27777a 100644
--- a/Content.Server/Materials/MaterialReclaimerSystem.cs
+++ b/Content.Server/Materials/MaterialReclaimerSystem.cs
@@ -1,8 +1,6 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.GameTicking;
-using Content.Server.Nutrition.EntitySystems;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Stack;
@@ -10,11 +8,13 @@ using Content.Server.Wires;
 using Content.Shared.Body.Systems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Materials;
 using Content.Shared.Mind;
+using Content.Shared.Nutrition.EntitySystems;
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 01d0d5c791..4988608327 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -49,6 +49,12 @@ public sealed class HealthAnalyzerSystem : EntitySystem
             if (component.ScannedEntity is not {} patient)
                 continue;
 
+            if (Deleted(patient))
+            {
+                StopAnalyzingEntity((uid, component), patient);
+                continue;
+            }
+
             component.NextUpdate = _timing.CurTime + component.UpdateInterval;
 
             //Get distance between health analyzer and the scanned entity
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index 29e4ceebbe..9864badc62 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -33,6 +33,7 @@ public sealed class SuitSensorSystem : EntitySystem
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly StationSystem _stationSystem = default!;
     [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!;
+    [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
 
     public override void Initialize()
     {
@@ -344,6 +345,11 @@ public sealed class SuitSensorSystem : EntitySystem
         if (TryComp<DamageableComponent>(sensor.User.Value, out var damageable))
             totalDamage = damageable.TotalDamage.Int();
 
+        // Get mob total damage crit threshold
+        int? totalDamageThreshold = null;
+        if (_mobThresholdSystem.TryGetThresholdForState(sensor.User.Value, Shared.Mobs.MobState.Critical, out var critThreshold))
+            totalDamageThreshold = critThreshold.Value.Int();
+
         // finally, form suit sensor status
         var status = new SuitSensorStatus(GetNetEntity(uid), userName, userJob, userJobIcon, userJobDepartments);
         switch (sensor.Mode)
@@ -354,10 +360,12 @@ public sealed class SuitSensorSystem : EntitySystem
             case SuitSensorMode.SensorVitals:
                 status.IsAlive = isAlive;
                 status.TotalDamage = totalDamage;
+                status.TotalDamageThreshold = totalDamageThreshold;
                 break;
             case SuitSensorMode.SensorCords:
                 status.IsAlive = isAlive;
                 status.TotalDamage = totalDamage;
+                status.TotalDamageThreshold = totalDamageThreshold;
                 EntityCoordinates coordinates;
                 var xformQuery = GetEntityQuery<TransformComponent>();
 
@@ -402,6 +410,8 @@ public sealed class SuitSensorSystem : EntitySystem
 
         if (status.TotalDamage != null)
             payload.Add(SuitSensorConstants.NET_TOTAL_DAMAGE, status.TotalDamage);
+        if (status.TotalDamageThreshold != null)
+            payload.Add(SuitSensorConstants.NET_TOTAL_DAMAGE_THRESHOLD, status.TotalDamageThreshold);
         if (status.Coordinates != null)
             payload.Add(SuitSensorConstants.NET_COORDINATES, status.Coordinates);
 
@@ -429,12 +439,14 @@ public sealed class SuitSensorSystem : EntitySystem
 
         // try get total damage and cords (optionals)
         payload.TryGetValue(SuitSensorConstants.NET_TOTAL_DAMAGE, out int? totalDamage);
+        payload.TryGetValue(SuitSensorConstants.NET_TOTAL_DAMAGE_THRESHOLD, out int? totalDamageThreshold);
         payload.TryGetValue(SuitSensorConstants.NET_COORDINATES, out NetCoordinates? coords);
 
         var status = new SuitSensorStatus(suitSensorUid, name, job, jobIcon, jobDepartments)
         {
             IsAlive = isAlive.Value,
             TotalDamage = totalDamage,
+            TotalDamageThreshold = totalDamageThreshold,
             Coordinates = coords,
         };
         return status;
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index 6793161105..e8fb54022e 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -14,6 +14,7 @@ using Content.Shared.Inventory;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.NPC.Systems;
 using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Tools.Systems;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Ranged.Components;
diff --git a/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs b/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs
index 19b811a287..c0603949be 100644
--- a/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs
+++ b/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs
@@ -106,7 +106,7 @@ namespace Content.Server.NodeContainer.EntitySystems
                 && ent.Comp.Nodes.TryGetValue(id2, out var n2)
                 && n2 is T2 t2
                 && ent.Comp.Nodes.TryGetValue(id3, out var n3)
-                && n2 is T3 t3)
+                && n3 is T3 t3)
             {
                 node1 = t1;
                 node2 = t2;
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index b54a24bd80..614807e6b4 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -24,6 +24,7 @@ using Content.Shared.Interaction.Events;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition;
 using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Throwing;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio;
@@ -417,6 +418,10 @@ public sealed class DrinkSystem : EntitySystem
             !_body.TryGetBodyOrganComponents<StomachComponent>(ev.User, out var stomachs, body))
             return;
 
+        // Make sure the solution exists
+        if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out var solution))
+            return;
+
         // no drinking from living drinks, have to kill them first.
         if (_mobState.IsAlive(entity))
             return;
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index d87b0bd0b0..49d7374041 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -23,6 +23,7 @@ using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Stacks;
 using Content.Shared.Storage;
 using Content.Shared.Verbs;
diff --git a/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs
deleted file mode 100644
index 8037b61572..0000000000
--- a/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Server.Chemistry.EntitySystems;
-using Content.Shared.Nutrition.EntitySystems;
-using Content.Shared.Nutrition.Components;
-
-namespace Content.Server.Nutrition.EntitySystems;
-
-/// <summary>
-/// Provides API for openable food and drinks, handles opening on use and preventing transfer when closed.
-/// </summary>
-public sealed class OpenableSystem : SharedOpenableSystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<OpenableComponent, SolutionTransferAttemptEvent>(OnTransferAttempt);
-    }
-
-    private void OnTransferAttempt(EntityUid uid, OpenableComponent comp, SolutionTransferAttemptEvent args)
-    {
-        if (!comp.Opened)
-        {
-            // message says its just for drinks, shouldn't matter since you typically dont have a food that is openable and can be poured out
-            args.Cancel(Loc.GetString("drink-component-try-use-drink-not-open", ("owner", uid)));
-        }
-    }
-}
diff --git a/Content.Server/Paint/PaintSystem.cs b/Content.Server/Paint/PaintSystem.cs
deleted file mode 100644
index 892f961d63..0000000000
--- a/Content.Server/Paint/PaintSystem.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-using Content.Shared.Popups;
-using Content.Shared.Paint;
-using Content.Shared.Sprite;
-using Content.Shared.DoAfter;
-using Content.Shared.Interaction;
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Robust.Shared.Audio.Systems;
-using Content.Shared.Humanoid;
-using Robust.Shared.Utility;
-using Content.Shared.Verbs;
-using Content.Shared.SubFloor;
-using Content.Server.Nutrition.Components;
-using Content.Shared.Inventory;
-using Content.Server.Nutrition.EntitySystems;
-
-namespace Content.Server.Paint;
-
-/// <summary>
-/// Colors target and consumes reagent on each color success.
-/// </summary>
-public sealed class PaintSystem : SharedPaintSystem
-{
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
-    [Dependency] private readonly InventorySystem _inventory = default!;
-    [Dependency] private readonly OpenableSystem _openable = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<PaintComponent, AfterInteractEvent>(OnInteract);
-        SubscribeLocalEvent<PaintComponent, PaintDoAfterEvent>(OnPaint);
-        SubscribeLocalEvent<PaintComponent, GetVerbsEvent<UtilityVerb>>(OnPaintVerb);
-    }
-
-    private void OnInteract(EntityUid uid, PaintComponent component, AfterInteractEvent args)
-    {
-        if (!args.CanReach)
-            return;
-
-        if (args.Target is not { Valid: true } target)
-            return;
-
-        PrepPaint(uid, component, target, args.User);
-    }
-
-    private void OnPaintVerb(EntityUid uid, PaintComponent component, GetVerbsEvent<UtilityVerb> args)
-    {
-        if (!args.CanInteract || !args.CanAccess)
-            return;
-
-        var paintText = Loc.GetString("paint-verb");
-
-        var verb = new UtilityVerb()
-        {
-            Act = () =>
-            {
-                PrepPaint(uid, component, args.Target, args.User);
-            },
-
-            Text = paintText,
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/paint.svg.192dpi.png"))
-        };
-        args.Verbs.Add(verb);
-    }
-    private void PrepPaint(EntityUid uid, PaintComponent component, EntityUid target, EntityUid user)
-    {
-
-        var doAfterEventArgs = new DoAfterArgs(EntityManager, user, component.Delay, new PaintDoAfterEvent(), uid, target: target, used: uid)
-        {
-            BreakOnMove = true,
-            NeedHand = true,
-            BreakOnHandChange = true
-        };
-
-        _doAfterSystem.TryStartDoAfter(doAfterEventArgs);
-    }
-
-    private void OnPaint(Entity<PaintComponent> entity, ref PaintDoAfterEvent args)
-    {
-        if (args.Target == null || args.Used == null)
-            return;
-
-        if (args.Handled || args.Cancelled)
-            return;
-
-        if (args.Target is not { Valid: true } target)
-            return;
-
-        if (!_openable.IsOpen(entity))
-        {
-            _popup.PopupEntity(Loc.GetString("paint-closed", ("used", args.Used)), args.User, args.User, PopupType.Medium);
-            return;
-        }
-
-        if (HasComp<PaintedComponent>(target) || HasComp<RandomSpriteComponent>(target))
-        {
-            _popup.PopupEntity(Loc.GetString("paint-failure-painted", ("target", args.Target)), args.User, args.User, PopupType.Medium);
-            return;
-        }
-
-        if (!entity.Comp.Blacklist?.IsValid(target, EntityManager) != true || HasComp<HumanoidAppearanceComponent>(target) || HasComp<SubFloorHideComponent>(target))
-        {
-            _popup.PopupEntity(Loc.GetString("paint-failure", ("target", args.Target)), args.User, args.User, PopupType.Medium);
-            return;
-        }
-
-        if (TryPaint(entity, target))
-        {
-            EnsureComp<PaintedComponent>(target, out PaintedComponent? paint);
-            EnsureComp<AppearanceComponent>(target);
-
-            paint.Color = entity.Comp.Color; // set the target color to the color specified in the spray paint yml.
-            _audio.PlayPvs(entity.Comp.Spray, entity);
-            paint.Enabled = true;
-
-            if (HasComp<InventoryComponent>(target)) // Paint any clothing the target is wearing.
-            {
-                if (_inventory.TryGetSlots(target, out var slotDefinitions))
-                {
-                    foreach (var slot in slotDefinitions)
-                    {
-                        if (!_inventory.TryGetSlotEntity(target, slot.Name, out var slotEnt))
-                            continue;
-
-                        if (HasComp<PaintedComponent>(slotEnt.Value) || !entity.Comp.Blacklist?.IsValid(slotEnt.Value,
-                                                                         EntityManager) != true
-                                                                     || HasComp<RandomSpriteComponent>(slotEnt.Value) ||
-                                                                     HasComp<HumanoidAppearanceComponent>(
-                                                                         slotEnt.Value))
-                        {
-                            continue;
-                        }
-
-                        EnsureComp<PaintedComponent>(slotEnt.Value, out PaintedComponent? slotpaint);
-                        EnsureComp<AppearanceComponent>(slotEnt.Value);
-                        slotpaint.Color = entity.Comp.Color;
-                        _appearanceSystem.SetData(slotEnt.Value, PaintVisuals.Painted, true);
-                        Dirty(slotEnt.Value, slotpaint);
-                    }
-                }
-            }
-
-            _popup.PopupEntity(Loc.GetString("paint-success", ("target", args.Target)), args.User, args.User, PopupType.Medium);
-            _appearanceSystem.SetData(target, PaintVisuals.Painted, true);
-            Dirty(target, paint);
-            args.Handled = true;
-            return;
-        }
-
-        if (!TryPaint(entity, target))
-        {
-            _popup.PopupEntity(Loc.GetString("paint-empty", ("used", args.Used)), args.User, args.User, PopupType.Medium);
-            return;
-        }
-    }
-
-    private bool TryPaint(Entity<PaintComponent> reagent, EntityUid target)
-    {
-        if (HasComp<HumanoidAppearanceComponent>(target) || HasComp<SubFloorHideComponent>(target))
-            return false;
-
-        if (_solutionContainer.TryGetSolution(reagent.Owner, reagent.Comp.Solution, out _, out var solution))
-        {
-            var quantity = solution.RemoveReagent(reagent.Comp.Reagent, reagent.Comp.ConsumptionUnit);
-            if (quantity > 0)// checks quantity of solution is more than 0.
-                return true;
-
-            if (quantity < 1)
-                return false;
-        }
-        return false;
-    }
-}
diff --git a/Content.Server/Paper/PaperRandomStoryComponent.cs b/Content.Server/Paper/PaperRandomStoryComponent.cs
new file mode 100644
index 0000000000..7c5744f087
--- /dev/null
+++ b/Content.Server/Paper/PaperRandomStoryComponent.cs
@@ -0,0 +1,14 @@
+namespace Content.Server.Paper;
+
+/// <summary>
+///    Adds randomly generated stories to Paper component
+/// </summary>
+[RegisterComponent, Access(typeof(PaperRandomStorySystem))]
+public sealed partial class PaperRandomStoryComponent : Component
+{
+    [DataField]
+    public List<string>? StorySegments;
+
+    [DataField]
+    public string StorySeparator = " ";
+}
diff --git a/Content.Server/Paper/PaperRandomStorySystem.cs b/Content.Server/Paper/PaperRandomStorySystem.cs
new file mode 100644
index 0000000000..e7712009c2
--- /dev/null
+++ b/Content.Server/Paper/PaperRandomStorySystem.cs
@@ -0,0 +1,29 @@
+using Content.Server.RandomMetadata;
+
+namespace Content.Server.Paper;
+
+public sealed class PaperRandomStorySystem : EntitySystem
+{
+
+    [Dependency] private readonly RandomMetadataSystem _randomMeta = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PaperRandomStoryComponent, MapInitEvent>(OnMapinit);
+    }
+
+    private void OnMapinit(Entity<PaperRandomStoryComponent> paperStory, ref MapInitEvent ev)
+    {
+        if (!TryComp<PaperComponent>(paperStory, out var paper))
+            return;
+
+        if (paperStory.Comp.StorySegments == null)
+            return;
+
+        var story = _randomMeta.GetRandomFromSegments(paperStory.Comp.StorySegments, paperStory.Comp.StorySeparator);
+
+        paper.Content += $"\n{story}";
+    }
+}
diff --git a/Content.Server/Popups/PopupSystem.cs b/Content.Server/Popups/PopupSystem.cs
index c5eb3819b5..237ca33a4d 100644
--- a/Content.Server/Popups/PopupSystem.cs
+++ b/Content.Server/Popups/PopupSystem.cs
@@ -88,7 +88,7 @@ namespace Content.Server.Popups
                 RaiseNetworkEvent(new PopupEntityEvent(message, type, GetNetEntity(uid)), actor.PlayerSession);
         }
 
-        public override void PopupClient(string? message, EntityUid uid, EntityUid recipient, PopupType type = PopupType.Small)
+        public override void PopupClient(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
         {
             // do nothing duh its for client only
         }
diff --git a/Content.Server/Radio/EntitySystems/JammerSystem.cs b/Content.Server/Radio/EntitySystems/JammerSystem.cs
index 1258cc10fa..5a2a854017 100644
--- a/Content.Server/Radio/EntitySystems/JammerSystem.cs
+++ b/Content.Server/Radio/EntitySystems/JammerSystem.cs
@@ -54,14 +54,10 @@ public sealed class JammerSystem : EntitySystem
         if (activated)
         {
             EnsureComp<ActiveRadioJammerComponent>(uid);
-            var stationId = _stationSystem.GetOwningStation(uid);
-            if (stationId != null && _singletonServerSystem.TryGetActiveServerAddress<CrewMonitoringServerComponent>(stationId.Value, out var netId))
-            {
-                EnsureComp<DeviceNetworkJammerComponent>(uid, out var jammingComp);
-                jammingComp.Range = comp.Range;
-                jammingComp.JammableNetworks.Add(netId);
-                Dirty(uid, jammingComp);
-            }
+            EnsureComp<DeviceNetworkJammerComponent>(uid, out var jammingComp);
+            jammingComp.Range = comp.Range;
+            jammingComp.JammableNetworks.Add(DeviceNetworkComponent.DeviceNetIdDefaults.Wireless.ToString());
+            Dirty(uid, jammingComp);
         }
         else
         {
diff --git a/Content.Server/RandomMetadata/RandomMetadataSystem.cs b/Content.Server/RandomMetadata/RandomMetadataSystem.cs
index ebec4d5249..c088d57fd9 100644
--- a/Content.Server/RandomMetadata/RandomMetadataSystem.cs
+++ b/Content.Server/RandomMetadata/RandomMetadataSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Dataset;
+using Content.Shared.Dataset;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -48,8 +48,8 @@ public sealed class RandomMetadataSystem : EntitySystem
         foreach (var segment in segments)
         {
             outputSegments.Add(_prototype.TryIndex<DatasetPrototype>(segment, out var proto)
-                ? _random.Pick(proto.Values)
-                : segment);
+                ? Loc.GetString(_random.Pick(proto.Values))
+                : Loc.GetString(segment));
         }
         return string.Join(separator, outputSegments);
     }
diff --git a/Content.Server/Resist/EscapeInventorySystem.cs b/Content.Server/Resist/EscapeInventorySystem.cs
index 13e69adb64..4ec0f2cebe 100644
--- a/Content.Server/Resist/EscapeInventorySystem.cs
+++ b/Content.Server/Resist/EscapeInventorySystem.cs
@@ -1,6 +1,6 @@
 using Content.Server._White.Carrying;
 using Content.Server.Popups;
-using Content.Server.Storage.Components;
+using Content.Shared.Storage.Components;
 using Content.Shared.Storage;
 using Content.Shared.Inventory;
 using Content.Shared.Hands.EntitySystems;
diff --git a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
index f7f3718208..61636bea7c 100644
--- a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
+++ b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
@@ -1,10 +1,16 @@
+using Content.Shared.Shuttles.Components;
 using Content.Shared.Procedural;
 using Content.Shared.Salvage.Expeditions;
+using Content.Shared.Dataset;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Salvage;
 
 public sealed partial class SalvageSystem
 {
+    [ValidatePrototypeId<EntityPrototype>]
+    public const string CoordinatesDisk = "CoordinatesDisk";
+
     private void OnSalvageClaimMessage(EntityUid uid, SalvageExpeditionConsoleComponent component, ClaimSalvageMessage args)
     {
         var station = _station.GetOwningStation(uid);
@@ -15,11 +21,16 @@ public sealed partial class SalvageSystem
         if (!data.Missions.TryGetValue(args.Index, out var missionparams))
             return;
 
-        SpawnMission(missionparams, station.Value);
+        var cdUid = Spawn(CoordinatesDisk, Transform(uid).Coordinates);
+        SpawnMission(missionparams, station.Value, cdUid);
 
         data.ActiveMission = args.Index;
         var mission = GetMission(_prototypeManager.Index<SalvageDifficultyPrototype>(missionparams.Difficulty), missionparams.Seed);
         data.NextOffer = _timing.CurTime + mission.Duration + TimeSpan.FromSeconds(1);
+
+        _labelSystem.Label(cdUid, GetFTLName(_prototypeManager.Index<DatasetPrototype>("names_borer"), missionparams.Seed));
+        _audio.PlayPvs(component.PrintSound, uid);
+
         UpdateConsoles((station.Value, data));
     }
 
diff --git a/Content.Server/Salvage/SalvageSystem.Expeditions.cs b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
index 7e4a9c9310..839730ec87 100644
--- a/Content.Server/Salvage/SalvageSystem.Expeditions.cs
+++ b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
@@ -8,6 +8,7 @@ using Content.Shared.Salvage.Expeditions;
 using Robust.Shared.CPUJob.JobQueues;
 using Robust.Shared.CPUJob.JobQueues.Queues;
 using Robust.Shared.GameStates;
+using Robust.Shared.Map;
 
 namespace Content.Server.Salvage;
 
@@ -148,7 +149,7 @@ public sealed partial class SalvageSystem
         return new SalvageExpeditionConsoleState(component.NextOffer, component.Claimed, component.Cooldown, component.ActiveMission, missions);
     }
 
-    private void SpawnMission(SalvageMissionParams missionParams, EntityUid station)
+    private void SpawnMission(SalvageMissionParams missionParams, EntityUid station, EntityUid? coordinatesDisk)
     {
         var cancelToken = new CancellationTokenSource();
         var job = new SpawnSalvageMissionJob(
@@ -162,7 +163,9 @@ public sealed partial class SalvageSystem
             _biome,
             _dungeon,
             _metaData,
+            _transform,
             station,
+            coordinatesDisk,
             missionParams,
             cancelToken.Token);
 
diff --git a/Content.Server/Salvage/SalvageSystem.cs b/Content.Server/Salvage/SalvageSystem.cs
index a1a3b686b2..9af4736345 100644
--- a/Content.Server/Salvage/SalvageSystem.cs
+++ b/Content.Server/Salvage/SalvageSystem.cs
@@ -32,6 +32,7 @@ using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Timing;
+using Content.Server.Labels;
 
 namespace Content.Server.Salvage
 {
@@ -39,6 +40,7 @@ namespace Content.Server.Salvage
     {
         [Dependency] private readonly IChatManager _chat = default!;
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+        [Dependency] private readonly IEntityManager _entManager = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
@@ -48,6 +50,7 @@ namespace Content.Server.Salvage
         [Dependency] private readonly BiomeSystem _biome = default!;
         [Dependency] private readonly DungeonSystem _dungeon = default!;
         [Dependency] private readonly GravitySystem _gravity = default!;
+        [Dependency] private readonly LabelSystem _labelSystem = default!;
         [Dependency] private readonly MapLoaderSystem _map = default!;
         [Dependency] private readonly MetaDataSystem _metaData = default!;
         [Dependency] private readonly RadioSystem _radioSystem = default!;
diff --git a/Content.Server/Salvage/SpawnSalvageMissionJob.cs b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
index e2b17b5872..180c8d145c 100644
--- a/Content.Server/Salvage/SpawnSalvageMissionJob.cs
+++ b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
@@ -33,6 +33,9 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Content.Server.Shuttles.Components;
+using Content.Shared.Coordinates;
+using Content.Shared.Shuttles.Components;
 
 namespace Content.Server.Salvage;
 
@@ -46,8 +49,10 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
     private readonly BiomeSystem _biome;
     private readonly DungeonSystem _dungeon;
     private readonly MetaDataSystem _metaData;
+    private readonly SharedTransformSystem _xforms;
 
     public readonly EntityUid Station;
+    public readonly EntityUid? CoordinatesDisk;
     private readonly SalvageMissionParams _missionParams;
 
     private readonly ISawmill _sawmill;
@@ -63,7 +68,9 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
         BiomeSystem biome,
         DungeonSystem dungeon,
         MetaDataSystem metaData,
+        SharedTransformSystem xform,
         EntityUid station,
+        EntityUid? coordinatesDisk,
         SalvageMissionParams missionParams,
         CancellationToken cancellation = default) : base(maxTime, cancellation)
     {
@@ -75,7 +82,9 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
         _biome = biome;
         _dungeon = dungeon;
         _metaData = metaData;
+        _xforms = xform;
         Station = station;
+        CoordinatesDisk = coordinatesDisk;
         _missionParams = missionParams;
         _sawmill = logManager.GetSawmill("salvage_job");
 #if !DEBUG
@@ -94,6 +103,18 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
         var random = new Random(_missionParams.Seed);
         var destComp = _entManager.AddComponent<FTLDestinationComponent>(mapUid);
         destComp.BeaconsOnly = true;
+        destComp.RequireCoordinateDisk = true;
+        destComp.Enabled = true;
+        _metaData.SetEntityName(mapUid, SharedSalvageSystem.GetFTLName(_prototypeManager.Index<DatasetPrototype>("names_borer"), _missionParams.Seed));
+        _entManager.AddComponent<FTLBeaconComponent>(mapUid);
+
+        // Saving the mission mapUid to a CD is made optional, in case one is somehow made in a process without a CD entity
+        if (CoordinatesDisk.HasValue)
+        {
+            var cd = _entManager.EnsureComponent<ShuttleDestinationCoordinatesComponent>(CoordinatesDisk.Value);
+            cd.Destination = mapUid;
+            _entManager.Dirty(CoordinatesDisk.Value, cd);
+        }
 
         // Setup mission configs
         // As we go through the config the rating will deplete so we'll go for most important to least important.
@@ -144,11 +165,6 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
         expedition.EndTime = _timing.CurTime + mission.Duration;
         expedition.MissionParams = _missionParams;
 
-        // Don't want consoles to have the incorrect name until refreshed.
-        var ftlUid = _entManager.CreateEntityUninitialized("FTLPoint", new EntityCoordinates(mapUid, grid.TileSizeHalfVector));
-        _metaData.SetEntityName(ftlUid, SharedSalvageSystem.GetFTLName(_prototypeManager.Index<DatasetPrototype>("names_borer"), _missionParams.Seed));
-        _entManager.InitializeAndStartEntity(ftlUid);
-
         var landingPadRadius = 24;
         var minDungeonOffset = landingPadRadius + 4;
 
diff --git a/Content.Server/Sandbox/SandboxSystem.cs b/Content.Server/Sandbox/SandboxSystem.cs
index d009cad17a..1d9a462293 100644
--- a/Content.Server/Sandbox/SandboxSystem.cs
+++ b/Content.Server/Sandbox/SandboxSystem.cs
@@ -16,6 +16,7 @@ using Robust.Server.Placement;
 using Robust.Server.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Sandbox
 {
@@ -154,7 +155,7 @@ namespace Content.Server.Sandbox
 
             var allAccess = PrototypeManager
                 .EnumeratePrototypes<AccessLevelPrototype>()
-                .Select(p => p.ID).ToArray();
+                .Select(p => new ProtoId<AccessLevelPrototype>(p.ID)).ToList();
 
             if (_inventory.TryGetSlotEntity(attached, "id", out var slotEntity))
             {
diff --git a/Content.Server/Screens/Systems/ScreenSystem.cs b/Content.Server/Screens/Systems/ScreenSystem.cs
index 19790f64d5..782fe38c88 100644
--- a/Content.Server/Screens/Systems/ScreenSystem.cs
+++ b/Content.Server/Screens/Systems/ScreenSystem.cs
@@ -56,6 +56,7 @@ public sealed class ScreenSystem : EntitySystem
             )
         {
             _appearanceSystem.SetData(uid, TextScreenVisuals.DefaultText, text);
+            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, text);
         }
     }
 
diff --git a/Content.Server/Shuttles/Components/EscapePodComponent.cs b/Content.Server/Shuttles/Components/EscapePodComponent.cs
index 72c8024e12..d717e97441 100644
--- a/Content.Server/Shuttles/Components/EscapePodComponent.cs
+++ b/Content.Server/Shuttles/Components/EscapePodComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Server.Shuttles.Components;
 [RegisterComponent, Access(typeof(EmergencyShuttleSystem)), AutoGenerateComponentPause]
 public sealed partial class EscapePodComponent : Component
 {
-    [DataField("launchTime", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [DataField(customTypeSerializer:typeof(TimeOffsetSerializer))]
     [AutoPausedField]
     public TimeSpan? LaunchTime;
 }
diff --git a/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs b/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs
index 91cecde044..03e262cef5 100644
--- a/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs
+++ b/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs
@@ -14,5 +14,11 @@ namespace Content.Server.Shuttles.Components
         /// </summary>
         [DataField("zoom")]
         public Vector2 Zoom = new(1.5f, 1.5f);
+
+        /// <summary>
+        /// Should this console have access to restricted FTL destinations?
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite), DataField("whitelistSpecific")]
+        public List<EntityUid> FTLWhitelist = new List<EntityUid>();
     }
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
index 7606d190a4..c214bb015c 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
@@ -44,6 +44,10 @@ public sealed partial class ShuttleConsoleSystem
         }
 
         var nCoordinates = new NetCoordinates(GetNetEntity(targetXform.ParentUid), targetXform.LocalPosition);
+        if (targetXform.ParentUid == EntityUid.Invalid)
+        {
+            nCoordinates = new NetCoordinates(GetNetEntity(beaconEnt), targetXform.LocalPosition);
+        }
 
         // Check target exists
         if (!_shuttle.CanFTLBeacon(nCoordinates))
@@ -128,7 +132,7 @@ public sealed partial class ShuttleConsoleSystem
         }
 
         // Check shuttle can FTL to this target.
-        if (!_shuttle.CanFTLTo(shuttleUid.Value, targetMap))
+        if (!_shuttle.CanFTLTo(shuttleUid.Value, targetMap, ent))
         {
             return;
         }
diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
index 74c42ccbc5..be55cd9a62 100644
--- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs
+++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
@@ -264,6 +264,11 @@ public sealed class ThrusterSystem : EntitySystem
             return;
         }
 
+        if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower))
+        {
+            apcPower.NeedsPower = true;
+        }
+
         component.IsOn = true;
 
         if (!EntityManager.TryGetComponent(xform.GridUid, out ShuttleComponent? shuttleComponent))
@@ -366,6 +371,11 @@ public sealed class ThrusterSystem : EntitySystem
         if (!EntityManager.TryGetComponent(gridId, out ShuttleComponent? shuttleComponent))
             return;
 
+        if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower))
+        {
+            apcPower.NeedsPower = false;
+        }
+
         // Logger.DebugS("thruster", $"Disabled thruster {uid}");
 
         switch (component.Type)
diff --git a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
index abbfd37c6a..b60afbc88b 100644
--- a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
@@ -1,40 +1,54 @@
 using System.Threading;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
-namespace Content.Server.Spawners.Components
+namespace Content.Server.Spawners.Components;
+
+/// <summary>
+/// Spawns entities at a set interval.
+/// Can configure the set of entities, spawn timing, spawn chance,
+/// and min/max number of entities to spawn.
+/// </summary>
+[RegisterComponent]
+public sealed partial class TimedSpawnerComponent : Component, ISerializationHooks
 {
-    [RegisterComponent]
-    public sealed partial class TimedSpawnerComponent : Component, ISerializationHooks
+    /// <summary>
+    /// List of entities that can be spawned by this component. One will be randomly
+    /// chosen for each entity spawned. When multiple entities are spawned at once,
+    /// each will be randomly chosen separately.
+    /// </summary>
+    [DataField]
+    public List<EntProtoId> Prototypes = [];
+
+    /// <summary>
+    /// Chance of an entity being spawned at the end of each interval.
+    /// </summary>
+    [DataField]
+    public float Chance = 1.0f;
+
+    /// <summary>
+    /// Length of the interval between spawn attempts.
+    /// </summary>
+    [DataField]
+    public int IntervalSeconds = 60;
+
+    /// <summary>
+    /// The minimum number of entities that can be spawned when an interval elapses.
+    /// </summary>
+    [DataField]
+    public int MinimumEntitiesSpawned = 1;
+
+    /// <summary>
+    /// The maximum number of entities that can be spawned when an interval elapses.
+    /// </summary>
+    [DataField]
+    public int MaximumEntitiesSpawned = 1;
+
+    public CancellationTokenSource? TokenSource;
+
+    void ISerializationHooks.AfterDeserialization()
     {
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("prototypes", customTypeSerializer:typeof(PrototypeIdListSerializer<EntityPrototype>))]
-        public List<string> Prototypes { get; set; } = new();
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("chance")]
-        public float Chance { get; set; } = 1.0f;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("intervalSeconds")]
-        public int IntervalSeconds { get; set; } = 60;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("MinimumEntitiesSpawned")]
-        public int MinimumEntitiesSpawned { get; set; } = 1;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("MaximumEntitiesSpawned")]
-        public int MaximumEntitiesSpawned { get; set; } = 1;
-
-        public CancellationTokenSource? TokenSource;
-
-        void ISerializationHooks.AfterDeserialization()
-        {
-            if (MinimumEntitiesSpawned > MaximumEntitiesSpawned)
-                throw new ArgumentException("MaximumEntitiesSpawned can't be lower than MinimumEntitiesSpawned!");
-        }
+        if (MinimumEntitiesSpawned > MaximumEntitiesSpawned)
+            throw new ArgumentException("MaximumEntitiesSpawned can't be lower than MinimumEntitiesSpawned!");
     }
 }
diff --git a/Content.Server/Speech/Components/SouthernAccentComponent.cs b/Content.Server/Speech/Components/SouthernAccentComponent.cs
new file mode 100644
index 0000000000..0c44290086
--- /dev/null
+++ b/Content.Server/Speech/Components/SouthernAccentComponent.cs
@@ -0,0 +1,8 @@
+using Content.Server.Speech.EntitySystems;
+
+namespace Content.Server.Speech.Components;
+
+[RegisterComponent]
+[Access(typeof(SouthernAccentSystem))]
+public sealed partial class SouthernAccentComponent : Component
+{ }
diff --git a/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs b/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
new file mode 100644
index 0000000000..4d401367cc
--- /dev/null
+++ b/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
@@ -0,0 +1,28 @@
+using System.Text.RegularExpressions;
+using Content.Server.Speech.Components;
+
+namespace Content.Server.Speech.EntitySystems;
+
+public sealed class SouthernAccentSystem : EntitySystem
+{
+    [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
+    
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<SouthernAccentComponent, AccentGetEvent>(OnAccent);
+    }
+
+    private void OnAccent(EntityUid uid, SouthernAccentComponent component, AccentGetEvent args)
+    {
+        var message = args.Message;
+
+        message = _replacement.ApplyReplacements(message, "southern");
+
+        //They shoulda started runnin' an' hidin' from me!
+        message = Regex.Replace(message, @"ing\b", "in'");
+        message = Regex.Replace(message, @"\band\b", "an'");
+        message = Regex.Replace(message, "d've", "da");
+        args.Message = message;
+    }
+};
diff --git a/Content.Server/StationEvents/Events/IonStormRule.cs b/Content.Server/StationEvents/Events/IonStormRule.cs
index e73c9a1813..cd3cd63ae8 100644
--- a/Content.Server/StationEvents/Events/IonStormRule.cs
+++ b/Content.Server/StationEvents/Events/IonStormRule.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Silicons.Laws;
 using Content.Server.Station.Components;
@@ -143,6 +144,24 @@ public sealed class IonStormRule : StationEventSystem<IonStormRuleComponent>
                 });
             }
 
+            // sets all unobfuscated laws' indentifier in order from highest to lowest priority
+            // This could technically override the Obfuscation from the code above, but it seems unlikely enough to basically never happen
+            int orderDeduction = -1;
+
+            for (int i = 0; i < laws.Laws.Count; i++)
+            {
+                string notNullIdentifier = laws.Laws[i].LawIdentifierOverride ?? (i - orderDeduction).ToString();
+
+                if (notNullIdentifier.Any(char.IsSymbol))
+                {
+                    orderDeduction += 1;
+                }
+                else
+                {
+                    laws.Laws[i].LawIdentifierOverride = (i - orderDeduction).ToString();
+                }
+            }
+
             _adminLogger.Add(LogType.Mind, LogImpact.High, $"{ToPrettyString(ent):silicon} had its laws changed by an ion storm to {laws.LoggingString()}");
 
             // laws unique to this silicon, dont use station laws anymore
diff --git a/Content.Server/Storage/Components/SecretStashComponent.cs b/Content.Server/Storage/Components/SecretStashComponent.cs
deleted file mode 100644
index a63cb074ad..0000000000
--- a/Content.Server/Storage/Components/SecretStashComponent.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Server.Storage.EntitySystems;
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Item;
-using Content.Shared.Toilet;
-using Robust.Shared.Containers;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Storage.Components
-{
-    /// <summary>
-    ///     Logic for a secret slot stash, like plant pot or toilet cistern.
-    ///     Unlike <see cref="ItemSlotsComponent"/> it doesn't have interaction logic or verbs.
-    ///     Other classes like <see cref="ToiletComponent"/> should implement it.
-    /// </summary>
-    [RegisterComponent]
-    [Access(typeof(SecretStashSystem))]
-    public sealed partial class SecretStashComponent : Component
-    {
-        /// <summary>
-        ///     Max item size that can be fitted into secret stash.
-        /// </summary>
-        [DataField("maxItemSize")]
-        public ProtoId<ItemSizePrototype> MaxItemSize = "Small";
-
-        /// <summary>
-        ///     IC secret stash name. For example "the toilet cistern".
-        ///     If empty string, will replace it with entity name in init.
-        /// </summary>
-        [DataField("secretPartName", readOnly: true)]
-        public string SecretPartName { get; set; } = "";
-
-        /// <summary>
-        ///     Container used to keep secret stash item.
-        /// </summary>
-        [ViewVariables]
-        public ContainerSlot ItemContainer = default!;
-
-    }
-}
diff --git a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
index 356768769b..838311c1aa 100644
--- a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
+++ b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
@@ -3,6 +3,7 @@ using Content.Server.Explosion.EntitySystems;
 using Content.Server.Resist;
 using Content.Server.Station.Components;
 using Content.Server.Storage.Components;
+using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Coordinates;
 using Content.Shared.DoAfter;
@@ -14,6 +15,7 @@ using Content.Shared.Tools.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Storage.EntitySystems;
 
@@ -138,7 +140,7 @@ public sealed class BluespaceLockerSystem : EntitySystem
     }
 
     /// <returns>True if any HashSet in <paramref name="a"/> would grant access to <paramref name="b"/></returns>
-    private bool AccessMatch(IReadOnlyCollection<HashSet<string>>? a, IReadOnlyCollection<HashSet<string>>? b)
+    private bool AccessMatch(IReadOnlyCollection<HashSet<ProtoId<AccessLevelPrototype>>>? a, IReadOnlyCollection<HashSet<ProtoId<AccessLevelPrototype>>>? b)
     {
         if ((a == null || a.Count == 0) && (b == null || b.Count == 0))
             return true;
diff --git a/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs b/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
index 0b4b13d6e4..c49bfdec93 100644
--- a/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
+++ b/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
@@ -80,6 +80,11 @@ namespace Content.Server.Storage.EntitySystems
                 _adminLogger.Add(LogType.EntitySpawn, LogImpact.Low, $"{ToPrettyString(args.User)} used {ToPrettyString(uid)} which spawned {ToPrettyString(entityToPlaceInHands.Value)}");
             }
 
+            if (component.Sound != null)
+            {
+                _audio.PlayPvs(component.Sound, uid);
+            }
+
             component.Uses--;
 
             // Delete entity only if component was successfully used
@@ -92,7 +97,6 @@ namespace Content.Server.Storage.EntitySystems
             if (entityToPlaceInHands != null)
             {
                 _hands.PickupOrDrop(args.User, entityToPlaceInHands.Value);
-                _audio.PlayPvs(component.Sound, entityToPlaceInHands.Value);
             }
         }
     }
diff --git a/Content.Server/Store/Components/StoreComponent.cs b/Content.Server/Store/Components/StoreComponent.cs
index c391c3d82d..db27482f82 100644
--- a/Content.Server/Store/Components/StoreComponent.cs
+++ b/Content.Server/Store/Components/StoreComponent.cs
@@ -78,6 +78,13 @@ public sealed partial class StoreComponent : Component
     [ViewVariables, DataField]
     public bool RefundAllowed;
 
+    /// <summary>
+    ///     Checks if store can be opened by the account owner only.
+    ///     Not meant to be used with uplinks.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public bool OwnerOnly;
+
     /// <summary>
     ///     The map the store was originally from, used to block refunds if the map is changed
     /// </summary>
diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs
index d9e19393c0..4364307f14 100644
--- a/Content.Server/Store/Systems/StoreSystem.Ui.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs
@@ -15,6 +15,7 @@ using Content.Shared.UserInterface;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Store.Systems;
 
@@ -29,6 +30,7 @@ public sealed partial class StoreSystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
     private void InitializeUi()
     {
@@ -264,7 +266,7 @@ public sealed partial class StoreSystem
 
         //log dat shit.
         _admin.Add(LogType.StorePurchase, LogImpact.Low,
-            $"{ToPrettyString(buyer):player} purchased listing \"{Loc.GetString(listing.Name)}\" from {ToPrettyString(uid)}");
+            $"{ToPrettyString(buyer):player} purchased listing \"{ListingLocalisationHelpers.GetLocalisedNameOrEntityName(listing, _prototypeManager)}\" from {ToPrettyString(uid)}");
 
         listing.PurchaseAmount++; //track how many times something has been purchased
         _audio.PlayEntity(component.BuySuccessSound, msg.Session, uid); //cha-ching!
diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs
index b682421045..12d6f6d229 100644
--- a/Content.Server/Store/Systems/StoreSystem.cs
+++ b/Content.Server/Store/Systems/StoreSystem.cs
@@ -10,6 +10,7 @@ using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 using System.Linq;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Store.Systems;
 
@@ -26,6 +27,7 @@ public sealed partial class StoreSystem : EntitySystem
     {
         base.Initialize();
 
+        SubscribeLocalEvent<StoreComponent, ActivatableUIOpenAttemptEvent>(OnStoreOpenAttempt);
         SubscribeLocalEvent<CurrencyComponent, AfterInteractEvent>(OnAfterInteract);
         SubscribeLocalEvent<StoreComponent, BeforeActivatableUIOpenEvent>(BeforeActivatableUiOpen);
 
@@ -65,6 +67,21 @@ public sealed partial class StoreSystem : EntitySystem
         RaiseLocalEvent(uid, ref ev, true);
     }
 
+    private void OnStoreOpenAttempt(EntityUid uid, StoreComponent component, ActivatableUIOpenAttemptEvent args)
+    {
+        if (!component.OwnerOnly)
+            return;
+
+        component.AccountOwner ??= args.User;
+        DebugTools.Assert(component.AccountOwner != null);
+
+        if (component.AccountOwner == args.User)
+            return;
+
+        _popup.PopupEntity(Loc.GetString("store-not-account-owner", ("store", uid)), uid, args.User);
+        args.Cancel();
+    }
+
     private void OnAfterInteract(EntityUid uid, CurrencyComponent component, AfterInteractEvent args)
     {
         if (args.Handled || !args.CanReach)
diff --git a/Content.Server/Toilet/ToiletSystem.cs b/Content.Server/Toilet/ToiletSystem.cs
index 8bf8457e07..e184ddf0d5 100644
--- a/Content.Server/Toilet/ToiletSystem.cs
+++ b/Content.Server/Toilet/ToiletSystem.cs
@@ -1,197 +1,8 @@
-using Content.Server.Body.Systems;
-using Content.Shared.Buckle;
-using Content.Server.Popups;
-using Content.Server.Storage.Components;
-using Content.Server.Storage.EntitySystems;
-using Content.Shared.Audio;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
-using Content.Shared.Buckle.Components;
-using Content.Shared.Examine;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Popups;
-using Content.Shared.Toilet;
-using Content.Shared.Tools;
-using Content.Shared.Tools.Components;
-using Content.Shared.Verbs;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
-using Robust.Shared.Random;
-using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
+using Content.Shared.Toilet.Systems;
 
-namespace Content.Server.Toilet
+namespace Content.Server.Toilet;
+
+public sealed class ToiletSystem : SharedToiletSystem
 {
-    public sealed class ToiletSystem : EntitySystem
-    {
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-        [Dependency] private readonly BodySystem _body = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
-        [Dependency] private readonly SecretStashSystem _secretStash = default!;
-        [Dependency] private readonly PopupSystem _popup = default!;
-        [Dependency] private readonly SharedToolSystem _tool = default!;
 
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<ToiletComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<ToiletComponent, MapInitEvent>(OnMapInit);
-            SubscribeLocalEvent<ToiletComponent, InteractUsingEvent>(OnInteractUsing);
-            SubscribeLocalEvent<ToiletComponent, InteractHandEvent>(OnInteractHand);
-            SubscribeLocalEvent<ToiletComponent, ExaminedEvent>(OnExamine);
-            SubscribeLocalEvent<ToiletComponent, SuicideEvent>(OnSuicide);
-            SubscribeLocalEvent<ToiletComponent, ToiletPryDoAfterEvent>(OnToiletPried);
-            SubscribeLocalEvent<ToiletComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleSeatVerb);
-        }
-
-        private void OnSuicide(EntityUid uid, ToiletComponent component, SuicideEvent args)
-        {
-            if (args.Handled)
-                return;
-
-            // Check that victim has a head
-            // FIXME: since suiciding turns you into a ghost immediately, both messages are seen, not sure how this can be fixed
-            if (TryComp<BodyComponent>(args.Victim, out var body) &&
-                _body.BodyHasPartType(args.Victim, BodyPartType.Head, body))
-            {
-                var othersMessage = Loc.GetString("toilet-component-suicide-head-message-others",
-                    ("victim", Identity.Entity(args.Victim, EntityManager)), ("owner", uid));
-                _popup.PopupEntity(othersMessage, uid, Filter.PvsExcept(args.Victim), true, PopupType.MediumCaution);
-
-                var selfMessage = Loc.GetString("toilet-component-suicide-head-message",
-                    ("owner", uid));
-                _popup.PopupEntity(selfMessage, uid, args.Victim, PopupType.LargeCaution);
-
-                args.SetHandled(SuicideKind.Asphyxiation);
-            }
-            else
-            {
-                var othersMessage = Loc.GetString("toilet-component-suicide-message-others",
-                    ("victim", Identity.Entity(args.Victim, EntityManager)), ("owner", uid));
-                _popup.PopupEntity(othersMessage, uid, Filter.PvsExcept(uid), true, PopupType.MediumCaution);
-
-                var selfMessage = Loc.GetString("toilet-component-suicide-message",
-                    ("owner", uid));
-                _popup.PopupEntity(selfMessage, uid, args.Victim, PopupType.LargeCaution);
-
-                args.SetHandled(SuicideKind.Blunt);
-            }
-        }
-
-        private void OnInit(EntityUid uid, ToiletComponent component, ComponentInit args)
-        {
-            EnsureComp<SecretStashComponent>(uid);
-        }
-
-        private void OnMapInit(EntityUid uid, ToiletComponent component, MapInitEvent args)
-        {
-            // roll is toilet seat will be up or down
-            component.IsSeatUp = _random.Prob(0.5f);
-            UpdateSprite(uid, component);
-        }
-
-        private void OnInteractUsing(EntityUid uid, ToiletComponent component, InteractUsingEvent args)
-        {
-            if (args.Handled)
-                return;
-
-            // are player trying place or lift of cistern lid?
-            if (_tool.UseTool(args.Used, args.User, uid, component.PryLidTime, component.PryingQuality, new ToiletPryDoAfterEvent()))
-            {
-                args.Handled = true;
-            }
-            // maybe player trying to hide something inside cistern?
-            else if (component.LidOpen)
-            {
-                args.Handled = true;
-                _secretStash.TryHideItem(uid, args.User, args.Used);
-            }
-        }
-
-        private void OnInteractHand(EntityUid uid, ToiletComponent component, InteractHandEvent args)
-        {
-            if (args.Handled)
-                return;
-
-            // trying get something from stash?
-            if (component.LidOpen)
-            {
-                var gotItem = _secretStash.TryGetItem(uid, args.User);
-                if (gotItem)
-                {
-                    args.Handled = true;
-                    return;
-                }
-            }
-
-            args.Handled = true;
-        }
-
-        private void OnToggleSeatVerb(EntityUid uid, ToiletComponent component, GetVerbsEvent<AlternativeVerb> args)
-        {
-            if (!args.CanInteract || !args.CanAccess || !CanToggle(uid))
-                return;
-
-            var alterToiletSeatText = component.IsSeatUp ? Loc.GetString("toilet-seat-close") : Loc.GetString("toilet-seat-open");
-
-            var verb = new AlternativeVerb()
-            {
-                Act = () => {
-                    if (CanToggle(uid))
-                        ToggleToiletSeat(uid, component);
-                },
-                Text = alterToiletSeatText
-            };
-
-            args.Verbs.Add(verb);
-        }
-
-        private void OnExamine(EntityUid uid, ToiletComponent component, ExaminedEvent args)
-        {
-            if (args.IsInDetailsRange && component.LidOpen)
-            {
-                if (_secretStash.HasItemInside(uid))
-                {
-                    var msg = Loc.GetString("toilet-component-on-examine-found-hidden-item");
-                    args.PushMarkup(msg);
-                }
-            }
-        }
-
-        private void OnToiletPried(EntityUid uid, ToiletComponent toilet, ToiletPryDoAfterEvent args)
-        {
-            if (args.Cancelled)
-                return;
-
-            toilet.LidOpen = !toilet.LidOpen;
-            UpdateSprite(uid, toilet);
-        }
-
-        public bool CanToggle(EntityUid uid)
-        {
-            return TryComp<StrapComponent>(uid, out var strap) && strap.BuckledEntities.Count == 0;
-        }
-
-        public void ToggleToiletSeat(EntityUid uid, ToiletComponent? component = null)
-        {
-            if (!Resolve(uid, ref component))
-                return;
-
-            component.IsSeatUp = !component.IsSeatUp;
-            _audio.PlayPvs(component.ToggleSound, uid, AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation));
-            UpdateSprite(uid, component);
-        }
-
-        private void UpdateSprite(EntityUid uid, ToiletComponent component)
-        {
-            if (!TryComp<AppearanceComponent>(uid, out var appearance))
-                return;
-
-            _appearance.SetData(uid, ToiletVisuals.LidOpen, component.LidOpen, appearance);
-            _appearance.SetData(uid, ToiletVisuals.SeatUp, component.IsSeatUp, appearance);
-        }
-    }
 }
diff --git a/Content.Server/UserInterface/ActivatableUIComponent.cs b/Content.Server/UserInterface/ActivatableUIComponent.cs
index 54639dd2b0..cc0e5008e4 100644
--- a/Content.Server/UserInterface/ActivatableUIComponent.cs
+++ b/Content.Server/UserInterface/ActivatableUIComponent.cs
@@ -1,3 +1,6 @@
+using Content.Shared.Whitelist;
+using Robust.Server.GameObjects;
+using Robust.Server.Player;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
@@ -34,12 +37,19 @@ namespace Content.Server.UserInterface
         [DataField]
         public bool RequireHands = true;
 
+        /// <summary>
+        ///     Entities that are required to open this UI.
+        /// </summary>
+        [DataField("allowedItems")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public EntityWhitelist? AllowedItems = null;
+
         /// <summary>
         ///     Whether you can activate this ui with activateinhand or not
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField]
-        public bool rightClickOnly = false;
+        public bool RightClickOnly;
 
         /// <summary>
         ///     Whether spectators (non-admin ghosts) should be allowed to view this UI.
@@ -63,4 +73,3 @@ namespace Content.Server.UserInterface
         public ICommonSession? CurrentSingleUser;
     }
 }
-
diff --git a/Content.Server/UserInterface/ActivatableUISystem.cs b/Content.Server/UserInterface/ActivatableUISystem.cs
index 387221e00c..e3a11af429 100644
--- a/Content.Server/UserInterface/ActivatableUISystem.cs
+++ b/Content.Server/UserInterface/ActivatableUISystem.cs
@@ -26,6 +26,7 @@ public sealed partial class ActivatableUISystem : EntitySystem
 
         SubscribeLocalEvent<ActivatableUIComponent, ActivateInWorldEvent>(OnActivate);
         SubscribeLocalEvent<ActivatableUIComponent, UseInHandEvent>(OnUseInHand);
+        SubscribeLocalEvent<ActivatableUIComponent, InteractUsingEvent>(OnInteractUsing);
         SubscribeLocalEvent<ActivatableUIComponent, HandDeselectedEvent>(OnHandDeselected);
         SubscribeLocalEvent<ActivatableUIComponent, GotUnequippedHandEvent>((uid, aui, _) => CloseAll(uid, aui));
         // *THIS IS A BLATANT WORKAROUND!* RATIONALE: Microwaves need it
@@ -100,12 +101,20 @@ public sealed partial class ActivatableUISystem : EntitySystem
         if (args.Handled)
             return;
 
-        if (component.rightClickOnly)
+        if (component.RightClickOnly)
             return;
 
         args.Handled = InteractUI(args.User, uid, component);
     }
 
+    private void OnInteractUsing(EntityUid uid, ActivatableUIComponent component, InteractUsingEvent args)
+    {
+        if (args.Handled) return;
+        if (component.AllowedItems == null) return;
+        if (!component.AllowedItems.IsValid(args.Used, EntityManager)) return;
+        args.Handled = InteractUI(args.User, uid, component);
+    }
+
     private void OnParentChanged(EntityUid uid, ActivatableUIComponent aui, ref EntParentChangedMessage args)
     {
         CloseAll(uid, aui);
diff --git a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
index a01a324013..2612e99ec9 100644
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -1,8 +1,4 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
 using Content.Server.Chat.Systems;
-using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.CombatMode.Disarm;
 using Content.Server.Movement.Systems;
 using Content.Shared.Actions.Events;
@@ -14,15 +10,14 @@ using Content.Shared.Database;
 using Content.Shared.Effects;
 using Content.Shared.Hands.Components;
 using Content.Shared.IdentityManagement;
-using Content.Shared.Inventory;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Speech.Components;
 using Content.Shared.StatusEffect;
-using Content.Shared.Tag;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
@@ -33,21 +28,17 @@ namespace Content.Server.Weapons.Melee;
 
 public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
 {
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
-    [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly LagCompensationSystem _lag = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
-    [Dependency] private readonly SolutionContainerSystem _solutions = default!;
-    [Dependency] private readonly TagSystem _tag = default!;
 
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<MeleeChemicalInjectorComponent, MeleeHitEvent>(OnChemicalInjectorHit);
         SubscribeLocalEvent<MeleeSpeechComponent, MeleeHitEvent>(OnSpeechHit);
         SubscribeLocalEvent<MeleeWeaponComponent, DamageExamineEvent>(OnMeleeExamineDamage);
     }
@@ -158,7 +149,8 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
             return false;
         }
 
-        Audio.PlayPvs(combatMode.DisarmSuccessSound, user, AudioParams.Default.WithVariation(0.025f).WithVolume(5f));
+        _audio.PlayPvs(combatMode.DisarmSuccessSound, user, AudioParams.Default.WithVariation(0.025f).WithVolume(5f));
+        AdminLogger.Add(LogType.DisarmedAction, $"{ToPrettyString(user):user} used disarm on {ToPrettyString(target):target}");
 
         var targetEnt = Identity.Entity(target, EntityManager);
         var userEnt = Identity.Entity(user, EntityManager);
@@ -175,7 +167,6 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
         PopupSystem.PopupEntity(msgOther, user, filterOther, true);
         PopupSystem.PopupEntity(msgUser, target, user);
 
-
         if (eventArgs.IsStunned)
         {
 
@@ -261,47 +252,4 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
         }
 
     }
-
-    private void OnChemicalInjectorHit(Entity<MeleeChemicalInjectorComponent> entity, ref MeleeHitEvent args)
-    {
-        if (!args.IsHit ||
-            !args.HitEntities.Any() ||
-            !_solutions.TryGetSolution(entity.Owner, entity.Comp.Solution, out var solutionContainer))
-        {
-            return;
-        }
-
-        var hitBloodstreams = new List<(EntityUid Entity, BloodstreamComponent Component)>();
-        var bloodQuery = GetEntityQuery<BloodstreamComponent>();
-
-        foreach (var hit in args.HitEntities)
-        {
-            if (Deleted(hit))
-                continue;
-
-            // prevent deathnettles injecting through hardsuits
-            if (!entity.Comp.PierceArmor && _inventory.TryGetSlotEntity(hit, "outerClothing", out var suit) && _tag.HasTag(suit.Value, "Hardsuit"))
-            {
-                PopupSystem.PopupEntity(Loc.GetString("melee-inject-failed-hardsuit", ("weapon", entity.Owner)), args.User, args.User, PopupType.SmallCaution);
-                continue;
-            }
-
-            if (bloodQuery.TryGetComponent(hit, out var bloodstream))
-                hitBloodstreams.Add((hit, bloodstream));
-        }
-
-        if (!hitBloodstreams.Any())
-            return;
-
-        var removedSolution = _solutions.SplitSolution(solutionContainer.Value, entity.Comp.TransferAmount * hitBloodstreams.Count);
-        var removedVol = removedSolution.Volume;
-        var solutionToInject = removedSolution.SplitSolution(removedVol * entity.Comp.TransferEfficiency);
-        var volPerBloodstream = solutionToInject.Volume * (1 / hitBloodstreams.Count);
-
-        foreach (var (ent, bloodstream) in hitBloodstreams)
-        {
-            var individualInjection = solutionToInject.SplitSolution(volPerBloodstream);
-            _bloodstream.TryAddToChemicals(ent, individualInjection, bloodstream);
-        }
-    }
 }
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index 65b578543c..d99d25bea8 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -44,7 +44,7 @@ public sealed partial class GunSystem : SharedGunSystem
     [Dependency] private readonly StunSystem _stun = default!;
     [Dependency] private readonly PoweredSystem _powered = default!; // WD
 
-    public const float DamagePitchVariation = SharedMeleeWeaponSystem.DamagePitchVariation;
+    private const float DamagePitchVariation = 0.05f;
     public const float GunClumsyChance = 0.5f;
 
     public override void Initialize()
diff --git a/Content.Server/Wires/CutWireOnMapInitComponent.cs b/Content.Server/Wires/CutWireOnMapInitComponent.cs
new file mode 100644
index 0000000000..4a4345e053
--- /dev/null
+++ b/Content.Server/Wires/CutWireOnMapInitComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Server.Wires;
+
+/// <summary>
+/// Picks a random wire on the entity's <see cref="WireComponent"/> and cuts it.
+/// Runs at MapInit and removes itself afterwards.
+/// </summary>
+[RegisterComponent]
+public sealed partial class CutWireOnMapInitComponent : Component
+{
+}
diff --git a/Content.Server/Wires/CutWireOnMapInitSystem.cs b/Content.Server/Wires/CutWireOnMapInitSystem.cs
new file mode 100644
index 0000000000..1de1d78630
--- /dev/null
+++ b/Content.Server/Wires/CutWireOnMapInitSystem.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.Random;
+
+namespace Content.Server.Wires;
+
+/// <summary>
+/// Handles cutting a random wire on devices that have <see cref="CutWireOnMapInitComponent"/>.
+/// </summary>
+public sealed partial class CutWireOnMapInitSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<CutWireOnMapInitComponent, MapInitEvent>(OnMapInit, after: [typeof(WiresSystem)]);
+    }
+
+    private void OnMapInit(Entity<CutWireOnMapInitComponent> entity, ref MapInitEvent args)
+    {
+        if (TryComp<WiresComponent>(entity, out var panel) && panel.WiresList.Count > 0)
+        {
+            // Pick a random wire
+            var targetWire = _random.Pick(panel.WiresList);
+
+            // Cut the wire
+            if (targetWire.Action == null || targetWire.Action.Cut(EntityUid.Invalid, targetWire))
+                targetWire.IsCut = true;
+        }
+
+        // Our work here is done
+        RemCompDeferred(entity, entity.Comp);
+    }
+}
diff --git a/Content.Server/Wires/WiresComponent.cs b/Content.Server/Wires/WiresComponent.cs
index 526b73a300..89e1873c00 100644
--- a/Content.Server/Wires/WiresComponent.cs
+++ b/Content.Server/Wires/WiresComponent.cs
@@ -1,4 +1,5 @@
 using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Wires;
 
@@ -15,7 +16,7 @@ public sealed partial class WiresComponent : Component
     ///     The layout ID of this entity's wires.
     /// </summary>
     [DataField(required: true)]
-    public string LayoutId { get; set; } = default!;
+    public ProtoId<WireLayoutPrototype> LayoutId { get; set; } = default!;
 
     /// <summary>
     ///     The serial number of this board. Randomly generated upon start,
diff --git a/Content.Shared/Access/AccessGroupPrototype.cs b/Content.Shared/Access/AccessGroupPrototype.cs
index 8d3ed8feea..323fdb91ed 100644
--- a/Content.Shared/Access/AccessGroupPrototype.cs
+++ b/Content.Shared/Access/AccessGroupPrototype.cs
@@ -14,6 +14,6 @@ public sealed partial class AccessGroupPrototype : IPrototype
     [IdDataField]
     public string ID { get; private set; } = default!;
 
-    [DataField("tags", required: true, customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessLevelPrototype>))]
-    public HashSet<string> Tags = default!;
+    [DataField("tags", required: true)]
+    public HashSet<ProtoId<AccessLevelPrototype>> Tags = default!;
 }
diff --git a/Content.Shared/Access/AccessLevelPrototype.cs b/Content.Shared/Access/AccessLevelPrototype.cs
index 8cc5927158..e3a3b426b0 100644
--- a/Content.Shared/Access/AccessLevelPrototype.cs
+++ b/Content.Shared/Access/AccessLevelPrototype.cs
@@ -17,5 +17,13 @@ namespace Content.Shared.Access
         /// </summary>
         [DataField("name")]
         public string? Name { get; set; }
+
+        public string GetAccessLevelName()
+        {
+            if (Name is { } name)
+                return Loc.GetString(name);
+
+            return ID;
+        }
     }
 }
diff --git a/Content.Shared/Access/Components/AccessComponent.cs b/Content.Shared/Access/Components/AccessComponent.cs
index 2eacf2aa67..00ee87b3b6 100644
--- a/Content.Shared/Access/Components/AccessComponent.cs
+++ b/Content.Shared/Access/Components/AccessComponent.cs
@@ -20,17 +20,17 @@ public sealed partial class AccessComponent : Component
     [AutoNetworkedField]
     public bool Enabled = true;
 
-    [DataField(customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessLevelPrototype>))]
+    [DataField]
     [Access(typeof(SharedAccessSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
     [AutoNetworkedField]
-    public HashSet<string> Tags = new();
+    public HashSet<ProtoId<AccessLevelPrototype>> Tags = new();
 
     /// <summary>
     /// Access Groups. These are added to the tags during map init. After map init this will have no effect.
     /// </summary>
-    [DataField(readOnly: true, customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessGroupPrototype>))]
+    [DataField(readOnly: true)]
     [AutoNetworkedField]
-    public HashSet<string> Groups = new();
+    public HashSet<ProtoId<AccessGroupPrototype>> Groups = new();
 }
 
 /// <summary>
@@ -47,9 +47,9 @@ public struct GetAdditionalAccessEvent
 }
 
 [ByRefEvent]
-public record struct GetAccessTagsEvent(HashSet<string> Tags, IPrototypeManager PrototypeManager)
+public record struct GetAccessTagsEvent(HashSet<ProtoId<AccessLevelPrototype>> Tags, IPrototypeManager PrototypeManager)
 {
-    public void AddGroup(string group)
+    public void AddGroup(ProtoId<AccessGroupPrototype> group)
     {
         if (!PrototypeManager.TryIndex<AccessGroupPrototype>(group, out var groupPrototype))
             return;
diff --git a/Content.Shared/Access/Components/AccessOverriderComponent.cs b/Content.Shared/Access/Components/AccessOverriderComponent.cs
index 92c09f1ab7..6a1bf2c831 100644
--- a/Content.Shared/Access/Components/AccessOverriderComponent.cs
+++ b/Content.Shared/Access/Components/AccessOverriderComponent.cs
@@ -25,9 +25,9 @@ public sealed partial class AccessOverriderComponent : Component
     [Serializable, NetSerializable]
     public sealed class WriteToTargetAccessReaderIdMessage : BoundUserInterfaceMessage
     {
-        public readonly List<string> AccessList;
+        public readonly List<ProtoId<AccessLevelPrototype>> AccessList;
 
-        public WriteToTargetAccessReaderIdMessage(List<string> accessList)
+        public WriteToTargetAccessReaderIdMessage(List<ProtoId<AccessLevelPrototype>> accessList)
         {
             AccessList = accessList;
         }
@@ -48,15 +48,15 @@ public sealed partial class AccessOverriderComponent : Component
         public readonly string PrivilegedIdName;
         public readonly bool IsPrivilegedIdPresent;
         public readonly bool IsPrivilegedIdAuthorized;
-        public readonly string[]? TargetAccessReaderIdAccessList;
-        public readonly string[]? AllowedModifyAccessList;
-        public readonly string[]? MissingPrivilegesList;
+        public readonly ProtoId<AccessLevelPrototype>[]? TargetAccessReaderIdAccessList;
+        public readonly ProtoId<AccessLevelPrototype>[]? AllowedModifyAccessList;
+        public readonly ProtoId<AccessLevelPrototype>[]? MissingPrivilegesList;
 
         public AccessOverriderBoundUserInterfaceState(bool isPrivilegedIdPresent,
             bool isPrivilegedIdAuthorized,
-            string[]? targetAccessReaderIdAccessList,
-            string[]? allowedModifyAccessList,
-            string[]? missingPrivilegesList,
+            ProtoId<AccessLevelPrototype>[]? targetAccessReaderIdAccessList,
+            ProtoId<AccessLevelPrototype>[]? allowedModifyAccessList,
+            ProtoId<AccessLevelPrototype>[]? missingPrivilegesList,
             string privilegedIdName,
             string targetLabel,
             Color targetLabelColor)
diff --git a/Content.Shared/Access/Components/AccessReaderComponent.cs b/Content.Shared/Access/Components/AccessReaderComponent.cs
index b157797922..cbd3f5acd6 100644
--- a/Content.Shared/Access/Components/AccessReaderComponent.cs
+++ b/Content.Shared/Access/Components/AccessReaderComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.StationRecords;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 
@@ -23,15 +24,15 @@ public sealed partial class AccessReaderComponent : Component
     /// The set of tags that will automatically deny an allowed check, if any of them are present.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    [DataField(customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessLevelPrototype>))]
-    public HashSet<string> DenyTags = new();
+    [DataField]
+    public HashSet<ProtoId<AccessLevelPrototype>> DenyTags = new();
 
     /// <summary>
     /// List of access groups that grant access to this reader. Only a single matching group is required to gain access.
     /// A group matches if it is a subset of the set being checked against.
     /// </summary>
     [DataField("access")] [ViewVariables(VVAccess.ReadWrite)]
-    public List<HashSet<string>> AccessLists = new();
+    public List<HashSet<ProtoId<AccessLevelPrototype>>> AccessLists = new();
 
     /// <summary>
     /// A list of <see cref="StationRecordKey"/>s that grant access. Only a single matching key is required to gain
@@ -88,9 +89,9 @@ public sealed class AccessReaderComponentState : ComponentState
 {
     public bool Enabled;
 
-    public HashSet<string> DenyTags;
+    public HashSet<ProtoId<AccessLevelPrototype>> DenyTags;
 
-    public List<HashSet<string>> AccessLists;
+    public List<HashSet<ProtoId<AccessLevelPrototype>>> AccessLists;
 
     public List<(NetEntity, uint)> AccessKeys;
 
@@ -98,7 +99,7 @@ public sealed class AccessReaderComponentState : ComponentState
 
     public int AccessLogLimit;
 
-    public AccessReaderComponentState(bool enabled, HashSet<string> denyTags, List<HashSet<string>> accessLists, List<(NetEntity, uint)> accessKeys, Queue<AccessRecord> accessLog, int accessLogLimit)
+    public AccessReaderComponentState(bool enabled, HashSet<ProtoId<AccessLevelPrototype>> denyTags, List<HashSet<ProtoId<AccessLevelPrototype>>> accessLists, List<(NetEntity, uint)> accessKeys, Queue<AccessRecord> accessLog, int accessLogLimit)
     {
         Enabled = enabled;
         DenyTags = denyTags;
@@ -108,3 +109,10 @@ public sealed class AccessReaderComponentState : ComponentState
         AccessLogLimit = accessLogLimit;
     }
 }
+
+public sealed class AccessReaderConfigurationChangedEvent : EntityEventArgs
+{
+    public AccessReaderConfigurationChangedEvent()
+    {
+    }
+}
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
index d2ff7b281f..080c6b5949 100644
--- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs
+++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -27,16 +27,12 @@ public sealed partial class IdCardConsoleComponent : Component
     {
         public readonly string FullName;
         public readonly string JobTitle;
-        public readonly List<string> AccessList;
-        public readonly string JobPrototype;
+        public readonly List<ProtoId<AccessLevelPrototype>> AccessList;
+        public readonly ProtoId<AccessLevelPrototype> JobPrototype;
         public readonly string? SelectedIcon; //WD-EDIT
-
-        public WriteToTargetIdMessage(
-            string fullName,
-            string jobTitle,
-            List<string> accessList,
-            string jobPrototype,
-            string? selectedIcon) //WD-EDIT (selectedIcon)
+        
+        public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<AccessLevelPrototype>> accessList, ProtoId<AccessLevelPrototype> jobPrototype,
+            string? selectedIcon)
         {
             FullName = fullName;
             JobTitle = jobTitle;
@@ -150,20 +146,20 @@ public sealed partial class IdCardConsoleComponent : Component
         public readonly string TargetIdName;
         public readonly string? TargetIdFullName;
         public readonly string? TargetIdJobTitle;
-        public readonly string[]? TargetIdAccessList;
-        public readonly string[]? AllowedModifyAccessList;
-        public readonly string TargetIdJobPrototype;
+        public readonly List<ProtoId<AccessLevelPrototype>>? TargetIdAccessList;
+        public readonly List<ProtoId<AccessLevelPrototype>>? AllowedModifyAccessList;
+        public readonly ProtoId<AccessLevelPrototype> TargetIdJobPrototype;
         public readonly string? TargetIdJobIcon; //WD-EDIT
-
+        
         public IdCardConsoleBoundUserInterfaceState(
             bool isPrivilegedIdPresent,
             bool isPrivilegedIdAuthorized,
             bool isTargetIdPresent,
             string? targetIdFullName,
             string? targetIdJobTitle,
-            string[]? targetIdAccessList,
-            string[]? allowedModifyAccessList,
-            string targetIdJobPrototype,
+            List<ProtoId<AccessLevelPrototype>>? targetIdAccessList,
+            List<ProtoId<AccessLevelPrototype>>? allowedModifyAccessList,
+            ProtoId<AccessLevelPrototype> targetIdJobPrototype,
             string privilegedIdName,
             string targetIdName,
             string? targetIdJobIcon) // #WD EDIT (targetIdJobIcon)
diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs
index 812a8e0487..89c08e0a4e 100644
--- a/Content.Shared/Access/Systems/AccessReaderSystem.cs
+++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs
@@ -112,11 +112,36 @@ public sealed class AccessReaderSystem : EntitySystem
         return false;
     }
 
+    public bool GetMainAccessReader(EntityUid uid, [NotNullWhen(true)] out AccessReaderComponent? component)
+    {
+        component = null;
+        if (!TryComp(uid, out AccessReaderComponent? accessReader))
+            return false;
+
+        component = accessReader;
+
+        if (component.ContainerAccessProvider == null)
+            return true;
+
+        if (!_containerSystem.TryGetContainer(uid, component.ContainerAccessProvider, out var container))
+            return true;
+
+        foreach (var entity in container.ContainedEntities)
+        {
+            if (TryComp(entity, out AccessReaderComponent? containedReader))
+            {
+                component = containedReader;
+                return true;
+            }
+        }
+        return true;
+    }
+
     /// <summary>
     /// Check whether the given access permissions satisfy an access reader's requirements.
     /// </summary>
     public bool IsAllowed(
-        ICollection<string> access,
+        ICollection<ProtoId<AccessLevelPrototype>> access,
         ICollection<StationRecordKey> stationKeys,
         EntityUid target,
         AccessReaderComponent reader)
@@ -142,7 +167,7 @@ public sealed class AccessReaderSystem : EntitySystem
         return false;
     }
 
-    private bool IsAllowedInternal(ICollection<string> access, ICollection<StationRecordKey> stationKeys, AccessReaderComponent reader)
+    private bool IsAllowedInternal(ICollection<ProtoId<AccessLevelPrototype>> access, ICollection<StationRecordKey> stationKeys, AccessReaderComponent reader)
     {
         return !reader.Enabled
                || AreAccessTagsAllowed(access, reader)
@@ -154,7 +179,7 @@ public sealed class AccessReaderSystem : EntitySystem
     /// </summary>
     /// <param name="accessTags">A list of access tags</param>
     /// <param name="reader">An access reader to check against</param>
-    public bool AreAccessTagsAllowed(ICollection<string> accessTags, AccessReaderComponent reader)
+    public bool AreAccessTagsAllowed(ICollection<ProtoId<AccessLevelPrototype>> accessTags, AccessReaderComponent reader)
     {
         if (reader.DenyTags.Overlaps(accessTags))
         {
@@ -218,9 +243,9 @@ public sealed class AccessReaderSystem : EntitySystem
     /// </summary>
     /// <param name="uid">The entity that is being searched.</param>
     /// <param name="items">All of the items to search for access. If none are passed in, <see cref="FindPotentialAccessItems"/> will be used.</param>
-    public ICollection<string> FindAccessTags(EntityUid uid, HashSet<EntityUid>? items = null)
+    public ICollection<ProtoId<AccessLevelPrototype>> FindAccessTags(EntityUid uid, HashSet<EntityUid>? items = null)
     {
-        HashSet<string>? tags = null;
+        HashSet<ProtoId<AccessLevelPrototype>>? tags = null;
         var owned = false;
 
         items ??= FindPotentialAccessItems(uid);
@@ -230,7 +255,7 @@ public sealed class AccessReaderSystem : EntitySystem
             FindAccessTagsItem(ent, ref tags, ref owned);
         }
 
-        return (ICollection<string>?) tags ?? Array.Empty<string>();
+        return (ICollection<ProtoId<AccessLevelPrototype>>?) tags ?? Array.Empty<ProtoId<AccessLevelPrototype>>();
     }
 
     /// <summary>
@@ -260,7 +285,7 @@ public sealed class AccessReaderSystem : EntitySystem
     ///     This version merges into a set or replaces the set.
     ///     If owned is false, the existing tag-set "isn't ours" and can't be merged with (is read-only).
     /// </summary>
-    private void FindAccessTagsItem(EntityUid uid, ref HashSet<string>? tags, ref bool owned)
+    private void FindAccessTagsItem(EntityUid uid, ref HashSet<ProtoId<AccessLevelPrototype>>? tags, ref bool owned)
     {
         if (!FindAccessTagsItem(uid, out var targetTags))
         {
@@ -286,6 +311,17 @@ public sealed class AccessReaderSystem : EntitySystem
         }
     }
 
+    public void SetAccesses(EntityUid uid, AccessReaderComponent component, List<ProtoId<AccessLevelPrototype>> accesses)
+    {
+        component.AccessLists.Clear();
+        foreach (var access in accesses)
+        {
+            component.AccessLists.Add(new HashSet<ProtoId<AccessLevelPrototype>>(){access});
+        }
+        Dirty(uid, component);
+        RaiseLocalEvent(uid, new AccessReaderConfigurationChangedEvent());
+    }
+
     public bool FindAccessItemsInventory(EntityUid uid, out HashSet<EntityUid> items)
     {
         items = new();
@@ -308,7 +344,7 @@ public sealed class AccessReaderSystem : EntitySystem
     ///     Try to find <see cref="AccessComponent"/> on this item
     ///     or inside this item (if it's pda)
     /// </summary>
-    private bool FindAccessTagsItem(EntityUid uid, out HashSet<string> tags)
+    private bool FindAccessTagsItem(EntityUid uid, out HashSet<ProtoId<AccessLevelPrototype>> tags)
     {
         tags = new();
         var ev = new GetAccessTagsEvent(tags, _prototype);
diff --git a/Content.Shared/Access/Systems/SharedAccessSystem.cs b/Content.Shared/Access/Systems/SharedAccessSystem.cs
index 965ccb2412..a4b04c3559 100644
--- a/Content.Shared/Access/Systems/SharedAccessSystem.cs
+++ b/Content.Shared/Access/Systems/SharedAccessSystem.cs
@@ -51,7 +51,7 @@ namespace Content.Shared.Access.Systems
         ///     Replaces the set of access tags we have with the provided set.
         /// </summary>
         /// <param name="access">The new access tags</param>
-        public bool TrySetTags(EntityUid uid, IEnumerable<string> newTags, AccessComponent? access = null)
+        public bool TrySetTags(EntityUid uid, IEnumerable<ProtoId<AccessLevelPrototype>> newTags, AccessComponent? access = null)
         {
             if (!Resolve(uid, ref access))
                 return false;
@@ -67,12 +67,12 @@ namespace Content.Shared.Access.Systems
         ///     Gets the set of access tags.
         /// </summary>
         /// <param name="access">The new access tags</param>
-        public IEnumerable<string>? TryGetTags(EntityUid uid, AccessComponent? access = null)
+        public IEnumerable<ProtoId<AccessLevelPrototype>>? TryGetTags(EntityUid uid, AccessComponent? access = null)
         {
             return !Resolve(uid, ref access) ? null : access.Tags;
         }
 
-        public bool TryAddGroups(EntityUid uid, IEnumerable<string> newGroups, AccessComponent? access = null)
+        public bool TryAddGroups(EntityUid uid, IEnumerable<ProtoId<AccessGroupPrototype>> newGroups, AccessComponent? access = null)
         {
             if (!Resolve(uid, ref access))
                 return false;
diff --git a/Content.Shared/Access/Systems/SharedIdCardConsoleSystem.cs b/Content.Shared/Access/Systems/SharedIdCardConsoleSystem.cs
index 12e25e1e22..81843b5e2d 100644
--- a/Content.Shared/Access/Systems/SharedIdCardConsoleSystem.cs
+++ b/Content.Shared/Access/Systems/SharedIdCardConsoleSystem.cs
@@ -1,6 +1,9 @@
 using Content.Shared.Access.Components;
 using Content.Shared.Containers.ItemSlots;
 using JetBrains.Annotations;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Access.Systems
 {
@@ -33,5 +36,16 @@ namespace Content.Shared.Access.Systems
             _itemSlotsSystem.RemoveItemSlot(uid, component.PrivilegedIdSlot);
             _itemSlotsSystem.RemoveItemSlot(uid, component.TargetIdSlot);
         }
+
+        [Serializable, NetSerializable]
+        private sealed class IdCardConsoleComponentState : ComponentState
+        {
+            public List<string> AccessLevels;
+
+            public IdCardConsoleComponentState(List<string> accessLevels)
+            {
+                AccessLevels = accessLevels;
+            }
+        }
     }
 }
diff --git a/Content.Shared/Alert/AlertsSystem.cs b/Content.Shared/Alert/AlertsSystem.cs
index d8737a717a..5b888e30c4 100644
--- a/Content.Shared/Alert/AlertsSystem.cs
+++ b/Content.Shared/Alert/AlertsSystem.cs
@@ -80,6 +80,10 @@ public abstract class AlertsSystem : EntitySystem
     /// <param name="showCooldown">if true, the cooldown will be visibly shown over the alert icon</param>
     public void ShowAlert(EntityUid euid, AlertType alertType, short? severity = null, (TimeSpan, TimeSpan)? cooldown = null, bool autoRemove = false, bool showCooldown = true )
     {
+        // This should be handled as part of networking.
+        if (_timing.ApplyingState)
+            return;
+
         if (!TryComp(euid, out AlertsComponent? alertsComponent))
             return;
 
@@ -148,6 +152,9 @@ public abstract class AlertsSystem : EntitySystem
     /// </summary>
     public void ClearAlert(EntityUid euid, AlertType alertType)
     {
+        if (_timing.ApplyingState)
+            return;
+
         if (!EntityManager.TryGetComponent(euid, out AlertsComponent? alertsComponent))
             return;
 
diff --git a/Content.Shared/Anomaly/Components/AnomalyComponent.cs b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
index bafdf12360..3878aeb81c 100644
--- a/Content.Shared/Anomaly/Components/AnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared.Anomaly.Prototypes;
 using Content.Shared.Damage;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
@@ -94,13 +95,13 @@ public sealed partial class AnomalyComponent : Component
     /// The minimum interval between pulses.
     /// </summary>
     [DataField]
-    public TimeSpan MinPulseLength = TimeSpan.FromMinutes(1);
+    public TimeSpan MinPulseLength = TimeSpan.FromMinutes(2);
 
     /// <summary>
     /// The maximum interval between pulses.
     /// </summary>
     [DataField]
-    public TimeSpan MaxPulseLength = TimeSpan.FromMinutes(2);
+    public TimeSpan MaxPulseLength = TimeSpan.FromMinutes(4);
 
     /// <summary>
     /// A percentage by which the length of a pulse might vary.
@@ -166,6 +167,12 @@ public sealed partial class AnomalyComponent : Component
     [DataField]
     public AnomalousParticleType WeakeningParticleType;
 
+    /// <summary>
+    /// The particle type that change anomaly behaviour.
+    /// </summary>
+    [DataField]
+    public AnomalousParticleType TransformationParticleType;
+
     #region Points and Vessels
     /// <summary>
     /// The vessel that the anomaly is connceted to. Stored so that multiple
@@ -185,7 +192,7 @@ public sealed partial class AnomalyComponent : Component
     /// This doesn't include the point bonus for being unstable.
     /// </summary>
     [DataField("maxPointsPerSecond")]
-    public int MaxPointsPerSecond = 80;
+    public int MaxPointsPerSecond = 70;
 
     /// <summary>
     /// The multiplier applied to the point value for the
@@ -221,6 +228,31 @@ public sealed partial class AnomalyComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public EntProtoId? CoreInertPrototype;
 
+    #region Behavior Deviations
+
+    [DataField]
+    public ProtoId<AnomalyBehaviorPrototype>? CurrentBehavior;
+
+    /// <summary>
+    /// Presumption of anomaly to change behavior. The higher the number, the higher the chance that the anomaly will change its behavior.
+    /// </summary>
+    [DataField]
+    public float Continuity = 0f;
+
+    /// <summary>
+    /// Minimum contituty probability chance, that can be selected by anomaly on MapInit
+    /// </summary>
+    [DataField]
+    public float MinContituty = 0.1f;
+
+    /// <summary>
+    /// Maximum contituty probability chance, that can be selected by anomaly on MapInit
+    /// </summary>
+    [DataField]
+    public float MaxContituty = 1.0f;
+
+    #endregion
+
     #region Floating Animation
     /// <summary>
     /// How long it takes to go from the bottom of the animation to the top.
@@ -247,13 +279,13 @@ public sealed partial class AnomalyComponent : Component
 /// <param name="Stability"></param>
 /// <param name="Severity"></param>
 [ByRefEvent]
-public readonly record struct AnomalyPulseEvent(EntityUid Anomaly, float Stability, float Severity);
+public readonly record struct AnomalyPulseEvent(EntityUid Anomaly, float Stability, float Severity, float PowerModifier);
 
 /// <summary>
 /// Event raised on an anomaly when it reaches a supercritical point.
 /// </summary>
 [ByRefEvent]
-public readonly record struct AnomalySupercriticalEvent(EntityUid Anomaly);
+public readonly record struct AnomalySupercriticalEvent(EntityUid Anomaly, float PowerModifier);
 
 /// <summary>
 /// Event broadcast after an anomaly goes supercritical
@@ -282,3 +314,9 @@ public readonly record struct AnomalyStabilityChangedEvent(EntityUid Anomaly, fl
 /// <param name="Anomaly">The anomaly being changed</param>
 [ByRefEvent]
 public readonly record struct AnomalyHealthChangedEvent(EntityUid Anomaly, float Health);
+
+/// <summary>
+/// Event broadcast when an anomaly's behavior is changed.
+/// </summary>
+[ByRefEvent]
+public readonly record struct AnomalyBehaviorChangedEvent(EntityUid Anomaly, ProtoId<AnomalyBehaviorPrototype>? Old, ProtoId<AnomalyBehaviorPrototype>? New);
diff --git a/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs b/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs
index f4b7cc8bf4..4c3cdb0146 100644
--- a/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs
+++ b/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Anomaly.Effects.Components;
 using Content.Shared.Ghost;
@@ -27,8 +27,8 @@ public abstract class SharedGravityAnomalySystem : EntitySystem
     private void OnAnomalyPulse(EntityUid uid, GravityAnomalyComponent component, ref AnomalyPulseEvent args)
     {
         var xform = Transform(uid);
-        var range = component.MaxThrowRange * args.Severity;
-        var strength = component.MaxThrowStrength * args.Severity;
+        var range = component.MaxThrowRange * args.Severity * args.PowerModifier;
+        var strength = component.MaxThrowStrength * args.Severity * args.PowerModifier;
         var lookup = _lookup.GetEntitiesInRange(uid, range, LookupFlags.Dynamic | LookupFlags.Sundries);
         var xformQuery = GetEntityQuery<TransformComponent>();
         var worldPos = _xform.GetWorldPosition(xform, xformQuery);
@@ -61,8 +61,8 @@ public abstract class SharedGravityAnomalySystem : EntitySystem
         var tiles = tileref.Select(t => (t.GridIndices, Tile.Empty)).ToList();
         _mapSystem.SetTiles(xform.GridUid.Value, grid, tiles);
 
-        var range = component.MaxThrowRange * 2;
-        var strength = component.MaxThrowStrength * 2;
+        var range = component.MaxThrowRange * 2 * args.PowerModifier;
+        var strength = component.MaxThrowStrength * 2 * args.PowerModifier;
         var lookup = _lookup.GetEntitiesInRange(uid, range, LookupFlags.Dynamic | LookupFlags.Sundries);
         var xformQuery = GetEntityQuery<TransformComponent>();
         var physQuery = GetEntityQuery<PhysicsComponent>();
diff --git a/Content.Shared/Anomaly/Prototypes/AnomalyBehaviorPrototype.cs b/Content.Shared/Anomaly/Prototypes/AnomalyBehaviorPrototype.cs
new file mode 100644
index 0000000000..c498f5c595
--- /dev/null
+++ b/Content.Shared/Anomaly/Prototypes/AnomalyBehaviorPrototype.cs
@@ -0,0 +1,45 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Anomaly.Prototypes;
+
+[Prototype]
+public sealed partial class AnomalyBehaviorPrototype : IPrototype
+{
+    [IdDataField] public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// Description for anomaly scanner
+    /// </summary>
+    [DataField]
+    public string Description = string.Empty;
+
+    /// <summary>
+    /// modification of the number of points earned from an anomaly
+    /// </summary>
+    [DataField]
+    public float EarnPointModifier = 1f;
+
+    /// <summary>
+    /// deceleration or acceleration of the pulsation frequency of the anomaly
+    /// </summary>
+    [DataField]
+    public float PulseFrequencyModifier = 1f;
+
+    /// <summary>
+    /// pulse and supercrit power modifier
+    /// </summary>
+    [DataField]
+    public float PulsePowerModifier = 1f;
+
+    /// <summary>
+    /// how much the particles will affect the anomaly
+    /// </summary>
+    [DataField]
+    public float ParticleSensivity = 1f;
+
+    /// <summary>
+    /// Components that are added to the anomaly when this behavior is selected, and removed when another behavior is selected.
+    /// </summary>
+    [DataField(serverOnly: true)]
+    public ComponentRegistry Components = new();
+}
diff --git a/Content.Shared/Anomaly/SharedAnomaly.cs b/Content.Shared/Anomaly/SharedAnomaly.cs
index b7585cb5f1..cde61ca336 100644
--- a/Content.Shared/Anomaly/SharedAnomaly.cs
+++ b/Content.Shared/Anomaly/SharedAnomaly.cs
@@ -33,6 +33,7 @@ public enum AnomalousParticleType : byte
     Delta,
     Epsilon,
     Zeta,
+    Sigma,
     Default
 }
 
diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs
index 5c3fdf4d64..1e3b9142b0 100644
--- a/Content.Shared/Anomaly/SharedAnomalySystem.cs
+++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Anomaly.Components;
+using Content.Shared.Anomaly.Prototypes;
 using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.Interaction;
@@ -14,6 +15,7 @@ using Robust.Shared.Network;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -33,6 +35,7 @@ public abstract class SharedAnomalySystem : EntitySystem
     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
 
     public override void Initialize()
@@ -93,11 +96,8 @@ public abstract class SharedAnomalySystem : EntitySystem
         if (!Timing.IsFirstTimePredicted)
             return;
 
-        DebugTools.Assert(component.MinPulseLength >
-            TimeSpan.FromSeconds(3)); // this is just to prevent lagspikes mispredicting pulses
-
-        var variation = Random.NextFloat(-component.PulseVariation, component.PulseVariation) + 1;
-        component.NextPulseTime = Timing.CurTime + GetPulseLength(component) * variation;
+        DebugTools.Assert(component.MinPulseLength > TimeSpan.FromSeconds(3)); // this is just to prevent lagspikes mispredicting pulses
+        RefreshPulseTimer(uid, component);
 
         if (_net.IsServer)
             Log.Info($"Performing anomaly pulse. Entity: {ToPrettyString(uid)}");
@@ -123,10 +123,25 @@ public abstract class SharedAnomalySystem : EntitySystem
         pulse.EndTime = Timing.CurTime + pulse.PulseDuration;
         Appearance.SetData(uid, AnomalyVisuals.IsPulsing, true);
 
-        var ev = new AnomalyPulseEvent(uid, component.Stability, component.Severity);
+        var powerMod = 1f;
+        if (component.CurrentBehavior != null)
+        {
+            var beh = _prototype.Index<AnomalyBehaviorPrototype>(component.CurrentBehavior);
+            powerMod = beh.PulsePowerModifier;
+        }
+        var ev = new AnomalyPulseEvent(uid, component.Stability, component.Severity, powerMod);
         RaiseLocalEvent(uid, ref ev, true);
     }
 
+    public void RefreshPulseTimer(EntityUid uid, AnomalyComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        var variation = Random.NextFloat(-component.PulseVariation, component.PulseVariation) + 1;
+        component.NextPulseTime = Timing.CurTime + GetPulseLength(component) * variation;
+    }
+
     /// <summary>
     /// Begins the animation for going supercritical
     /// </summary>
@@ -167,7 +182,14 @@ public abstract class SharedAnomalySystem : EntitySystem
         if (_net.IsServer)
             Log.Info($"Raising supercritical event. Entity: {ToPrettyString(uid)}");
 
-        var ev = new AnomalySupercriticalEvent(uid);
+        var powerMod = 1f;
+        if (component.CurrentBehavior != null)
+        {
+            var beh = _prototype.Index<AnomalyBehaviorPrototype>(component.CurrentBehavior);
+            powerMod = beh.PulsePowerModifier;
+        }
+
+        var ev = new AnomalySupercriticalEvent(uid, powerMod);
         RaiseLocalEvent(uid, ref ev, true);
 
         EndAnomaly(uid, component, true);
@@ -286,7 +308,16 @@ public abstract class SharedAnomalySystem : EntitySystem
     {
         DebugTools.Assert(component.MaxPulseLength > component.MinPulseLength);
         var modifier = Math.Clamp((component.Stability - component.GrowthThreshold) / component.GrowthThreshold, 0, 1);
-        return (component.MaxPulseLength - component.MinPulseLength) * modifier + component.MinPulseLength;
+
+        var lenght = (component.MaxPulseLength - component.MinPulseLength) * modifier + component.MinPulseLength;
+
+        //Apply behavior modifier
+        if (component.CurrentBehavior != null)
+        {
+            var behavior = _prototype.Index(component.CurrentBehavior.Value);
+            lenght *= behavior.PulseFrequencyModifier;
+        }
+        return lenght;
     }
 
     /// <summary>
@@ -345,18 +376,14 @@ public abstract class SharedAnomalySystem : EntitySystem
     /// <summary>
     /// Gets random points around the anomaly based on the given parameters.
     /// </summary>
-    public List<TileRef>? GetSpawningPoints(
-        EntityUid uid,
-        float stability,
-        float severity,
-        AnomalySpawnSettings settings)
+    public List<TileRef>? GetSpawningPoints(EntityUid uid, float stability, float severity, AnomalySpawnSettings settings, float powerModifier = 1f)
     {
         var xform = Transform(uid);
 
         if (!TryComp<MapGridComponent>(xform.GridUid, out var grid))
             return null;
 
-        var amount = (int) (MathHelper.Lerp(settings.MinAmount, settings.MaxAmount, severity * stability) + 0.5f);
+        var amount = (int) (MathHelper.Lerp(settings.MinAmount, settings.MaxAmount, severity * stability * powerModifier) + 0.5f);
 
         var localpos = xform.Coordinates.Position;
         var tilerefs = grid.GetLocalTilesIntersecting(
diff --git a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
index f14dc21c48..c3fa21e293 100644
--- a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
+++ b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.DragDrop;
 using Content.Shared.GameTicking;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
+using Content.Shared.Mobs.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
@@ -22,6 +23,7 @@ public abstract class SharedCryostorageSystem : EntitySystem
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] protected readonly SharedMindSystem Mind = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
 
     protected EntityUid? PausedMap { get; private set; }
 
@@ -81,6 +83,12 @@ public abstract class SharedCryostorageSystem : EntitySystem
         if (args.Container.ID != comp.ContainerId)
             return;
 
+        if (_mobState.IsIncapacitated(args.EntityUid))
+        {
+            args.Cancel();
+            return;
+        }
+
         if (!TryComp<MindContainerComponent>(args.EntityUid, out var mindContainer))
         {
             args.Cancel();
diff --git a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
index b0d6ef0c73..55014bab07 100644
--- a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
@@ -42,8 +42,7 @@ namespace Content.Server.Bed.Sleep
             _actionsSystem.AddAction(uid, ref component.WakeAction, WakeActionId, uid);
 
             // TODO remove hardcoded time.
-            _actionsSystem.SetCooldown(component.WakeAction, _gameTiming.CurTime,
-                _gameTiming.CurTime + TimeSpan.FromSeconds(15));
+            _actionsSystem.SetCooldown(component.WakeAction, _gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(2f));
         }
 
         private void OnShutdown(EntityUid uid, SleepingComponent component, ComponentShutdown args)
diff --git a/Content.Shared/Buckle/Components/StrapComponent.cs b/Content.Shared/Buckle/Components/StrapComponent.cs
index f25e1b0374..72c92ebf84 100644
--- a/Content.Shared/Buckle/Components/StrapComponent.cs
+++ b/Content.Shared/Buckle/Components/StrapComponent.cs
@@ -22,9 +22,14 @@ public sealed partial class StrapComponent : Component
     /// Entities that this strap accepts and can buckle
     /// If null it accepts any entity
     /// </summary>
-    [DataField]
-    [ViewVariables]
-    public EntityWhitelist? AllowedEntities;
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// Entities that this strap does not accept and cannot buckle.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public EntityWhitelist? Blacklist;
 
     /// <summary>
     /// The change in position to the strapped mob
diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
index dd2408f3b6..14bd4503d6 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
@@ -221,8 +221,8 @@ public abstract partial class SharedBuckleSystem
         }
 
         // Does it pass the Whitelist
-        if (strapComp.AllowedEntities != null &&
-            !strapComp.AllowedEntities.IsValid(userUid, EntityManager))
+        if (strapComp.Whitelist != null &&
+            !strapComp.Whitelist.IsValid(buckleUid, EntityManager) || strapComp.Blacklist?.IsValid(buckleUid, EntityManager) == true)
         {
             if (_netManager.IsServer)
                 _popup.PopupEntity(Loc.GetString("buckle-component-cannot-fit-message"), userUid, buckleUid, PopupType.Medium);
diff --git a/Content.Shared/Burial/BurialSystem.cs b/Content.Shared/Burial/BurialSystem.cs
index e19ac2e9c6..ccf5f1a298 100644
--- a/Content.Shared/Burial/BurialSystem.cs
+++ b/Content.Shared/Burial/BurialSystem.cs
@@ -51,8 +51,15 @@ public sealed class BurialSystem : EntitySystem
                 BreakOnHandChange = true
             };
 
+            if (component.Stream == null)
+                component.Stream = _audioSystem.PlayPredicted(component.DigSound, uid, args.User)?.Entity;
+
             if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs))
+            {
+                _audioSystem.Stop(component.Stream);
                 return;
+            }
+
 
             StartDigging(uid, args.User, args.Used, component);
         }
@@ -111,8 +118,6 @@ public sealed class BurialSystem : EntitySystem
         {
             _popupSystem.PopupClient(Loc.GetString("grave-start-digging-user", ("grave", uid), ("tool", used)), user, user);
             _popupSystem.PopupEntity(Loc.GetString("grave-start-digging-others", ("user", user), ("grave", uid), ("tool", used)), user, Filter.PvsExcept(user), true);
-            if (component.Stream == null)
-                component.Stream = _audioSystem.PlayPredicted(component.DigSound, uid, user)?.Entity;
             component.ActiveShovelDigging = true;
             Dirty(uid, component);
         }
@@ -163,8 +168,15 @@ public sealed class BurialSystem : EntitySystem
             BreakOnDamage = false
         };
 
-        if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs, out component.HandDiggingDoAfter))
+
+        if (component.Stream == null)
+            component.Stream = _audioSystem.PlayPredicted(component.DigSound, uid, args.Entity)?.Entity;
+
+        if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs))
+        {
+            _audioSystem.Stop(component.Stream);
             return;
+        }
 
         StartDigging(uid, args.Entity, null, component);
     }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index b955f2443d..68d2673436 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -543,8 +543,8 @@ namespace Content.Shared.CCVar
          * Console
          */
 
-        public static readonly CVarDef<bool>
-            ConsoleLoginLocal = CVarDef.Create("console.loginlocal", true, CVar.ARCHIVE | CVar.SERVERONLY);
+        public static readonly CVarDef<bool> ConsoleLoginLocal =
+            CVarDef.Create("console.loginlocal", true, CVar.ARCHIVE | CVar.SERVERONLY);
 
         /// <summary>
         /// Automatically log in the given user as host, equivalent to the <c>promotehost</c> command.
@@ -726,7 +726,7 @@ namespace Content.Shared.CCVar
 
         public static readonly CVarDef<bool> CombatModeIndicatorsPointShow =
             CVarDef.Create("hud.combat_mode_indicators_point_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
-
+        
         public static readonly CVarDef<bool> LoocAboveHeadShow =
             CVarDef.Create("hud.show_looc_above_head", false, CVar.ARCHIVE | CVar.CLIENTONLY);
 
@@ -836,6 +836,7 @@ namespace Content.Shared.CCVar
 
         /// <summary>
         ///     Should the ban details in admin channel include PII? (IP, HWID, etc)
+        /// </summary>
         public static readonly CVarDef<bool> AdminShowPIIOnBan =
             CVarDef.Create("admin.show_pii_onban", false, CVar.SERVERONLY);
 
@@ -1224,6 +1225,9 @@ namespace Content.Shared.CCVar
         /// </summary>
         public static readonly CVarDef<bool> OocEnableDuringRound =
             CVarDef.Create("ooc.enable_during_round", false, CVar.NOTIFY | CVar.REPLICATED | CVar.SERVER);
+        
+        public static readonly CVarDef<bool> ShowOocPatronColor =
+            CVarDef.Create("ooc.show_ooc_patron_color", true, CVar.ARCHIVE | CVar.REPLICATED | CVar.CLIENT);
 
         /*
          * LOOC
@@ -1586,6 +1590,13 @@ namespace Content.Shared.CCVar
         * Accessibility
         */
 
+        /// <summary>
+        /// Chat window opacity slider, controlling the alpha of the chat window background.
+        /// Goes from to 0 (completely transparent) to 1 (completely opaque)
+        /// </summary>
+        public static readonly CVarDef<float> ChatWindowOpacity =
+            CVarDef.Create("accessibility.chat_window_transparency", 0.85f, CVar.CLIENTONLY | CVar.ARCHIVE);
+
         /// <summary>
         /// Toggle for visual effects that may potentially cause motion sickness.
         /// Where reasonable, effects affected by this CVar should use an alternate effect.
diff --git a/Content.Shared/Cargo/Components/CargoBountyConsoleComponent.cs b/Content.Shared/Cargo/Components/CargoBountyConsoleComponent.cs
index 7b1acf836f..bf82a08127 100644
--- a/Content.Shared/Cargo/Components/CargoBountyConsoleComponent.cs
+++ b/Content.Shared/Cargo/Components/CargoBountyConsoleComponent.cs
@@ -32,16 +32,30 @@ public sealed partial class CargoBountyConsoleComponent : Component
     /// </summary>
     [DataField("printSound")]
     public SoundSpecifier PrintSound = new SoundPathSpecifier("/Audio/Machines/printer.ogg");
+
+    /// <summary>
+    /// The sound made when the bounty is skipped.
+    /// </summary>
+    [DataField("skipSound")]
+    public SoundSpecifier SkipSound = new SoundPathSpecifier("/Audio/Effects/Cargo/ping.ogg");
+
+    /// <summary>
+    /// The sound made when bounty skipping is denied due to lacking access.
+    /// </summary>
+    [DataField("denySound")]
+    public SoundSpecifier DenySound = new SoundPathSpecifier("/Audio/Effects/Cargo/buzz_two.ogg");
 }
 
 [NetSerializable, Serializable]
 public sealed class CargoBountyConsoleState : BoundUserInterfaceState
 {
     public List<CargoBountyData> Bounties;
+    public TimeSpan UntilNextSkip;
 
-    public CargoBountyConsoleState(List<CargoBountyData> bounties)
+    public CargoBountyConsoleState(List<CargoBountyData> bounties, TimeSpan untilNextSkip)
     {
         Bounties = bounties;
+        UntilNextSkip = untilNextSkip;
     }
 }
 
@@ -55,3 +69,14 @@ public sealed class BountyPrintLabelMessage : BoundUserInterfaceMessage
         BountyId = bountyId;
     }
 }
+
+[Serializable, NetSerializable]
+public sealed class BountySkipMessage : BoundUserInterfaceMessage
+{
+    public string BountyId;
+
+    public BountySkipMessage(string bountyId)
+    {
+        BountyId = bountyId;
+    }
+}
diff --git a/Content.Shared/Charges/Systems/SharedChargesSystem.cs b/Content.Shared/Charges/Systems/SharedChargesSystem.cs
index 021191ac26..5de1383cde 100644
--- a/Content.Shared/Charges/Systems/SharedChargesSystem.cs
+++ b/Content.Shared/Charges/Systems/SharedChargesSystem.cs
@@ -61,4 +61,26 @@ public abstract class SharedChargesSystem : EntitySystem
         if (Resolve(uid, ref comp, false))
             AddCharges(uid, -1, comp);
     }
+
+    /// <summary>
+    /// Gets the limited charges component and returns true if the number of charges remaining is less than the specified value.
+    /// Will return false if there is no limited charges component.
+    /// </summary>
+    public bool HasInsufficientCharges(EntityUid uid, int requiredCharges, LimitedChargesComponent? comp = null)
+    {
+        // can't be empty if there are no limited charges
+        if (!Resolve(uid, ref comp, false))
+            return false;
+
+        return comp.Charges < requiredCharges;
+    }
+
+    /// <summary>
+    /// Uses up a specified number of charges. Must check HasInsufficentCharges beforehand to prevent using with insufficient remaining charges.
+    /// </summary>
+    public virtual void UseCharges(EntityUid uid, int chargesUsed, LimitedChargesComponent? comp = null)
+    {
+        if (Resolve(uid, ref comp, false))
+            AddCharges(uid, -chargesUsed, comp);
+    }
 }
diff --git a/Content.Shared/Chat/TypingIndicator/TypingIndicatorPrototype.cs b/Content.Shared/Chat/TypingIndicator/TypingIndicatorPrototype.cs
index d139c253e7..9862096315 100644
--- a/Content.Shared/Chat/TypingIndicator/TypingIndicatorPrototype.cs
+++ b/Content.Shared/Chat/TypingIndicator/TypingIndicatorPrototype.cs
@@ -23,6 +23,6 @@ public sealed partial class TypingIndicatorPrototype : IPrototype
     public Vector2 Offset = new(0, 0);
 
     [DataField("shader")]
-    public string Shader = "unshaded";
+    public string Shader = "shaded";
 
 }
diff --git a/Content.Shared/Chemistry/Components/BlockSolutionAccessComponent.cs b/Content.Shared/Chemistry/Components/BlockSolutionAccessComponent.cs
new file mode 100644
index 0000000000..182f92d7d3
--- /dev/null
+++ b/Content.Shared/Chemistry/Components/BlockSolutionAccessComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Chemistry.Components;
+
+/// <summary>
+/// Blocks all attempts to access solutions contained by this entity.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class BlockSolutionAccessComponent : Component
+{
+}
diff --git a/Content.Shared/Chemistry/Components/HyposprayComponent.cs b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
index 05d202aaaa..05ef84bbaf 100644
--- a/Content.Shared/Chemistry/Components/HyposprayComponent.cs
+++ b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
@@ -30,4 +30,11 @@ public sealed partial class HyposprayComponent : Component
     [AutoNetworkedField]
     [DataField(required: true)]
     public bool OnlyAffectsMobs = false;
+
+    /// <summary>
+    /// Whether or not the hypospray is able to draw from containers or if it's a single use
+    /// device that can only inject.
+    /// </summary>
+    [DataField]
+    public bool InjectOnly = false;
 }
diff --git a/Content.Shared/Chemistry/Components/ScoopableSolutionComponent.cs b/Content.Shared/Chemistry/Components/ScoopableSolutionComponent.cs
new file mode 100644
index 0000000000..6c3f934b7a
--- /dev/null
+++ b/Content.Shared/Chemistry/Components/ScoopableSolutionComponent.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Chemistry.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Chemistry.Components;
+
+/// <summary>
+/// Basically reverse spiking, instead of using the solution-entity on a beaker, you use the beaker on the solution-entity.
+/// If there is not enough volume it will stay in the solution-entity rather than spill onto the floor.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(ScoopableSolutionSystem))]
+public sealed partial class ScoopableSolutionComponent : Component
+{
+    /// <summary>
+    /// Solution name that can be scooped from.
+    /// </summary>
+    [DataField]
+    public string Solution = "default";
+
+    /// <summary>
+    /// If true, when the whole solution is scooped up the entity will be deleted.
+    /// </summary>
+    [DataField]
+    public bool Delete = true;
+
+    /// <summary>
+    /// Popup to show the user when scooping.
+    /// Passed entities "scooped" and "beaker".
+    /// </summary>
+    [DataField]
+    public LocId Popup = "scoopable-component-popup";
+}
diff --git a/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs b/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
index 76e7967db2..1abe81180c 100644
--- a/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
@@ -5,4 +5,10 @@ public sealed partial class ExaminableSolutionComponent : Component
 {
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public string Solution = "default";
+
+    /// <summary>
+    /// If false then the hidden solution is always visible.
+    /// </summary>
+    [DataField]
+    public bool HeldOnly;
 }
diff --git a/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs b/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs
new file mode 100644
index 0000000000..84f1e45616
--- /dev/null
+++ b/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs
@@ -0,0 +1,53 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Robust.Shared.Network;
+
+namespace Content.Shared.Chemistry.EntitySystems;
+
+/// <summary>
+/// Handles solution transfer when a beaker is used on a scoopable entity.
+/// </summary>
+public sealed class ScoopableSolutionSystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _netManager = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
+    [Dependency] private readonly SolutionTransferSystem _solutionTransfer = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ScoopableSolutionComponent, InteractUsingEvent>(OnInteractUsing);
+    }
+
+    private void OnInteractUsing(Entity<ScoopableSolutionComponent> ent, ref InteractUsingEvent args)
+    {
+        TryScoop(ent, args.Used, args.User);
+    }
+
+    public bool TryScoop(Entity<ScoopableSolutionComponent> ent, EntityUid beaker, EntityUid user)
+    {
+        if (!_solution.TryGetSolution(ent.Owner, ent.Comp.Solution, out var src, out var srcSolution) ||
+            !_solution.TryGetRefillableSolution(beaker, out var target, out _))
+            return false;
+
+        var scooped = _solutionTransfer.Transfer(user, ent, src.Value, beaker, target.Value, srcSolution.Volume);
+        if (scooped == 0)
+            return false;
+
+        _popup.PopupClient(Loc.GetString(ent.Comp.Popup, ("scooped", ent.Owner), ("beaker", beaker)), user, user);
+
+        if (srcSolution.Volume == 0 && ent.Comp.Delete)
+        {
+            // deletion isnt predicted so do this to prevent spam clicking to see "the ash is empty!"
+            RemCompDeferred<ScoopableSolutionComponent>(ent);
+
+            if (!_netManager.IsClient)
+                QueueDel(ent);
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs
index f91e5621f0..b647d33c98 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs
@@ -27,7 +27,7 @@ public abstract class SharedHypospraySystem : EntitySystem
     // </summary>
     private void AddToggleModeVerb(Entity<HyposprayComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null || entity.Comp.InjectOnly)
             return;
 
         var (_, component) = entity;
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index 6e762aa598..5bb97e83eb 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -13,6 +13,8 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
+using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
 using Dependency = Robust.Shared.IoC.DependencyAttribute;
 
 namespace Content.Shared.Chemistry.EntitySystems;
@@ -53,6 +55,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     [Dependency] protected readonly ChemicalReactionSystem ChemicalReactionSystem = default!;
     [Dependency] protected readonly ExamineSystemShared ExamineSystem = default!;
     [Dependency] protected readonly SharedAppearanceSystem AppearanceSystem = default!;
+    [Dependency] protected readonly SharedHandsSystem Hands = default!;
     [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
 
     public override void Initialize()
@@ -133,6 +136,12 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     /// <inheritdoc cref="TryGetSolution"/>
     public bool TryGetSolution(Entity<SolutionContainerManagerComponent?> container, string? name, [NotNullWhen(true)] out Entity<SolutionComponent>? entity)
     {
+        if (TryComp(container, out BlockSolutionAccessComponent? blocker))
+        {
+            entity = null;
+            return false;
+        }
+
         EntityUid uid;
         if (name is null)
             uid = container;
@@ -178,6 +187,9 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         if (!Resolve(container, ref container.Comp, logMissing: false))
             yield break;
 
+        if (HasComp<BlockSolutionAccessComponent>(container))
+            yield break;
+
         foreach (var name in container.Comp.Containers)
         {
             if (ContainerSystem.GetContainer(container, $"solution@{name}") is ContainerSlot slot && slot.ContainedEntity is { } solutionId)
@@ -720,6 +732,9 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
             return;
         }
 
+        if (!CanSeeHiddenSolution(entity,args.Examiner))
+            return;
+
         var primaryReagent = solution.GetPrimaryReagentId();
 
         if (string.IsNullOrEmpty(primaryReagent?.Prototype))
@@ -816,6 +831,9 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
             return;
         }
 
+        if (!CanSeeHiddenSolution(entity,args.User))
+            return;
+
         var target = args.Target;
         var user = args.User;
         var verb = new ExamineVerb()
@@ -865,5 +883,22 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         return msg;
     }
 
+    /// <summary>
+    /// Check if examinable solution requires you to hold the item in hand.
+    /// </summary>
+    private bool CanSeeHiddenSolution(Entity<ExaminableSolutionComponent> entity, EntityUid examiner)
+    {
+        // If not held-only then it's always visible.
+        if (!entity.Comp.HeldOnly)
+            return true;
+
+        if (TryComp(examiner, out HandsComponent? handsComp))
+        {
+            return Hands.IsHolding(examiner, entity, out _, handsComp);
+        }
+
+        return true;
+    }
+
     #endregion Event Handlers
 }
diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
new file mode 100644
index 0000000000..34a64d0edb
--- /dev/null
+++ b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
@@ -0,0 +1,223 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Database;
+using Content.Shared.FixedPoint;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+
+namespace Content.Shared.Chemistry.EntitySystems;
+
+/// <summary>
+/// Allows an entity to transfer solutions with a customizable amount per click.
+/// Also provides <see cref="Transfer"/> API for other systems.
+/// </summary>
+public sealed class SolutionTransferSystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+
+    /// <summary>
+    ///     Default transfer amounts for the set-transfer verb.
+    /// </summary>
+    public static readonly FixedPoint2[] DefaultTransferAmounts = new FixedPoint2[] { 1, 5, 10, 25, 50, 100, 250, 500, 1000 };
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SolutionTransferComponent, GetVerbsEvent<AlternativeVerb>>(AddSetTransferVerbs);
+        SubscribeLocalEvent<SolutionTransferComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<SolutionTransferComponent, TransferAmountSetValueMessage>(OnTransferAmountSetValueMessage);
+    }
+
+    private void OnTransferAmountSetValueMessage(Entity<SolutionTransferComponent> ent, ref TransferAmountSetValueMessage message)
+    {
+        var newTransferAmount = FixedPoint2.Clamp(message.Value, ent.Comp.MinimumTransferAmount, ent.Comp.MaximumTransferAmount);
+        ent.Comp.TransferAmount = newTransferAmount;
+
+        if (message.Session.AttachedEntity is { Valid: true } user)
+            _popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", newTransferAmount)), ent, user);
+    }
+
+    private void AddSetTransferVerbs(Entity<SolutionTransferComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        var (uid, comp) = ent;
+
+        if (!args.CanAccess || !args.CanInteract || !comp.CanChangeTransferAmount || args.Hands == null)
+            return;
+
+        if (!TryComp<ActorComponent>(args.User, out var actor))
+            return;
+
+        // Custom transfer verb
+        args.Verbs.Add(new AlternativeVerb()
+        {
+            Text = Loc.GetString("comp-solution-transfer-verb-custom-amount"),
+            Category = VerbCategory.SetTransferAmount,
+            // TODO: remove server check when bui prediction is a thing
+            Act = () =>
+            {
+                if (_net.IsServer)
+                    _ui.TryOpen(uid, TransferAmountUiKey.Key, actor.PlayerSession);
+            },
+            Priority = 1
+        });
+
+        // Add specific transfer verbs according to the container's size
+        var priority = 0;
+        var user = args.User;
+        foreach (var amount in DefaultTransferAmounts)
+        {
+            AlternativeVerb verb = new();
+            verb.Text = Loc.GetString("comp-solution-transfer-verb-amount", ("amount", amount));
+            verb.Category = VerbCategory.SetTransferAmount;
+            verb.Act = () =>
+            {
+                comp.TransferAmount = amount;
+                _popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", amount)), uid, user);
+            };
+
+            // we want to sort by size, not alphabetically by the verb text.
+            verb.Priority = priority;
+            priority--;
+
+            args.Verbs.Add(verb);
+        }
+    }
+
+    private void OnAfterInteract(Entity<SolutionTransferComponent> ent, ref AfterInteractEvent args)
+    {
+        if (!args.CanReach || args.Target is not {} target)
+            return;
+
+        var (uid, comp) = ent;
+
+        //Special case for reagent tanks, because normally clicking another container will give solution, not take it.
+        if (comp.CanReceive
+            && !HasComp<RefillableSolutionComponent>(target) // target must not be refillable (e.g. Reagent Tanks)
+            && _solution.TryGetDrainableSolution(target, out var targetSoln, out _) // target must be drainable
+            && TryComp<RefillableSolutionComponent>(uid, out var refill)
+            && _solution.TryGetRefillableSolution((uid, refill, null), out var ownerSoln, out var ownerRefill))
+        {
+            var transferAmount = comp.TransferAmount; // This is the player-configurable transfer amount of "uid," not the target reagent tank.
+
+            // if the receiver has a smaller transfer limit, use that instead
+            if (refill?.MaxRefill is {} maxRefill)
+                transferAmount = FixedPoint2.Min(transferAmount, maxRefill);
+
+            var transferred = Transfer(args.User, target, targetSoln.Value, uid, ownerSoln.Value, transferAmount);
+            if (transferred > 0)
+            {
+                var toTheBrim = ownerRefill.AvailableVolume == 0;
+                var msg = toTheBrim
+                    ? "comp-solution-transfer-fill-fully"
+                    : "comp-solution-transfer-fill-normal";
+
+                _popup.PopupClient(Loc.GetString(msg, ("owner", args.Target), ("amount", transferred), ("target", uid)), uid, args.User);
+
+                args.Handled = true;
+                return;
+            }
+        }
+
+        // if target is refillable, and owner is drainable
+        if (comp.CanSend
+            && TryComp<RefillableSolutionComponent>(target, out var targetRefill)
+            && _solution.TryGetRefillableSolution((target, targetRefill, null), out targetSoln, out _)
+            && _solution.TryGetDrainableSolution(uid, out ownerSoln, out _))
+        {
+            var transferAmount = comp.TransferAmount;
+
+            if (targetRefill?.MaxRefill is {} maxRefill)
+                transferAmount = FixedPoint2.Min(transferAmount, maxRefill);
+
+            var transferred = Transfer(args.User, uid, ownerSoln.Value, target, targetSoln.Value, transferAmount);
+
+            if (transferred > 0)
+            {
+                var message = Loc.GetString("comp-solution-transfer-transfer-solution", ("amount", transferred), ("target", target));
+                _popup.PopupClient(message, uid, args.User);
+
+                args.Handled = true;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Transfer from a solution to another, allowing either entity to cancel it and show a popup.
+    /// </summary>
+    /// <returns>The actual amount transferred.</returns>
+    public FixedPoint2 Transfer(EntityUid user,
+        EntityUid sourceEntity,
+        Entity<SolutionComponent> source,
+        EntityUid targetEntity,
+        Entity<SolutionComponent> target,
+        FixedPoint2 amount)
+    {
+        var transferAttempt = new SolutionTransferAttemptEvent(sourceEntity, targetEntity);
+
+        // Check if the source is cancelling the transfer
+        RaiseLocalEvent(sourceEntity, ref transferAttempt);
+        if (transferAttempt.CancelReason is {} reason)
+        {
+            _popup.PopupClient(reason, sourceEntity, user);
+            return FixedPoint2.Zero;
+        }
+
+        var sourceSolution = source.Comp.Solution;
+        if (sourceSolution.Volume == 0)
+        {
+            _popup.PopupClient(Loc.GetString("comp-solution-transfer-is-empty", ("target", sourceEntity)), sourceEntity, user);
+            return FixedPoint2.Zero;
+        }
+
+        // Check if the target is cancelling the transfer
+        RaiseLocalEvent(targetEntity, ref transferAttempt);
+        if (transferAttempt.CancelReason is {} targetReason)
+        {
+            _popup.PopupClient(targetReason, targetEntity, user);
+            return FixedPoint2.Zero;
+        }
+
+        var targetSolution = target.Comp.Solution;
+        if (targetSolution.AvailableVolume == 0)
+        {
+            _popup.PopupClient(Loc.GetString("comp-solution-transfer-is-full", ("target", targetEntity)), targetEntity, user);
+            return FixedPoint2.Zero;
+        }
+
+        var actualAmount = FixedPoint2.Min(amount, FixedPoint2.Min(sourceSolution.Volume, targetSolution.AvailableVolume));
+
+        var solution = _solution.SplitSolution(source, actualAmount);
+        _solution.Refill(targetEntity, target, solution);
+
+        _adminLogger.Add(LogType.Action, LogImpact.Medium,
+            $"{ToPrettyString(user):player} transferred {SharedSolutionContainerSystem.ToPrettyString(solution)} to {ToPrettyString(targetEntity):target}, which now contains {SharedSolutionContainerSystem.ToPrettyString(targetSolution)}");
+
+        return actualAmount;
+    }
+}
+
+/// <summary>
+/// Raised when attempting to transfer from one solution to another.
+/// Raised on both the source and target entities so either can cancel the transfer.
+/// To not mispredict this should always be cancelled in shared code and not server or client.
+/// </summary>
+[ByRefEvent]
+public record struct SolutionTransferAttemptEvent(EntityUid From, EntityUid To, string? CancelReason = null)
+{
+    /// <summary>
+    /// Cancels the transfer.
+    /// </summary>
+    public void Cancel(string reason)
+    {
+        CancelReason = reason;
+    }
+}
diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
index f189db005b..85df04d20a 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -91,7 +91,7 @@ public abstract class ClothingSystem : EntitySystem
 
     private void ToggleVisualLayer(EntityUid equipee, HumanoidVisualLayers layer, string tag)
     {
-        InventorySystem.InventorySlotEnumerator enumerator = _invSystem.GetSlotEnumerator(equipee);
+        InventorySystem.InventorySlotEnumerator enumerator = _invSystem.GetSlotEnumerator(equipee, SlotFlags.HEAD ^ SlotFlags.MASK);
         bool shouldLayerShow = true;
 
         while (enumerator.NextItem(out EntityUid item))
@@ -164,7 +164,7 @@ public abstract class ClothingSystem : EntitySystem
     {
         if (args.Handled || args.Cancelled || args.Target is not { } target)
             return;
-        args.Handled = _invSystem.TryEquip(args.User, target, ent, args.Slot, clothing: ent.Comp,  predicted: true, checkDoafter: false);
+        args.Handled = _invSystem.TryEquip(args.User, target, ent, args.Slot, clothing: ent.Comp, predicted: true, checkDoafter: false);
     }
 
     private void OnUnequipDoAfter(Entity<ClothingComponent> ent, ref ClothingUnequipDoAfterEvent args)
diff --git a/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
index d48b99837f..604b067a84 100644
--- a/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
+++ b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
@@ -11,7 +11,7 @@ namespace Content.Shared.Communications
     public sealed class CommunicationsConsoleInterfaceState : BoundUserInterfaceState
     {
         public readonly bool CanAnnounce;
-        public readonly bool CanBroadcast;
+        public readonly bool CanBroadcast = true;
         public readonly bool CanCall;
         public readonly TimeSpan? ExpectedCountdownEnd;
         public readonly bool CountdownStarted;
diff --git a/Content.Shared/Construction/Components/ComputerBoardComponent.cs b/Content.Shared/Construction/Components/ComputerBoardComponent.cs
index f80a668778..539e09245d 100644
--- a/Content.Shared/Construction/Components/ComputerBoardComponent.cs
+++ b/Content.Shared/Construction/Components/ComputerBoardComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Construction.Components
@@ -9,7 +9,7 @@ namespace Content.Shared.Construction.Components
     [RegisterComponent]
     public sealed partial class ComputerBoardComponent : Component
     {
-        [DataField("prototype", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
+        [DataField("prototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string? Prototype { get; private set; }
     }
 }
diff --git a/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs b/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
index e9863f8364..a97b045cd8 100644
--- a/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
+++ b/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Construction.Conditions;
+using Content.Shared.Construction.Conditions;
 using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
diff --git a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
index 72586be1ec..4948cb6640 100644
--- a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
+++ b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
@@ -1,4 +1,5 @@
 using Robust.Shared.Audio;
+using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
@@ -17,6 +18,18 @@ public abstract partial class SharedDisposalUnitComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField("soundFlush")]
     public SoundSpecifier? FlushSound = new SoundPathSpecifier("/Audio/Machines/disposalflush.ogg");
 
+    /// <summary>
+    /// Blacklists (prevents) entities listed from being placed inside.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
+
+    /// <summary>
+    /// Whitelists (allows) entities listed from being placed inside.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
     /// <summary>
     /// Sound played when an object is inserted into the disposal unit.
     /// </summary>
@@ -33,20 +46,20 @@ public abstract partial class SharedDisposalUnitComponent : Component
     /// <summary>
     /// State for this disposals unit.
     /// </summary>
-    [DataField("state")]
+    [DataField]
     public DisposalsPressureState State;
 
     // TODO: Just make this use vaulting.
     /// <summary>
     /// We'll track whatever just left disposals so we know what collision we need to ignore until they stop intersecting our BB.
     /// </summary>
-    [ViewVariables, DataField("recentlyEjected")]
+    [ViewVariables, DataField]
     public List<EntityUid> RecentlyEjected = new();
 
     /// <summary>
     /// Next time the disposal unit will be pressurized.
     /// </summary>
-    [DataField("nextPressurized", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [DataField(customTypeSerializer:typeof(TimeOffsetSerializer))]
     public TimeSpan NextPressurized = TimeSpan.Zero;
 
     /// <summary>
@@ -58,63 +71,60 @@ public abstract partial class SharedDisposalUnitComponent : Component
     /// <summary>
     /// How long it takes from the start of a flush animation to return the sprite to normal.
     /// </summary>
-    [DataField("flushDelay")]
+    [DataField]
     public TimeSpan FlushDelay = TimeSpan.FromSeconds(3);
 
-    [DataField("mobsCanEnter")]
-    public bool MobsCanEnter = true;
-
     /// <summary>
     /// Removes the pressure requirement for flushing.
     /// </summary>
-    [DataField("disablePressure"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public bool DisablePressure;
 
     /// <summary>
-    ///     Last time that an entity tried to exit this disposal unit.
+    /// Last time that an entity tried to exit this disposal unit.
     /// </summary>
     [ViewVariables]
     public TimeSpan LastExitAttempt;
 
-    [DataField("autoEngageEnabled")]
+    [DataField]
     public bool AutomaticEngage = true;
 
     [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("autoEngageTime")]
+    [DataField]
     public TimeSpan AutomaticEngageTime = TimeSpan.FromSeconds(30);
 
     /// <summary>
-    ///     Delay from trying to enter disposals ourselves.
+    /// Delay from trying to enter disposals ourselves.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("entryDelay")]
+    [DataField]
     public float EntryDelay = 0.5f;
 
     /// <summary>
-    ///     Delay from trying to shove someone else into disposals.
+    /// Delay from trying to shove someone else into disposals.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
     public float DraggedEntryDelay = 2.0f;
 
     /// <summary>
-    ///     Container of entities inside this disposal unit.
+    /// Container of entities inside this disposal unit.
     /// </summary>
     [ViewVariables] public Container Container = default!;
 
     // TODO: Network power shit instead fam.
-    [ViewVariables, DataField("powered")]
+    [ViewVariables, DataField]
     public bool Powered;
 
     /// <summary>
     /// Was the disposals unit engaged for a manual flush.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("engaged")]
+    [ViewVariables(VVAccess.ReadWrite), DataField]
     public bool Engaged;
 
     /// <summary>
     /// Next time this unit will flush. Is the lesser of <see cref="FlushDelay"/> and <see cref="AutomaticEngageTime"/>
     /// </summary>
-    [ViewVariables, DataField("nextFlush", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [ViewVariables, DataField(customTypeSerializer:typeof(TimeOffsetSerializer))]
     public TimeSpan? NextFlush;
 
     [Serializable, NetSerializable]
@@ -130,8 +140,8 @@ public abstract partial class SharedDisposalUnitComponent : Component
     {
         UnAnchored,
         Anchored,
-        Flushing,
-        Charging
+        OverlayFlushing,
+        OverlayCharging
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
index 9afd683cbd..c39139f9a5 100644
--- a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
+++ b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
@@ -1,12 +1,10 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Body.Components;
 using Content.Shared.Disposal.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Item;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
 using Content.Shared.Throwing;
 using Robust.Shared.Audio;
 using Robust.Shared.Physics.Components;
@@ -26,7 +24,6 @@ public abstract class SharedDisposalUnitSystem : EntitySystem
 {
     [Dependency] protected readonly IGameTiming GameTiming = default!;
     [Dependency] protected readonly MetaDataSystem Metadata = default!;
-    [Dependency] private   readonly MobStateSystem _mobState = default!;
     [Dependency] protected readonly SharedJointSystem Joints = default!;
 
     protected static TimeSpan ExitAttemptDelay = TimeSpan.FromSeconds(0.5);
@@ -112,19 +109,21 @@ public abstract class SharedDisposalUnitSystem : EntitySystem
         if (!Transform(uid).Anchored)
             return false;
 
-        // TODO: Probably just need a disposable tag.
         var storable = HasComp<ItemComponent>(entity);
         if (!storable && !HasComp<BodyComponent>(entity))
             return false;
 
-        //Check if the entity is a mob and if mobs can be inserted
-        if (TryComp<MobStateComponent>(entity, out var damageState) && !component.MobsCanEnter)
+        if (component.Blacklist?.IsValid(entity, EntityManager) == true)
             return false;
 
-        if (TryComp<PhysicsComponent>(entity, out var physics) && (physics.CanCollide || storable))
-            return true;
+        if (component.Whitelist != null && component.Whitelist?.IsValid(entity, EntityManager) != true)
+            return false;
+
+        if (TryComp<PhysicsComponent>(entity, out var physics) && (physics.CanCollide) || storable)
+            return true;
+        else
+            return false;
 
-        return damageState != null && (!component.MobsCanEnter || _mobState.IsDead(entity, damageState));
     }
 
     public abstract void DoInsertDisposalUnit(EntityUid uid, EntityUid toInsert, EntityUid user, SharedDisposalUnitComponent? disposal = null);
diff --git a/Content.Shared/Doors/Electronics/DoorElectronicsComponent.cs b/Content.Shared/Doors/Electronics/DoorElectronicsComponent.cs
new file mode 100644
index 0000000000..3e9f279ee5
--- /dev/null
+++ b/Content.Shared/Doors/Electronics/DoorElectronicsComponent.cs
@@ -0,0 +1,42 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+using Robust.Shared.Prototypes;
+using Content.Shared.Access;
+
+namespace Content.Shared.Doors.Electronics;
+
+/// <summary>
+/// Allows an entity's AccessReader to be configured via UI.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class DoorElectronicsComponent : Component
+{
+}
+
+[Serializable, NetSerializable]
+public sealed class DoorElectronicsUpdateConfigurationMessage : BoundUserInterfaceMessage
+{
+    public List<ProtoId<AccessLevelPrototype>> AccessList;
+
+    public DoorElectronicsUpdateConfigurationMessage(List<ProtoId<AccessLevelPrototype>> accessList)
+    {
+        AccessList = accessList;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class DoorElectronicsConfigurationState : BoundUserInterfaceState
+{
+    public List<ProtoId<AccessLevelPrototype>> AccessList;
+
+    public DoorElectronicsConfigurationState(List<ProtoId<AccessLevelPrototype>> accessList)
+    {
+        AccessList = accessList;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum DoorElectronicsConfigurationUiKey : byte
+{
+    Key
+}
diff --git a/Content.Shared/Fluids/Components/SpillableComponent.cs b/Content.Shared/Fluids/Components/SpillableComponent.cs
index 428d91f2de..51bb73a11f 100644
--- a/Content.Shared/Fluids/Components/SpillableComponent.cs
+++ b/Content.Shared/Fluids/Components/SpillableComponent.cs
@@ -29,4 +29,10 @@ public sealed partial class SpillableComponent : Component
     /// </summary>
     [DataField]
     public FixedPoint2 MaxMeleeSpillAmount = FixedPoint2.New(20);
+
+    /// <summary>
+    ///     Should this item be spilled when thrown?
+    /// </summary>
+    [DataField]
+    public bool SpillWhenThrown = true;
 }
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
index 1e9e742a38..f88f13e8b0 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.Examine;
@@ -12,7 +13,7 @@ namespace Content.Shared.Fluids;
 
 public abstract partial class SharedPuddleSystem
 {
-    [Dependency] protected readonly SharedOpenableSystem Openable = default!;
+    [Dependency] protected readonly OpenableSystem Openable = default!;
 
     protected virtual void InitializeSpillable()
     {
@@ -62,6 +63,12 @@ public abstract partial class SharedPuddleSystem
             {
                 var puddleSolution = _solutionContainerSystem.SplitSolution(soln.Value, solution.Volume);
                 TrySpillAt(Transform(target).Coordinates, puddleSolution, out _);
+
+                if (TryComp<InjectorComponent>(entity, out var injectorComp))
+                {
+                    injectorComp.ToggleState = InjectorToggleMode.Draw;
+                    Dirty(entity, injectorComp);
+                }
             };
         }
         else
diff --git a/Content.Shared/Hands/Components/HandsComponent.cs b/Content.Shared/Hands/Components/HandsComponent.cs
index 904b10b3bd..f1f25a69f7 100644
--- a/Content.Shared/Hands/Components/HandsComponent.cs
+++ b/Content.Shared/Hands/Components/HandsComponent.cs
@@ -31,6 +31,12 @@ public sealed partial class HandsComponent : Component
     /// </summary>
     public List<string> SortedHands = new();
 
+    /// <summary>
+    ///     If true, the items in the hands won't be affected by explosions.
+    /// </summary>
+    [DataField]
+    public bool DisableExplosionRecursion = false;
+
     /// <summary>
     ///     The amount of throw impulse per distance the player is from the throw target.
     /// </summary>
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
index e071cdc693..7b169b5d0a 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
@@ -134,8 +134,10 @@ public abstract partial class SharedHandsSystem
             return true;
         }
 
+        var (itemPos, itemRot) = TransformSystem.GetWorldPositionRotation(entity);
+        var origin = new MapCoordinates(itemPos, itemXform.MapID);
         var target = targetDropLocation.Value.ToMap(EntityManager, TransformSystem);
-        TransformSystem.SetWorldPosition(itemXform, GetFinalDropCoordinates(uid, userXform.MapPosition, target));
+        TransformSystem.SetWorldPositionRotation(entity, GetFinalDropCoordinates(uid, origin, target), itemRot);
         return true;
     }
 
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index c87f244f57..8d73915467 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -1,6 +1,8 @@
 using System.Linq;
+using Content.Shared.Examine;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Preferences;
 using Robust.Shared.GameObjects.Components.Localization;
 using Robust.Shared.Network;
@@ -20,7 +22,7 @@ namespace Content.Shared.Humanoid;
 public abstract class SharedHumanoidAppearanceSystem : EntitySystem
 {
     [Dependency] private readonly INetManager _netManager = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly MarkingManager _markingManager = default!;
 
     [ValidatePrototypeId<SpeciesPrototype>]
@@ -39,7 +41,9 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<HumanoidAppearanceComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<HumanoidAppearanceComponent, ExaminedEvent>(OnExamined);
     }
 
     private void OnInit(EntityUid uid, HumanoidAppearanceComponent humanoid, ComponentInit args)
@@ -50,7 +54,7 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
         }
 
         if (string.IsNullOrEmpty(humanoid.Initial)
-            || !_prototypeManager.TryIndex(humanoid.Initial, out HumanoidProfilePrototype? startingSet))
+            || !_proto.TryIndex(humanoid.Initial, out HumanoidProfilePrototype? startingSet))
         {
             LoadProfile(uid, HumanoidCharacterProfile.DefaultWithSpecies(humanoid.Species), humanoid);
             return;
@@ -65,6 +69,15 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
         LoadProfile(uid, startingSet.Profile, humanoid);
     }
 
+    private void OnExamined(EntityUid uid, HumanoidAppearanceComponent component, ExaminedEvent args)
+    {
+        var identity = Identity.Entity(uid, EntityManager);
+        var species = GetSpeciesRepresentation(component.Species).ToLower();
+        var age = GetAgeRepresentation(component.Species, component.Age);
+
+        args.PushText(Loc.GetString("humanoid-appearance-component-examine", ("user", identity), ("age", age), ("species", species)));
+    }
+
     /// <summary>
     ///     Toggles a humanoid's sprite layer visibility.
     /// </summary>
@@ -154,7 +167,7 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
         bool sync = true,
         HumanoidAppearanceComponent? humanoid = null)
     {
-        if (!Resolve(uid, ref humanoid) || !_prototypeManager.TryIndex<SpeciesPrototype>(species, out var prototype))
+        if (!Resolve(uid, ref humanoid) || !_proto.TryIndex<SpeciesPrototype>(species, out var prototype))
         {
             return;
         }
@@ -162,7 +175,7 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
         humanoid.Species = species;
         humanoid.MarkingSet.EnsureSpecies(species, humanoid.BodyType, humanoid.SkinColor, _markingManager);
         var oldMarkings = humanoid.MarkingSet.GetForwardEnumerator().ToList();
-        humanoid.MarkingSet = new MarkingSet(oldMarkings, prototype.MarkingPoints, _markingManager, _prototypeManager);
+        humanoid.MarkingSet = new MarkingSet(oldMarkings, prototype.MarkingPoints, _markingManager, _proto);
 
         if (sync)
         {
@@ -189,7 +202,7 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
         if (!Resolve(uid, ref humanoid))
             return;
 
-        if (!_prototypeManager.TryIndex(humanoid.Species, out var species))
+        if (!_proto.TryIndex(humanoid.Species, out var species))
         {
             return;
         }
@@ -284,7 +297,7 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
 
     public List<BodyTypePrototype> GetValidBodyTypes(SpeciesPrototype species, Sex sex)
     {
-        return species.BodyTypes.Select(protoId => _prototypeManager.Index<BodyTypePrototype>(protoId))
+        return species.BodyTypes.Select(protoId => _proto.Index<BodyTypePrototype>(protoId))
             .Where(proto => !proto.SexRestrictions.Contains(sex.ToString())).ToList();
     }
 
@@ -337,30 +350,30 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
         // Hair/facial hair - this may eventually be deprecated.
         // We need to ensure hair before applying it or coloring can try depend on markings that can be invalid
         var hairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.Hair, out var hairAlpha,
-            _prototypeManager)
+            _proto)
             ? profile.Appearance.SkinColor.WithAlpha(hairAlpha)
             : profile.Appearance.HairColor;
 
         var facialHairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.FacialHair,
-            out var facialHairAlpha, _prototypeManager)
+            out var facialHairAlpha, _proto)
             ? profile.Appearance.SkinColor.WithAlpha(facialHairAlpha)
             : profile.Appearance.FacialHairColor;
 
         if (_markingManager.Markings.TryGetValue(profile.Appearance.HairStyleId, out var hairPrototype) &&
-            _markingManager.CanBeApplied(profile.Species, profile.Sex, hairPrototype, _prototypeManager))
+            _markingManager.CanBeApplied(profile.Species, profile.Sex, hairPrototype, _proto))
         {
             AddMarking(uid, profile.Appearance.HairStyleId, hairColor, false);
         }
 
         if (_markingManager.Markings.TryGetValue(profile.Appearance.FacialHairStyleId, out var facialHairPrototype) &&
-            _markingManager.CanBeApplied(profile.Species, profile.Sex, facialHairPrototype, _prototypeManager))
+            _markingManager.CanBeApplied(profile.Species, profile.Sex, facialHairPrototype, _proto))
         {
             AddMarking(uid, profile.Appearance.FacialHairStyleId, facialHairColor, false);
         }
 
         humanoid.MarkingSet.EnsureSpecies(profile.Species, profile.BodyType, profile.Appearance.SkinColor,
             _markingManager,
-            _prototypeManager);
+            _proto);
 
         // Finally adding marking with forced colors
         foreach (var (marking, prototype) in markingFColored)
@@ -470,4 +483,39 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
         if (sync)
             Dirty(uid, humanoid);
     }
+
+    /// <summary>
+    /// Takes ID of the species prototype, returns UI-friendly name of the species.
+    /// </summary>
+    public string GetSpeciesRepresentation(string speciesId)
+    {
+        if (_proto.TryIndex<SpeciesPrototype>(speciesId, out var species))
+        {
+            return Loc.GetString(species.Name);
+        }
+
+        Log.Error("Tried to get representation of unknown species: {speciesId}");
+        return Loc.GetString("humanoid-appearance-component-unknown-species");
+    }
+
+    public string GetAgeRepresentation(string species, int age)
+    {
+        if (!_proto.TryIndex<SpeciesPrototype>(species, out var speciesPrototype))
+        {
+            Log.Error("Tried to get age representation of species that couldn't be indexed: " + species);
+            return Loc.GetString("identity-age-young");
+        }
+
+        if (age < speciesPrototype.YoungAge)
+        {
+            return Loc.GetString("identity-age-young");
+        }
+
+        if (age < speciesPrototype.OldAge)
+        {
+            return Loc.GetString("identity-age-middle-aged");
+        }
+
+        return Loc.GetString("identity-age-old");
+    }
 }
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index bc7a605e50..0183b1b186 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -689,7 +689,7 @@ namespace Content.Shared.Interaction
             if (!inRange && popup && _gameTiming.IsFirstTimePredicted)
             {
                 var message = Loc.GetString("interaction-system-user-interaction-cannot-reach");
-                _popupSystem.PopupEntity(message, origin, origin);
+                _popupSystem.PopupClient(message, origin, origin);
             }
 
             return inRange;
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index 233b9a60a2..2dd2b1da0d 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
+using Content.Shared.Construction.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Examine;
@@ -9,6 +10,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Storage.Components;
 using Content.Shared.Verbs;
+using Content.Shared.Wires;
 using JetBrains.Annotations;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Utility;
@@ -40,6 +42,10 @@ public sealed class LockSystem : EntitySystem
         SubscribeLocalEvent<LockComponent, GotEmaggedEvent>(OnEmagged);
         SubscribeLocalEvent<LockComponent, LockDoAfter>(OnDoAfterLock);
         SubscribeLocalEvent<LockComponent, UnlockDoAfter>(OnDoAfterUnlock);
+
+        SubscribeLocalEvent<LockedWiresPanelComponent, LockToggleAttemptEvent>(OnLockToggleAttempt);
+        SubscribeLocalEvent<LockedWiresPanelComponent, AttemptChangePanelEvent>(OnAttemptChangePanel);
+        SubscribeLocalEvent<LockedAnchorableComponent, UnanchorAttemptEvent>(OnUnanchorAttempt);
     }
 
     private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup args)
@@ -231,7 +237,7 @@ public sealed class LockSystem : EntitySystem
 
     private void AddToggleLockVerb(EntityUid uid, LockComponent component, GetVerbsEvent<AlternativeVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract || !CanToggleLock(uid, args.User))
+        if (!args.CanAccess || !args.CanInteract)
             return;
 
         AlternativeVerb verb = new()
@@ -240,9 +246,9 @@ public sealed class LockSystem : EntitySystem
                 ? () => TryUnlock(uid, args.User, component)
                 : () => TryLock(uid, args.User, component),
             Text = Loc.GetString(component.Locked ? "toggle-lock-verb-unlock" : "toggle-lock-verb-lock"),
-            Icon = component.Locked
-                ? new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/unlock.svg.192dpi.png"))
-                : new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/lock.svg.192dpi.png")),
+            Icon = !component.Locked
+                ? new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/lock.svg.192dpi.png"))
+                : new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/unlock.svg.192dpi.png")),
         };
 
         args.Verbs.Add(verb);
@@ -281,4 +287,52 @@ public sealed class LockSystem : EntitySystem
 
         TryUnlock(uid, args.User, skipDoAfter: true);
     }
+
+    private void OnLockToggleAttempt(Entity<LockedWiresPanelComponent> ent, ref LockToggleAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!TryComp<WiresPanelComponent>(ent, out var panel) || !panel.Open)
+            return;
+
+        if (!args.Silent)
+        {
+            _sharedPopupSystem.PopupClient(Loc.GetString("construction-step-condition-wire-panel-close"),
+                ent,
+                args.User);
+        }
+        args.Cancelled = true;
+    }
+
+
+    private void OnAttemptChangePanel(Entity<LockedWiresPanelComponent> ent, ref AttemptChangePanelEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!TryComp<LockComponent>(ent, out var lockComp) || !lockComp.Locked)
+            return;
+
+        _sharedPopupSystem.PopupClient(Loc.GetString("lock-comp-generic-fail",
+            ("target", Identity.Entity(ent, EntityManager))),
+            ent,
+            args.User);
+        args.Cancelled = true;
+    }
+
+    private void OnUnanchorAttempt(Entity<LockedAnchorableComponent> ent, ref UnanchorAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!TryComp<LockComponent>(ent, out var lockComp) || !lockComp.Locked)
+            return;
+
+        _sharedPopupSystem.PopupClient(Loc.GetString("lock-comp-generic-fail",
+                ("target", Identity.Entity(ent, EntityManager))),
+            ent,
+            args.User);
+        args.Cancel();
+    }
 }
\ No newline at end of file
diff --git a/Content.Shared/Lock/LockedAnchorableComponent.cs b/Content.Shared/Lock/LockedAnchorableComponent.cs
new file mode 100644
index 0000000000..781b7f6532
--- /dev/null
+++ b/Content.Shared/Lock/LockedAnchorableComponent.cs
@@ -0,0 +1,13 @@
+using Content.Shared.Construction.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Lock;
+
+/// <summary>
+/// This is used for a <see cref="AnchorableComponent"/> that cannot be unanchored while locked.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(LockSystem))]
+public sealed partial class LockedAnchorableComponent : Component
+{
+
+}
diff --git a/Content.Shared/Lock/LockedWiresPanelComponent.cs b/Content.Shared/Lock/LockedWiresPanelComponent.cs
new file mode 100644
index 0000000000..1dbe6a4932
--- /dev/null
+++ b/Content.Shared/Lock/LockedWiresPanelComponent.cs
@@ -0,0 +1,13 @@
+using Content.Shared.Wires;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Lock;
+
+/// <summary>
+/// This is used for a <see cref="WiresPanelComponent"/> that cannot be opened while locked.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(LockSystem))]
+public sealed partial class LockedWiresPanelComponent : Component
+{
+
+}
diff --git a/Content.Shared/Medical/SuitSensor/SharedSuitSensor.cs b/Content.Shared/Medical/SuitSensor/SharedSuitSensor.cs
index 07e0eca33b..e3ca466b08 100644
--- a/Content.Shared/Medical/SuitSensor/SharedSuitSensor.cs
+++ b/Content.Shared/Medical/SuitSensor/SharedSuitSensor.cs
@@ -23,6 +23,8 @@ public sealed class SuitSensorStatus
     public List<string> JobDepartments;
     public bool IsAlive;
     public int? TotalDamage;
+    public int? TotalDamageThreshold;
+    public float? DamagePercentage => TotalDamageThreshold == null || TotalDamage == null ? null : TotalDamage / TotalDamageThreshold;
     public NetCoordinates? Coordinates;
 }
 
@@ -58,6 +60,7 @@ public static class SuitSensorConstants
     public const string NET_JOB_DEPARTMENTS = "jobDepartments";
     public const string NET_IS_ALIVE = "alive";
     public const string NET_TOTAL_DAMAGE = "vitals";
+    public const string NET_TOTAL_DAMAGE_THRESHOLD = "vitalsThreshold";
     public const string NET_COORDINATES = "coords";
     public const string NET_SUIT_SENSOR_UID = "uid";
 
diff --git a/Content.Shared/Nutrition/Components/OpenableComponent.cs b/Content.Shared/Nutrition/Components/OpenableComponent.cs
index 3a230fc765..0381888e28 100644
--- a/Content.Shared/Nutrition/Components/OpenableComponent.cs
+++ b/Content.Shared/Nutrition/Components/OpenableComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Shared.Nutrition.Components;
 /// Starts closed, open it with Z or E.
 /// </summary>
 [NetworkedComponent, AutoGenerateComponentState]
-[RegisterComponent, Access(typeof(SharedOpenableSystem))]
+[RegisterComponent, Access(typeof(OpenableSystem))]
 public sealed partial class OpenableComponent : Component
 {
     /// <summary>
diff --git a/Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
similarity index 91%
rename from Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs
rename to Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
index f3b1127578..0ad0877d22 100644
--- a/Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
@@ -13,7 +14,7 @@ namespace Content.Shared.Nutrition.EntitySystems;
 /// <summary>
 /// Provides API for openable food and drinks, handles opening on use and preventing transfer when closed.
 /// </summary>
-public abstract partial class SharedOpenableSystem : EntitySystem
+public sealed partial class OpenableSystem : EntitySystem
 {
     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
@@ -29,6 +30,7 @@ public abstract partial class SharedOpenableSystem : EntitySystem
         SubscribeLocalEvent<OpenableComponent, MeleeHitEvent>(HandleIfClosed);
         SubscribeLocalEvent<OpenableComponent, AfterInteractEvent>(HandleIfClosed);
         SubscribeLocalEvent<OpenableComponent, GetVerbsEvent<Verb>>(AddOpenCloseVerbs);
+        SubscribeLocalEvent<OpenableComponent, SolutionTransferAttemptEvent>(OnTransferAttempt);
     }
 
     private void OnInit(EntityUid uid, OpenableComponent comp, ComponentInit args)
@@ -89,6 +91,15 @@ public abstract partial class SharedOpenableSystem : EntitySystem
         args.Verbs.Add(verb);
     }
 
+    private void OnTransferAttempt(Entity<OpenableComponent> ent, ref SolutionTransferAttemptEvent args)
+    {
+        if (!ent.Comp.Opened)
+        {
+            // message says its just for drinks, shouldn't matter since you typically dont have a food that is openable and can be poured out
+            args.Cancel(Loc.GetString("drink-component-try-use-drink-not-open", ("owner", ent.Owner)));
+        }
+    }
+
     /// <summary>
     /// Returns true if the entity either does not have OpenableComponent or it is opened.
     /// Drinks that don't have OpenableComponent are automatically open, so it returns true.
diff --git a/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs b/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs
index b0873f23a1..414b8d182b 100644
--- a/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs
@@ -11,7 +11,7 @@ public sealed partial class SealableSystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<SealableComponent, ExaminedEvent>(OnExamined, after: new[] { typeof(SharedOpenableSystem) });
+        SubscribeLocalEvent<SealableComponent, ExaminedEvent>(OnExamined, after: new[] { typeof(OpenableSystem) });
         SubscribeLocalEvent<SealableComponent, OpenableOpenedEvent>(OnOpened);
     }
 
diff --git a/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs b/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
index 2e1bdc4383..07032a00ce 100644
--- a/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
+++ b/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Mind;
 using Content.Shared.Objectives;
 using Content.Shared.Objectives.Components;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Objectives.Systems;
@@ -11,6 +12,7 @@ namespace Content.Shared.Objectives.Systems;
 public abstract class SharedObjectivesSystem : EntitySystem
 {
     [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
 
     private EntityQuery<MetaDataComponent> _metaQuery;
 
@@ -55,6 +57,9 @@ public abstract class SharedObjectivesSystem : EntitySystem
     /// </summary>
     public EntityUid? TryCreateObjective(EntityUid mindId, MindComponent mind, string proto)
     {
+        if (!_protoMan.HasIndex<EntityPrototype>(proto))
+            return null;
+
         var uid = Spawn(proto);
         if (!TryComp<ObjectiveComponent>(uid, out var comp))
         {
diff --git a/Content.Shared/Paint/PaintComponent.cs b/Content.Shared/Paint/PaintComponent.cs
deleted file mode 100644
index ad09f4ca73..0000000000
--- a/Content.Shared/Paint/PaintComponent.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Audio;
-using Content.Shared.Whitelist;
-using Robust.Shared.Prototypes;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Paint;
-
-/// <summary>
-/// Entity when used on another entity will paint target entity.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(SharedPaintSystem))]
-public sealed partial class PaintComponent : Component
-{
-    /// <summary>
-    /// Noise made when paint applied.
-    /// </summary>
-    [DataField]
-    public SoundSpecifier Spray = new SoundPathSpecifier("/Audio/Effects/spray2.ogg");
-
-    /// <summary>
-    /// Solution on the entity that contains the paint.
-    /// </summary>
-    [DataField]
-    public string Solution = "drink";
-
-    /// <summary>
-    /// How long the doafter will take.
-    /// </summary>
-    [DataField]
-    public int Delay = 2;
-
-    /// <summary>
-    /// Reagent that will be used as paint.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public ProtoId<ReagentPrototype> Reagent = "SpaceGlue";
-
-    /// <summary>
-    /// Color that the painting entity will instruct the painted entity to be.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public Color Color = Color.FromHex("#c62121");
-
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public EntityWhitelist? Blacklist;
-    /// <summary>
-    /// Reagent consumption per use.
-    /// </summary>
-    [DataField]
-    public FixedPoint2 ConsumptionUnit = FixedPoint2.New(5);
-
-    /// <summary>
-    /// Duration per unit
-    /// </summary>
-    [DataField]
-    public TimeSpan DurationPerUnit = TimeSpan.FromSeconds(6);
-}
diff --git a/Content.Shared/Paint/PaintDoAfterEvent.cs b/Content.Shared/Paint/PaintDoAfterEvent.cs
deleted file mode 100644
index 0851f1541b..0000000000
--- a/Content.Shared/Paint/PaintDoAfterEvent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.DoAfter;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Paint;
-
-[Serializable, NetSerializable]
-public sealed partial class PaintDoAfterEvent : SimpleDoAfterEvent
-{
-}
diff --git a/Content.Shared/Paint/PaintRemoverComponent.cs b/Content.Shared/Paint/PaintRemoverComponent.cs
deleted file mode 100644
index 54d0ed7a71..0000000000
--- a/Content.Shared/Paint/PaintRemoverComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Audio;
-
-namespace Content.Shared.Paint;
-
-/// <summary>
-///  Removes paint from an entity that was painted with spray paint.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-[Access(typeof(PaintRemoverSystem))]
-public sealed partial class PaintRemoverComponent : Component
-{
-    /// <summary>
-    /// Sound when target is cleaned.
-    /// </summary>
-    [DataField]
-    public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Effects/Fluids/watersplash.ogg");
-
-    /// <summary>
-    /// DoAfter wait time.
-    /// </summary>
-    [DataField]
-    public float CleanDelay = 2f;
-}
diff --git a/Content.Shared/Paint/PaintRemoverDoAfterEvent.cs b/Content.Shared/Paint/PaintRemoverDoAfterEvent.cs
deleted file mode 100644
index 940b1aa513..0000000000
--- a/Content.Shared/Paint/PaintRemoverDoAfterEvent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.DoAfter;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Paint;
-
-[Serializable, NetSerializable]
-public sealed partial class PaintRemoverDoAfterEvent : SimpleDoAfterEvent
-{
-}
diff --git a/Content.Shared/Paint/PaintRemoverSystem.cs b/Content.Shared/Paint/PaintRemoverSystem.cs
deleted file mode 100644
index efc1ded067..0000000000
--- a/Content.Shared/Paint/PaintRemoverSystem.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using Content.Shared.Popups;
-using Content.Shared.Interaction;
-using Content.Shared.DoAfter;
-using Content.Shared.Verbs;
-using Content.Shared.Sprite;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.Paint;
-
-/// <summary>
-/// Removes paint from an entity.
-/// </summary>
-public sealed class PaintRemoverSystem : SharedPaintSystem
-{
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<PaintRemoverComponent, AfterInteractEvent>(OnInteract);
-        SubscribeLocalEvent<PaintRemoverComponent, PaintRemoverDoAfterEvent>(OnDoAfter);
-        SubscribeLocalEvent<PaintRemoverComponent, GetVerbsEvent<UtilityVerb>>(OnPaintRemoveVerb);
-    }
-
-    // When entity is painted, remove paint from that entity.
-    private void OnInteract(EntityUid uid, PaintRemoverComponent component, AfterInteractEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        if (!args.CanReach || args.Target is not { Valid: true } target || !HasComp<PaintedComponent>(target))
-            return;
-
-        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.CleanDelay, new PaintRemoverDoAfterEvent(), uid, args.Target, uid)
-        {
-            BreakOnMove = true,
-            BreakOnDamage = true,
-            MovementThreshold = 1.0f,
-        });
-        args.Handled = true;
-    }
-
-    private void OnDoAfter(EntityUid uid, PaintRemoverComponent component, DoAfterEvent args)
-    {
-        if (args.Cancelled || args.Handled || args.Args.Target == null)
-            return;
-
-        if (args.Target is not { Valid: true } target)
-            return;
-
-        if (!TryComp(target, out PaintedComponent? paint))
-            return;
-
-        paint.Enabled = false;
-        _audio.PlayPredicted(component.Sound, target, args.User);
-        _popup.PopupClient(Loc.GetString("paint-removed", ("target", target)), args.User, args.User, PopupType.Medium);
-        _appearanceSystem.SetData(target, PaintVisuals.Painted, false);
-        RemComp<PaintedComponent>(target);
-        Dirty(target, paint);
-
-        args.Handled = true;
-    }
-
-    private void OnPaintRemoveVerb(EntityUid uid, PaintRemoverComponent component, GetVerbsEvent<UtilityVerb> args)
-    {
-        if (!args.CanInteract || !args.CanAccess)
-            return;
-
-        var paintremovalText = Loc.GetString("paint-remove-verb");
-
-        var verb = new UtilityVerb()
-        {
-            Act = () =>
-            {
-
-                _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.CleanDelay, new PaintRemoverDoAfterEvent(), uid, args.Target, uid)
-                {
-                    BreakOnMove = true,
-                    BreakOnDamage = true,
-                    MovementThreshold = 1.0f,
-                });
-            },
-
-            Text = paintremovalText
-        };
-
-        args.Verbs.Add(verb);
-    }
-}
diff --git a/Content.Shared/Paint/PaintedComponent.cs b/Content.Shared/Paint/PaintedComponent.cs
deleted file mode 100644
index a6ee7377e1..0000000000
--- a/Content.Shared/Paint/PaintedComponent.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Paint;
-
-/// <summary>
-/// Component applied to target entity when painted.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class PaintedComponent : Component
-{
-    /// <summary>
-    ///  Color of the paint.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public Color Color = Color.FromHex("#2cdbd5");
-
-    /// <summary>
-    ///  Used to remove the color when component removed.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public Color BeforeColor;
-
-    /// <summary>
-    /// If paint is enabled.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Enabled;
-
-    /// <summary>
-    /// Name of the shader.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public string ShaderName = "Greyscale";
-}
-
-[Serializable, NetSerializable]
-public enum PaintVisuals : byte
-{
-    Painted,
-}
diff --git a/Content.Shared/Paint/SharedPaintSystem.cs b/Content.Shared/Paint/SharedPaintSystem.cs
deleted file mode 100644
index 10185817b8..0000000000
--- a/Content.Shared/Paint/SharedPaintSystem.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Content.Shared.Paint;
-
-/// <summary>
-/// Colors target and consumes reagent on each color success.
-/// </summary>
-public abstract class SharedPaintSystem : EntitySystem
-{
-    public virtual void UpdateAppearance(EntityUid uid, PaintedComponent? component = null)
-    {
-    }
-}
diff --git a/Content.Server/Plants/Components/PottedPlantHideComponent.cs b/Content.Shared/Plants/PottedPlantHideComponent.cs
similarity index 80%
rename from Content.Server/Plants/Components/PottedPlantHideComponent.cs
rename to Content.Shared/Plants/PottedPlantHideComponent.cs
index bc35bbe44f..2e02272494 100644
--- a/Content.Server/Plants/Components/PottedPlantHideComponent.cs
+++ b/Content.Shared/Plants/PottedPlantHideComponent.cs
@@ -1,8 +1,7 @@
-using Content.Server.Plants.Systems;
-using Content.Server.Storage.Components;
+using Content.Shared.Storage.Components;
 using Robust.Shared.Audio;
 
-namespace Content.Server.Plants.Components
+namespace Content.Shared.Plants
 {
     /// <summary>
     ///     Interaction wrapper for <see cref="SecretStashComponent"/>.
diff --git a/Content.Server/Plants/Systems/PottedPlantHideSystem.cs b/Content.Shared/Plants/PottedPlantHideSystem.cs
similarity index 86%
rename from Content.Server/Plants/Systems/PottedPlantHideSystem.cs
rename to Content.Shared/Plants/PottedPlantHideSystem.cs
index 09571c60a1..fd256fd926 100644
--- a/Content.Server/Plants/Systems/PottedPlantHideSystem.cs
+++ b/Content.Shared/Plants/PottedPlantHideSystem.cs
@@ -1,18 +1,15 @@
-using Content.Server.Plants.Components;
-using Content.Server.Popups;
-using Content.Server.Storage.Components;
-using Content.Server.Storage.EntitySystems;
-using Content.Shared.Audio;
+using Content.Shared.Popups;
+using Content.Shared.Storage.Components;
+using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Interaction;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
 
-namespace Content.Server.Plants.Systems
+namespace Content.Shared.Plants
 {
     public sealed class PottedPlantHideSystem : EntitySystem
     {
-        [Dependency] private readonly PopupSystem _popupSystem = default!;
+        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly SecretStashSystem _stashSystem = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
 
diff --git a/Content.Shared/Plunger/Components/PlungerComponent.cs b/Content.Shared/Plunger/Components/PlungerComponent.cs
new file mode 100644
index 0000000000..101121fe4c
--- /dev/null
+++ b/Content.Shared/Plunger/Components/PlungerComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Plunger.Components
+{
+    /// <summary>
+    /// Allows entity to unblock target entity with PlungerUseComponent.
+    /// </summary>
+    [RegisterComponent, NetworkedComponent,AutoGenerateComponentState]
+    public sealed partial class PlungerComponent : Component
+    {
+        /// <summary>
+        /// Duration of plunger doafter event.
+        /// </summary>
+        [DataField]
+        [AutoNetworkedField]
+        public float PlungeDuration = 2f;
+    }
+}
diff --git a/Content.Shared/Plunger/Components/PlungerUseComponent.cs b/Content.Shared/Plunger/Components/PlungerUseComponent.cs
new file mode 100644
index 0000000000..e886a4ef7a
--- /dev/null
+++ b/Content.Shared/Plunger/Components/PlungerUseComponent.cs
@@ -0,0 +1,42 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Content.Shared.Random;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Plunger.Components
+{
+    /// <summary>
+    /// Entity can interact with plungers.
+    /// </summary>
+    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+    public sealed partial class PlungerUseComponent : Component
+    {
+        /// <summary>
+        /// If true entity has been plungered.
+        /// </summary>
+        [DataField]
+        [AutoNetworkedField]
+        public bool Plunged;
+
+        /// <summary>
+        /// If true entity can interact with plunger.
+        /// </summary>
+        [DataField]
+        [AutoNetworkedField]
+        public bool NeedsPlunger = false;
+
+        /// <summary>
+        /// A weighted random entity prototype containing the different loot that rummaging can provide.
+        /// </summary>
+        [DataField]
+        [AutoNetworkedField]
+        public ProtoId<WeightedRandomEntityPrototype> PlungerLoot = "PlungerLoot";
+
+
+        /// <summary>
+        /// Sound played on rummage completion.
+        /// </summary>
+        [DataField]
+        public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Effects/Fluids/glug.ogg");
+    }
+}
diff --git a/Content.Shared/Plunger/PlungerDoAfterEvent.cs b/Content.Shared/Plunger/PlungerDoAfterEvent.cs
new file mode 100644
index 0000000000..b803f5136f
--- /dev/null
+++ b/Content.Shared/Plunger/PlungerDoAfterEvent.cs
@@ -0,0 +1,10 @@
+
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Plunger;
+
+[Serializable, NetSerializable]
+public sealed partial class PlungerDoAfterEvent : SimpleDoAfterEvent
+{
+}
diff --git a/Content.Shared/Plunger/Systems/PlungerSystem.cs b/Content.Shared/Plunger/Systems/PlungerSystem.cs
new file mode 100644
index 0000000000..57bd77a7d9
--- /dev/null
+++ b/Content.Shared/Plunger/Systems/PlungerSystem.cs
@@ -0,0 +1,79 @@
+using Content.Shared.DoAfter;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Plunger.Components;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Timing;
+using Content.Shared.Random.Helpers;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Content.Shared.Random;
+
+namespace Content.Shared.Plunger.Systems;
+
+/// <summary>
+/// Plungers can be used to unblock entities with PlungerUseComponent.
+/// </summary>
+public sealed class PlungerSystem : EntitySystem
+{
+    [Dependency] protected readonly IPrototypeManager _proto = default!;
+    [Dependency] protected readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<PlungerComponent, AfterInteractEvent>(OnInteract);
+        SubscribeLocalEvent<PlungerComponent, PlungerDoAfterEvent>(OnDoAfter);
+    }
+
+    private void OnInteract(EntityUid uid, PlungerComponent component, AfterInteractEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (!args.CanReach || args.Target is not { Valid: true } target)
+            return;
+
+        if (!TryComp<PlungerUseComponent>(args.Target, out var plunger))
+            return;
+
+        if (plunger.NeedsPlunger)
+            return;
+
+        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.PlungeDuration, new PlungerDoAfterEvent(), uid, target, uid)
+        {
+            BreakOnMove = true,
+            BreakOnDamage = true,
+            MovementThreshold = 1.0f,
+        });
+        args.Handled = true;
+    }
+
+    private void OnDoAfter(EntityUid uid, PlungerComponent component, DoAfterEvent args)
+    {
+        if (args.Cancelled || args.Handled || args.Args.Target == null)
+            return;
+
+        if (args.Target is not { Valid: true } target)
+            return;
+
+        if (!TryComp(target, out PlungerUseComponent? plunge))
+            return;
+
+        _popup.PopupClient(Loc.GetString("plunger-unblock", ("target", target)), args.User, args.User, PopupType.Medium);
+        plunge.Plunged = true;
+
+        var spawn = _proto.Index<WeightedRandomEntityPrototype>(plunge.PlungerLoot).Pick(_random);
+
+        _audio.PlayPredicted(plunge.Sound, uid, uid);
+        Spawn(spawn, Transform(target).Coordinates);
+        RemComp<PlungerUseComponent>(target);
+        Dirty(target, plunge);
+
+        args.Handled = true;
+    }
+}
+
diff --git a/Content.Shared/Popups/SharedPopupSystem.cs b/Content.Shared/Popups/SharedPopupSystem.cs
index aeb85de2f5..b199884afb 100644
--- a/Content.Shared/Popups/SharedPopupSystem.cs
+++ b/Content.Shared/Popups/SharedPopupSystem.cs
@@ -86,7 +86,7 @@ namespace Content.Shared.Popups
         /// Variant of <see cref="PopupEntity(string, EntityUid, EntityUid, PopupType)"/> that only runs on the client, outside of prediction.
         /// Useful for shared code that is always ran by both sides to avoid duplicate popups.
         /// </summary>
-        public abstract void PopupClient(string? message, EntityUid uid, EntityUid recipient, PopupType type = PopupType.Small);
+        public abstract void PopupClient(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small);
 
         /// <summary>
         /// Variant of <see cref="PopupEntity(string, EntityUid, EntityUid, PopupType)"/> for use with prediction. The local client will show
diff --git a/Content.Shared/RCD/Components/RCDAmmoComponent.cs b/Content.Shared/RCD/Components/RCDAmmoComponent.cs
index 7b1fc001d4..4135b606e2 100644
--- a/Content.Shared/RCD/Components/RCDAmmoComponent.cs
+++ b/Content.Shared/RCD/Components/RCDAmmoComponent.cs
@@ -12,7 +12,5 @@ public sealed partial class RCDAmmoComponent : Component
     /// Can be partially transferred into an RCD, until it is empty then it gets deleted.
     /// </summary>
     [DataField("charges"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public int Charges = 5;
+    public int Charges = 30;
 }
-
-// TODO: state??? check if it desyncs
diff --git a/Content.Shared/RCD/Components/RCDComponent.cs b/Content.Shared/RCD/Components/RCDComponent.cs
index 8e1032884a..39bb6fd3e9 100644
--- a/Content.Shared/RCD/Components/RCDComponent.cs
+++ b/Content.Shared/RCD/Components/RCDComponent.cs
@@ -1,20 +1,11 @@
-using Content.Shared.Maps;
 using Content.Shared.RCD.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Physics;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.RCD.Components;
 
-public enum RcdMode : byte
-{
-    Floors,
-    Walls,
-    Airlock,
-    Deconstruct
-}
-
 /// <summary>
 /// Main component for the RCD
 /// Optionally uses LimitedChargesComponent.
@@ -25,27 +16,57 @@ public enum RcdMode : byte
 public sealed partial class RCDComponent : Component
 {
     /// <summary>
-    /// Time taken to do an action like placing a wall
+    /// List of RCD prototypes that the device comes loaded with
     /// </summary>
-    [DataField("delay"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public float Delay = 2f;
-
-    [DataField("swapModeSound")]
-    public SoundSpecifier SwapModeSound = new SoundPathSpecifier("/Audio/Items/genhit.ogg");
-
-    [DataField("successSound")]
-    public SoundSpecifier SuccessSound = new SoundPathSpecifier("/Audio/Items/deconstruct.ogg");
+    [DataField, AutoNetworkedField]
+    public HashSet<ProtoId<RCDPrototype>> AvailablePrototypes { get; set; } = new();
 
     /// <summary>
-    /// What mode are we on? Can be floors, walls, airlock, deconstruct.
+    /// Sound that plays when a RCD operation successfully completes
     /// </summary>
-    [DataField("mode"), AutoNetworkedField]
-    public RcdMode Mode = RcdMode.Floors;
+    [DataField]
+    public SoundSpecifier SuccessSound { get; set; } = new SoundPathSpecifier("/Audio/Items/deconstruct.ogg");
 
     /// <summary>
-    /// ID of the floor to create when using the floor mode.
+    /// The ProtoId of the currently selected RCD prototype
     /// </summary>
-    [DataField("floor", customTypeSerializer: typeof(PrototypeIdSerializer<ContentTileDefinition>))]
-    [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public string Floor = "FloorSteel";
+    [DataField, AutoNetworkedField]
+    public ProtoId<RCDPrototype> ProtoId { get; set; } = "Invalid";
+
+    /// <summary>
+    /// A cached copy of currently selected RCD prototype
+    /// </summary>
+    /// <remarks>
+    /// If the ProtoId is changed, make sure to update the CachedPrototype as well
+    /// </remarks>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public RCDPrototype CachedPrototype { get; set; } = default!;
+
+    /// <summary>
+    /// The direction constructed entities will face upon spawning
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Direction ConstructionDirection
+    {
+        get
+        {
+            return _constructionDirection;
+        }
+        set
+        {
+            _constructionDirection = value;
+            ConstructionTransform = new Transform(new(), _constructionDirection.ToAngle());
+        }
+    }
+
+    private Direction _constructionDirection = Direction.South;
+
+    /// <summary>
+    /// Returns a rotated transform based on the specified ConstructionDirection
+    /// </summary>
+    /// <remarks>
+    /// Contains no position data
+    /// </remarks>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public Transform ConstructionTransform { get; private set; } = default!;
 }
diff --git a/Content.Shared/RCD/Components/RCDDeconstructibleComponent.cs b/Content.Shared/RCD/Components/RCDDeconstructibleComponent.cs
new file mode 100644
index 0000000000..0ddc6897f0
--- /dev/null
+++ b/Content.Shared/RCD/Components/RCDDeconstructibleComponent.cs
@@ -0,0 +1,34 @@
+using Content.Shared.RCD.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.RCD.Components;
+
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(RCDSystem))]
+public sealed partial class RCDDeconstructableComponent : Component
+{
+    /// <summary>
+    /// Number of charges consumed when the deconstruction is completed
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public int Cost = 1;
+
+    /// <summary>
+    /// The length of the deconstruction 
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float Delay = 1f;
+
+    /// <summary>
+    /// The visual effect that plays during deconstruction
+    /// </summary>
+    [DataField("fx"), ViewVariables(VVAccess.ReadWrite)]
+    public EntProtoId? Effect = null;
+
+    /// <summary>
+    /// Toggles whether this entity is deconstructable or not
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public bool Deconstructable = true;
+}
diff --git a/Content.Shared/RCD/RCDEvents.cs b/Content.Shared/RCD/RCDEvents.cs
new file mode 100644
index 0000000000..a15a010277
--- /dev/null
+++ b/Content.Shared/RCD/RCDEvents.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.RCD;
+
+[Serializable, NetSerializable]
+public sealed class RCDSystemMessage : BoundUserInterfaceMessage
+{
+    public ProtoId<RCDPrototype> ProtoId;
+
+    public RCDSystemMessage(ProtoId<RCDPrototype> protoId)
+    {
+        ProtoId = protoId;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class RCDConstructionGhostRotationEvent : EntityEventArgs
+{
+    public readonly NetEntity NetEntity;
+    public readonly Direction Direction;
+
+    public RCDConstructionGhostRotationEvent(NetEntity netEntity, Direction direction)
+    {
+        NetEntity = netEntity;
+        Direction = direction;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum RcdUiKey : byte
+{
+    Key
+}
diff --git a/Content.Shared/RCD/RCDPrototype.cs b/Content.Shared/RCD/RCDPrototype.cs
new file mode 100644
index 0000000000..1e80abfb72
--- /dev/null
+++ b/Content.Shared/RCD/RCDPrototype.cs
@@ -0,0 +1,144 @@
+using Content.Shared.Physics;
+using Robust.Shared.Physics.Collision.Shapes;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.RCD;
+
+/// <summary>
+/// Contains the parameters for a RCD construction / operation
+/// </summary>
+[Prototype("rcd")]
+public sealed class RCDPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// The RCD mode associated with the operation
+    /// </summary>
+    [DataField(required: true), ViewVariables(VVAccess.ReadOnly)]
+    public RcdMode Mode { get; private set; } = RcdMode.Invalid;
+
+    /// <summary>
+    /// The name associated with the prototype
+    /// </summary>
+    [DataField("name"), ViewVariables(VVAccess.ReadOnly)]
+    public string SetName { get; private set; } = "Unknown";
+
+    /// <summary>
+    /// The name of the radial container that this prototype will be listed under on the RCD menu
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public string Category { get; private set; } = "Undefined";
+
+    /// <summary>
+    /// Texture path for this prototypes menu icon
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public SpriteSpecifier? Sprite { get; private set; } = null;
+
+    /// <summary>
+    /// The entity prototype that will be constructed (mode dependent)
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public string? Prototype { get; private set; } = string.Empty;
+
+    /// <summary>
+    /// Number of charges consumed when the operation is completed
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public int Cost { get; private set; } = 1;
+
+    /// <summary>
+    /// The length of the operation 
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public float Delay { get; private set; } = 1f;
+
+    /// <summary>
+    /// The visual effect that plays during this operation
+    /// </summary>
+    [DataField("fx"), ViewVariables(VVAccess.ReadOnly)]
+    public EntProtoId? Effect { get; private set; } = null;
+
+    /// <summary>
+    /// A list of rules that govern where the entity prototype can be contructed
+    /// </summary>
+    [DataField("rules"), ViewVariables(VVAccess.ReadOnly)]
+    public HashSet<RcdConstructionRule> ConstructionRules { get; private set; } = new();
+
+    /// <summary>
+    /// The collision mask used for determining whether the entity prototype will fit into a target tile
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public CollisionGroup CollisionMask { get; private set; } = CollisionGroup.None;
+
+    /// <summary>
+    /// Specifies a set of custom collision bounds for determining whether the entity prototype will fit into a target tile 
+    /// </summary>
+    /// <remarks>
+    /// Should be set assuming that the entity faces south.
+    /// Make sure that Rotation is set to RcdRotation.User if the entity is to be rotated by the user
+    /// </remarks>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public Box2? CollisionBounds
+    {
+        get
+        {
+            return _collisionBounds;
+        }
+
+        private set
+        {
+            _collisionBounds = value;
+
+            if (_collisionBounds != null)
+            {
+                var poly = new PolygonShape();
+                poly.SetAsBox(_collisionBounds.Value);
+
+                CollisionPolygon = poly;
+            }
+        }
+    }
+
+    private Box2? _collisionBounds = null;
+
+    /// <summary>
+    /// The polygon shape associated with the prototype CollisionBounds (if set) 
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public PolygonShape? CollisionPolygon { get; private set; } = null;
+
+    /// <summary>
+    /// Governs how the local rotation of the constructed entity will be set
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public RcdRotation Rotation { get; private set; } = RcdRotation.User;
+}
+
+public enum RcdMode : byte
+{
+    Invalid,
+    Deconstruct,
+    ConstructTile,
+    ConstructObject,
+}
+
+// These are to be replaced with more flexible 'RulesRule' at a later time
+public enum RcdConstructionRule : byte
+{
+    MustBuildOnEmptyTile,       // Can only be built on empty space (e.g. lattice)
+    CanBuildOnEmptyTile,        // Can be built on empty space or replace an existing tile (e.g. hull plating)
+    MustBuildOnSubfloor,        // Can only be built on exposed subfloor (e.g. catwalks on lattice or hull plating)
+    IsWindow,                   // The entity is a window and can be built on grilles
+    IsCatwalk,                  // The entity is a catwalk
+}
+
+public enum RcdRotation : byte
+{
+    Fixed,      // The entity has a local rotation of zero
+    Camera,     // The rotation of the entity matches the local player camera
+    User,       // The entity can be rotated by the local player prior to placement
+}
diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs
index 726ee30a69..bf312ee6fc 100644
--- a/Content.Shared/RCD/Systems/RCDSystem.cs
+++ b/Content.Shared/RCD/Systems/RCDSystem.cs
@@ -1,28 +1,35 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Charges.Components;
 using Content.Shared.Charges.Systems;
+using Content.Shared.Construction;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.Examine;
+using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Maps;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
 using Content.Shared.RCD.Components;
 using Content.Shared.Tag;
 using Content.Shared.Tiles;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Network;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Collision.Shapes;
+using Robust.Shared.Physics.Dynamics;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 
 namespace Content.Shared.RCD.Systems;
 
-public sealed class RCDSystem : EntitySystem
+[Virtual]
+public class RCDSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly INetManager _net = default!;
@@ -34,314 +41,602 @@ public sealed class RCDSystem : EntitySystem
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
+    [Dependency] private readonly TagSystem _tags = default!;
 
-    private readonly int _rcdModeCount = Enum.GetValues(typeof(RcdMode)).Length;
+    private readonly int _instantConstructionDelay = 0;
+    private readonly EntProtoId _instantConstructionFx = "EffectRCDConstruct0";
+    private readonly ProtoId<RCDPrototype> _deconstructTileProto = "DeconstructTile";
+    private readonly ProtoId<RCDPrototype> _deconstructLatticeProto = "DeconstructLattice";
+
+    private HashSet<EntityUid> _intersectingEntities = new();
 
     public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<RCDComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<RCDComponent, ExaminedEvent>(OnExamine);
-        SubscribeLocalEvent<RCDComponent, UseInHandEvent>(OnUseInHand);
         SubscribeLocalEvent<RCDComponent, AfterInteractEvent>(OnAfterInteract);
         SubscribeLocalEvent<RCDComponent, RCDDoAfterEvent>(OnDoAfter);
         SubscribeLocalEvent<RCDComponent, DoAfterAttemptEvent<RCDDoAfterEvent>>(OnDoAfterAttempt);
+        SubscribeLocalEvent<RCDComponent, RCDSystemMessage>(OnRCDSystemMessage);
+        SubscribeNetworkEvent<RCDConstructionGhostRotationEvent>(OnRCDconstructionGhostRotationEvent);
     }
 
-    private void OnExamine(EntityUid uid, RCDComponent comp, ExaminedEvent args)
+    #region Event handling
+
+    private void OnMapInit(EntityUid uid, RCDComponent component, MapInitEvent args)
+    {
+        // On init, set the RCD to its first available recipe
+        if (component.AvailablePrototypes.Any())
+        {
+            component.ProtoId = component.AvailablePrototypes.First();
+            UpdateCachedPrototype(uid, component);
+            Dirty(uid, component);
+
+            return;
+        }
+
+        // The RCD has no valid recipes somehow? Get rid of it
+        QueueDel(uid);
+    }
+
+    private void OnRCDSystemMessage(EntityUid uid, RCDComponent component, RCDSystemMessage args)
+    {
+        // Exit if the RCD doesn't actually know the supplied prototype
+        if (!component.AvailablePrototypes.Contains(args.ProtoId))
+            return;
+
+        if (!_protoManager.HasIndex(args.ProtoId))
+            return;
+
+        // Set the current RCD prototype to the one supplied
+        component.ProtoId = args.ProtoId;
+        UpdateCachedPrototype(uid, component);
+        Dirty(uid, component);
+    }
+
+    private void OnExamine(EntityUid uid, RCDComponent component, ExaminedEvent args)
     {
         if (!args.IsInDetailsRange)
             return;
 
-        var msg = Loc.GetString("rcd-component-examine-detail", ("mode", comp.Mode));
+        // Update cached prototype if required
+        UpdateCachedPrototype(uid, component);
+
+        var msg = Loc.GetString("rcd-component-examine-mode-details", ("mode", Loc.GetString(component.CachedPrototype.SetName)));
+
+        if (component.CachedPrototype.Mode == RcdMode.ConstructTile || component.CachedPrototype.Mode == RcdMode.ConstructObject)
+        {
+            var name = Loc.GetString(component.CachedPrototype.SetName);
+
+            if (component.CachedPrototype.Prototype != null &&
+                _protoManager.TryIndex(component.CachedPrototype.Prototype, out var proto))
+                name = proto.Name;
+
+            msg = Loc.GetString("rcd-component-examine-build-details", ("name", name));
+        }
+
         args.PushMarkup(msg);
     }
 
-    private void OnUseInHand(EntityUid uid, RCDComponent comp, UseInHandEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        NextMode(uid, comp, args.User);
-        args.Handled = true;
-    }
-
-    private void OnAfterInteract(EntityUid uid, RCDComponent comp, AfterInteractEvent args)
+    private void OnAfterInteract(EntityUid uid, RCDComponent component, AfterInteractEvent args)
     {
         if (args.Handled || !args.CanReach)
             return;
 
         var user = args.User;
-
-        TryComp<LimitedChargesComponent>(uid, out var charges);
-        if (_charges.IsEmpty(uid, charges))
-        {
-            _popup.PopupClient(Loc.GetString("rcd-component-no-ammo-message"), uid, user);
-            return;
-        }
-
         var location = args.ClickLocation;
-        // Initial validity check
+
+        // Initial validity checks
         if (!location.IsValid(EntityManager))
             return;
 
-        var gridId = location.GetGridUid(EntityManager);
-        if (!HasComp<MapGridComponent>(gridId))
+        if (!TryGetMapGridData(location, out var mapGridData))
         {
-            location = location.AlignWithClosestGridTile();
-            gridId = location.GetGridUid(EntityManager);
-            // Check if fixing it failed / get final grid ID
-            if (!HasComp<MapGridComponent>(gridId))
-                return;
+            _popup.PopupClient(Loc.GetString("rcd-component-no-valid-grid"), uid, user);
+            return;
         }
 
-        var doAfterArgs = new DoAfterArgs(EntityManager, user, comp.Delay, new RCDDoAfterEvent(GetNetCoordinates(location), comp.Mode), uid, target: args.Target, used: uid)
+        if (!IsRCDOperationStillValid(uid, component, mapGridData.Value, args.Target, args.User))
+            return;
+
+        if (!_net.IsServer)
+            return;
+
+        // Get the starting cost, delay, and effect from the prototype
+        var cost = component.CachedPrototype.Cost;
+        var delay = component.CachedPrototype.Delay;
+        var effectPrototype = component.CachedPrototype.Effect;
+
+        #region: Operation modifiers
+
+        // Deconstruction modifiers
+        switch (component.CachedPrototype.Mode)
+        {
+            case RcdMode.Deconstruct:
+
+                // Deconstructing an object
+                if (args.Target != null)
+                {
+                    if (TryComp<RCDDeconstructableComponent>(args.Target, out var destructible))
+                    {
+                        cost = destructible.Cost;
+                        delay = destructible.Delay;
+                        effectPrototype = destructible.Effect;
+                    }
+                }
+
+                // Deconstructing a tile
+                else
+                {
+                    var deconstructedTile = _mapSystem.GetTileRef(mapGridData.Value.GridUid, mapGridData.Value.Component, mapGridData.Value.Location);
+                    var protoName = deconstructedTile.IsSpace() ? _deconstructTileProto : _deconstructLatticeProto;
+
+                    if (_protoManager.TryIndex(protoName, out var deconProto))
+                    {
+                        cost = deconProto.Cost;
+                        delay = deconProto.Delay;
+                        effectPrototype = deconProto.Effect;
+                    }
+                }
+
+                break;
+
+            case RcdMode.ConstructTile:
+
+                // If replacing a tile, make the construction instant
+                var contructedTile = _mapSystem.GetTileRef(mapGridData.Value.GridUid, mapGridData.Value.Component, mapGridData.Value.Location);
+
+                if (!contructedTile.Tile.IsEmpty)
+                {
+                    delay = _instantConstructionDelay;
+                    effectPrototype = _instantConstructionFx;
+                }
+
+                break;
+        }
+
+        #endregion
+
+        // Try to start the do after
+        var effect = Spawn(effectPrototype, mapGridData.Value.Location);
+        var ev = new RCDDoAfterEvent(GetNetCoordinates(mapGridData.Value.Location), component.ConstructionDirection, component.ProtoId, cost, EntityManager.GetNetEntity(effect));
+
+        var doAfterArgs = new DoAfterArgs(EntityManager, user, delay, ev, uid, target: args.Target, used: uid)
         {
             BreakOnDamage = true,
-            NeedHand = true,
             BreakOnHandChange = true,
             BreakOnMove = true,
-            AttemptFrequency = AttemptFrequency.EveryTick
+            AttemptFrequency = AttemptFrequency.EveryTick,
+            CancelDuplicate = false,
+            BlockDuplicate = false
         };
 
         args.Handled = true;
 
-        if (_doAfter.TryStartDoAfter(doAfterArgs) && _gameTiming.IsFirstTimePredicted)
-            Spawn("EffectRCDConstruction", location);
+        if (!_doAfter.TryStartDoAfter(doAfterArgs))
+            QueueDel(effect);
     }
 
-    private void OnDoAfterAttempt(EntityUid uid, RCDComponent comp, DoAfterAttemptEvent<RCDDoAfterEvent> args)
+    private void OnDoAfterAttempt(EntityUid uid, RCDComponent component, DoAfterAttemptEvent<RCDDoAfterEvent> args)
     {
-        // sus client crash why
         if (args.Event?.DoAfter?.Args == null)
             return;
 
+        // Exit if the RCD prototype has changed
+        if (component.ProtoId != args.Event.StartingProtoId)
+            return;
+
+        // Ensure the RCD operation is still valid
         var location = GetCoordinates(args.Event.Location);
 
-        var gridId = location.GetGridUid(EntityManager);
-        if (!HasComp<MapGridComponent>(gridId))
-        {
-            location = location.AlignWithClosestGridTile();
-            gridId = location.GetGridUid(EntityManager);
-            // Check if fixing it failed / get final grid ID
-            if (!HasComp<MapGridComponent>(gridId))
-                return;
-        }
+        if (!TryGetMapGridData(location, out var mapGridData))
+            return;
 
-        var mapGrid = Comp<MapGridComponent>(gridId.Value);
-        var tile = mapGrid.GetTileRef(location);
-
-        if (!IsRCDStillValid(uid, comp, args.Event.User, args.Event.Target, mapGrid, tile, args.Event.StartingMode))
+        if (!IsRCDOperationStillValid(uid, component, mapGridData.Value, args.Event.Target, args.Event.User))
             args.Cancel();
     }
 
-    private void OnDoAfter(EntityUid uid, RCDComponent comp, RCDDoAfterEvent args)
+    private void OnDoAfter(EntityUid uid, RCDComponent component, RCDDoAfterEvent args)
     {
+        if (args.Cancelled && _net.IsServer)
+            QueueDel(EntityManager.GetEntity(args.Effect));
+
         if (args.Handled || args.Cancelled || !_timing.IsFirstTimePredicted)
             return;
 
-        var user = args.User;
+        args.Handled = true;
+
         var location = GetCoordinates(args.Location);
 
-        var gridId = location.GetGridUid(EntityManager);
-        if (!HasComp<MapGridComponent>(gridId))
-        {
-            location = location.AlignWithClosestGridTile();
-            gridId = location.GetGridUid(EntityManager);
-            // Check if fixing it failed / get final grid ID
-            if (!HasComp<MapGridComponent>(gridId))
-                return;
-        }
+        if (!TryGetMapGridData(location, out var mapGridData))
+            return;
 
-        var mapGrid = Comp<MapGridComponent>(gridId.Value);
-        var tile = mapGrid.GetTileRef(location);
-        var snapPos = mapGrid.TileIndicesFor(location);
+        // Ensure the RCD operation is still valid
+        if (!IsRCDOperationStillValid(uid, component, mapGridData.Value, args.Target, args.User))
+            return;
 
-        // I love that this uses entirely separate code to construction and tile placement!!!
+        // Finalize the operation
+        FinalizeRCDOperation(uid, component, mapGridData.Value, args.Direction, args.Target, args.User);
 
-        switch (comp.Mode)
-        {
-            //Floor mode just needs the tile to be a space tile (subFloor)
-            case RcdMode.Floors:
-                if (!_floors.CanPlaceTile(gridId.Value, mapGrid, out var reason))
-                {
-                    _popup.PopupClient(reason, user, user);
-                    return;
-                }
-
-                mapGrid.SetTile(snapPos, new Tile(_tileDefMan[comp.Floor].TileId));
-                _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(args.User):user} used RCD to set grid: {tile.GridUid} {snapPos} to {comp.Floor}");
-                break;
-            //We don't want to place a space tile on something that's already a space tile. Let's do the inverse of the last check.
-            case RcdMode.Deconstruct:
-                if (!IsTileBlocked(tile)) // Delete the turf
-                {
-                    mapGrid.SetTile(snapPos, Tile.Empty);
-                    _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(args.User):user} used RCD to set grid: {tile.GridUid} tile: {snapPos} to space");
-                }
-                else // Delete the targeted thing
-                {
-                    var target = args.Target!.Value;
-                    _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(args.User):user} used RCD to delete {ToPrettyString(target):target}");
-                    QueueDel(target);
-                }
-                break;
-            //Walls are a special behaviour, and require us to build a new object with a transform rather than setting a grid tile,
-            // thus we early return to avoid the tile set code.
-            case RcdMode.Walls:
-                // only spawn on the server
-                if (_net.IsServer)
-                {
-                    var ent = Spawn("WallSolid", mapGrid.GridTileToLocal(snapPos));
-                    Transform(ent).LocalRotation = Angle.Zero; // Walls always need to point south.
-                    _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(args.User):user} used RCD to spawn {ToPrettyString(ent)} at {snapPos} on grid {tile.GridUid}");
-                }
-                break;
-            case RcdMode.Airlock:
-                // only spawn on the server
-                if (_net.IsServer)
-                {
-                    var airlock = Spawn("Airlock", mapGrid.GridTileToLocal(snapPos));
-                    Transform(airlock).LocalRotation = Transform(uid).LocalRotation; //Now apply icon smoothing.
-                    _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(args.User):user} used RCD to spawn {ToPrettyString(airlock)} at {snapPos} on grid {tile.GridUid}");
-                }
-                break;
-            default:
-                args.Handled = true;
-                return; //I don't know why this would happen, but sure I guess. Get out of here invalid state!
-        }
-
-        _audio.PlayPredicted(comp.SuccessSound, uid, user);
-        _charges.UseCharge(uid);
-        args.Handled = true;
+        // Play audio and consume charges
+        _audio.PlayPredicted(component.SuccessSound, uid, args.User);
+        _charges.UseCharges(uid, args.Cost);
     }
 
-    private bool IsRCDStillValid(EntityUid uid, RCDComponent comp, EntityUid user, EntityUid? target, MapGridComponent mapGrid, TileRef tile, RcdMode startingMode)
+    private void OnRCDconstructionGhostRotationEvent(RCDConstructionGhostRotationEvent ev, EntitySessionEventArgs session)
     {
-        //Less expensive checks first. Failing those ones, we need to check that the tile isn't obstructed.
-        if (comp.Mode != startingMode)
-            return false;
+        var uid = GetEntity(ev.NetEntity);
 
-        var unobstructed = target == null
-            ? _interaction.InRangeUnobstructed(user, mapGrid.GridTileToWorld(tile.GridIndices), popup: true)
-            : _interaction.InRangeUnobstructed(user, target.Value, popup: true);
+        // Determine if player that send the message is carrying the specified RCD in their active hand
+        if (session.SenderSession.AttachedEntity == null)
+            return;
+
+        if (!TryComp<HandsComponent>(session.SenderSession.AttachedEntity, out var hands) ||
+            uid != hands.ActiveHand?.HeldEntity)
+            return;
+
+        if (!TryComp<RCDComponent>(uid, out var rcd))
+            return;
+
+        // Update the construction direction
+        rcd.ConstructionDirection = ev.Direction;
+        Dirty(uid, rcd);
+    }
+
+    #endregion
+
+    #region Entity construction/deconstruction rule checks
+
+    public bool IsRCDOperationStillValid(EntityUid uid, RCDComponent component, MapGridData mapGridData, EntityUid? target, EntityUid user, bool popMsgs = true)
+    {
+        // Update cached prototype if required
+        UpdateCachedPrototype(uid, component);
+
+        // Check that the RCD has enough ammo to get the job done
+        TryComp<LimitedChargesComponent>(uid, out var charges);
+
+        // Both of these were messages were suppose to be predicted, but HasInsufficientCharges wasn't being checked on the client for some reason?
+        if (_charges.IsEmpty(uid, charges))
+        {
+            if (popMsgs)
+                _popup.PopupClient(Loc.GetString("rcd-component-no-ammo-message"), uid, user);
+
+            return false;
+        }
+
+        if (_charges.HasInsufficientCharges(uid, component.CachedPrototype.Cost, charges))
+        {
+            if (popMsgs)
+                _popup.PopupClient(Loc.GetString("rcd-component-insufficient-ammo-message"), uid, user);
+
+            return false;
+        }
+
+        // Exit if the target / target location is obstructed
+        var unobstructed = (target == null)
+            ? _interaction.InRangeUnobstructed(user, _mapSystem.GridTileToWorld(mapGridData.GridUid, mapGridData.Component, mapGridData.Position), popup: popMsgs)
+            : _interaction.InRangeUnobstructed(user, target.Value, popup: popMsgs);
 
         if (!unobstructed)
             return false;
 
-        var tileDef = (ContentTileDefinition) _tileDefMan[tile.Tile.TypeId];
-        switch (comp.Mode)
+        // Return whether the operation location is valid
+        switch (component.CachedPrototype.Mode)
         {
-            //Floor mode just needs the tile to be a space tile (subFloor)
-            case RcdMode.Floors:
+            case RcdMode.ConstructTile: return IsConstructionLocationValid(uid, component, mapGridData, user, popMsgs);
+            case RcdMode.ConstructObject: return IsConstructionLocationValid(uid, component, mapGridData, user, popMsgs);
+            case RcdMode.Deconstruct: return IsDeconstructionStillValid(uid, component, mapGridData, target, user, popMsgs);
+        }
 
-                if (!tile.Tile.IsEmpty && !tileDef.IsSubFloor)
+        return false;
+    }
+
+    private bool IsConstructionLocationValid(EntityUid uid, RCDComponent component, MapGridData mapGridData, EntityUid user, bool popMsgs = true)
+    {
+        // Check rule: Must build on empty tile
+        if (component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.MustBuildOnEmptyTile) && !mapGridData.Tile.Tile.IsEmpty)
+        {
+            if (popMsgs)
+                _popup.PopupClient(Loc.GetString("rcd-component-must-build-on-empty-tile-message"), uid, user);
+
+            return false;
+        }
+
+        // Check rule: Must build on non-empty tile
+        if (!component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.CanBuildOnEmptyTile) && mapGridData.Tile.Tile.IsEmpty)
+        {
+            if (popMsgs)
+                _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-on-empty-tile-message"), uid, user);
+
+            return false;
+        }
+
+        // Check rule: Must place on subfloor
+        if (component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.MustBuildOnSubfloor) && !mapGridData.Tile.Tile.GetContentTileDefinition().IsSubFloor)
+        {
+            if (popMsgs)
+                _popup.PopupClient(Loc.GetString("rcd-component-must-build-on-subfloor-message"), uid, user);
+
+            return false;
+        }
+
+        // Tile specific rules
+        if (component.CachedPrototype.Mode == RcdMode.ConstructTile)
+        {
+            // Check rule: Tile placement is valid
+            if (!_floors.CanPlaceTile(mapGridData.GridUid, mapGridData.Component, out var reason))
+            {
+                if (popMsgs)
+                    _popup.PopupClient(reason, uid, user);
+
+                return false;
+            }
+
+            // Check rule: Tiles can't be identical
+            if (mapGridData.Tile.Tile.GetContentTileDefinition().ID == component.CachedPrototype.Prototype)
+            {
+                if (popMsgs)
+                    _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-identical-tile"), uid, user);
+
+                return false;
+            }
+
+            // Ensure that all construction rules shared between tiles and object are checked before exiting here
+            return true;
+        }
+
+        // Entity specific rules
+
+        // Check rule: The tile is unoccupied
+        var isWindow = component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.IsWindow);
+        var isCatwalk = component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.IsCatwalk);
+
+        _intersectingEntities.Clear();
+        _lookup.GetLocalEntitiesIntersecting(mapGridData.GridUid, mapGridData.Position, _intersectingEntities, -0.05f, LookupFlags.Uncontained);
+
+        foreach (var ent in _intersectingEntities)
+        {
+            if (isWindow && HasComp<SharedCanBuildWindowOnTopComponent>(ent))
+                continue;
+
+            if (isCatwalk && _tags.HasTag(ent, "Catwalk"))
+            {
+                if (popMsgs)
+                    _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-on-occupied-tile-message"), uid, user);
+
+                return false;
+            }
+
+            if (component.CachedPrototype.CollisionMask != CollisionGroup.None && TryComp<FixturesComponent>(ent, out var fixtures))
+            {
+                foreach (var fixture in fixtures.Fixtures.Values)
                 {
-                    _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-floor-tile-not-empty-message"), uid, user);
+                    // Continue if no collision is possible
+                    if (!fixture.Hard || fixture.CollisionLayer <= 0 || (fixture.CollisionLayer & (int) component.CachedPrototype.CollisionMask) == 0)
+                        continue;
+
+                    // Continue if our custom collision bounds are not intersected
+                    if (component.CachedPrototype.CollisionPolygon != null &&
+                        !DoesCustomBoundsIntersectWithFixture(component.CachedPrototype.CollisionPolygon, component.ConstructionTransform, ent, fixture))
+                        continue;
+
+                    // Collision was detected
+                    if (popMsgs)
+                        _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-on-occupied-tile-message"), uid, user);
+
                     return false;
                 }
+            }
+        }
+
+        return true;
+    }
+
+    private bool IsDeconstructionStillValid(EntityUid uid, RCDComponent component, MapGridData mapGridData, EntityUid? target, EntityUid user, bool popMsgs = true)
+    {
+        // Attempt to deconstruct a floor tile
+        if (target == null)
+        {
+            // The tile is empty
+            if (mapGridData.Tile.Tile.IsEmpty)
+            {
+                if (popMsgs)
+                    _popup.PopupClient(Loc.GetString("rcd-component-nothing-to-deconstruct-message"), uid, user);
+
+                return false;
+            }
+
+            // The tile has a structure sitting on it
+            if (_turf.IsTileBlocked(mapGridData.Tile, CollisionGroup.MobMask))
+            {
+                if (popMsgs)
+                    _popup.PopupClient(Loc.GetString("rcd-component-tile-obstructed-message"), uid, user);
+
+                return false;
+            }
+
+            // The tile cannot be destroyed
+            var tileDef = (ContentTileDefinition) _tileDefMan[mapGridData.Tile.Tile.TypeId];
+
+            if (tileDef.Indestructible)
+            {
+                if (popMsgs)
+                    _popup.PopupClient(Loc.GetString("rcd-component-tile-indestructible-message"), uid, user);
+
+                return false;
+            }
+        }
+
+        // Attempt to deconstruct an object
+        else
+        {
+            // The object is not in the whitelist
+            if (!TryComp<RCDDeconstructableComponent>(target, out var deconstructible) || !deconstructible.Deconstructable)
+            {
+                if (popMsgs)
+                    _popup.PopupClient(Loc.GetString("rcd-component-deconstruct-target-not-on-whitelist-message"), uid, user);
+
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    #endregion
+
+    #region Entity construction/deconstruction
+
+    private void FinalizeRCDOperation(EntityUid uid, RCDComponent component, MapGridData mapGridData, Direction direction, EntityUid? target, EntityUid user)
+    {
+        if (!_net.IsServer)
+            return;
+
+        if (component.CachedPrototype.Prototype == null)
+            return;
+
+        switch (component.CachedPrototype.Mode)
+        {
+            case RcdMode.ConstructTile:
+                _mapSystem.SetTile(mapGridData.GridUid, mapGridData.Component, mapGridData.Position, new Tile(_tileDefMan[component.CachedPrototype.Prototype].TileId));
+                _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(user):user} used RCD to set grid: {mapGridData.GridUid} {mapGridData.Position} to {component.CachedPrototype.Prototype}");
+                break;
+
+            case RcdMode.ConstructObject:
+                var ent = Spawn(component.CachedPrototype.Prototype, _mapSystem.GridTileToLocal(mapGridData.GridUid, mapGridData.Component, mapGridData.Position));
+
+                switch (component.CachedPrototype.Rotation)
+                {
+                    case RcdRotation.Fixed:
+                        Transform(ent).LocalRotation = Angle.Zero;
+                        break;
+                    case RcdRotation.Camera:
+                        Transform(ent).LocalRotation = Transform(uid).LocalRotation;
+                        break;
+                    case RcdRotation.User:
+                        Transform(ent).LocalRotation = direction.ToAngle();
+                        break;
+                }
+
+                _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(user):user} used RCD to spawn {ToPrettyString(ent)} at {mapGridData.Position} on grid {mapGridData.GridUid}");
+                break;
 
-                return true;
-            //We don't want to place a space tile on something that's already a space tile. Let's do the inverse of the last check.
             case RcdMode.Deconstruct:
-                if (tile.Tile.IsEmpty)
-                    return false;
 
-                //They tried to decon a turf but...
                 if (target == null)
                 {
-                    // the turf is blocked
-                    if (IsTileBlocked(tile))
-                    {
-                        _popup.PopupClient(Loc.GetString("rcd-component-tile-obstructed-message"), uid, user);
-                        return false;
-                    }
-                    // the turf can't be destroyed (planet probably)
-
-                    if (tileDef.Indestructible)
-                    {
-                        _popup.PopupClient(Loc.GetString("rcd-component-tile-indestructible-message"), uid, user);
-                        return false;
-                    }
+                    // Deconstruct tile (either converts the tile to lattice, or removes lattice)
+                    var tile = (mapGridData.Tile.Tile.GetContentTileDefinition().ID != "Lattice") ? new Tile(_tileDefMan["Lattice"].TileId) : Tile.Empty;
+                    _mapSystem.SetTile(mapGridData.GridUid, mapGridData.Component, mapGridData.Position, tile);
+                    _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(user):user} used RCD to set grid: {mapGridData.GridUid} tile: {mapGridData.Position} open to space");
                 }
-                //They tried to decon a non-turf but it's not in the whitelist
-                else if (!_tag.HasTag(target.Value, "RCDDeconstructWhitelist"))
+                else
                 {
-                    _popup.PopupClient(Loc.GetString("rcd-component-deconstruct-target-not-on-whitelist-message"), uid, user);
-                    return false;
+                    // Deconstruct object
+                    _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(user):user} used RCD to delete {ToPrettyString(target):target}");
+                    QueueDel(target);
                 }
 
-                return true;
-            //Walls are a special behaviour, and require us to build a new object with a transform rather than setting a grid tile, thus we early return to avoid the tile set code.
-            case RcdMode.Walls:
-                if (tile.Tile.IsEmpty)
-                {
-                    _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-wall-tile-not-empty-message"), uid, user);
-                    return false;
-                }
-
-                if (IsTileBlocked(tile))
-                {
-                    _popup.PopupClient(Loc.GetString("rcd-component-tile-obstructed-message"), uid, user);
-                    return false;
-                }
-                return true;
-            case RcdMode.Airlock:
-                if (tile.Tile.IsEmpty)
-                {
-                    _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-airlock-tile-not-empty-message"), uid, user);
-                    return false;
-                }
-                if (IsTileBlocked(tile))
-                {
-                    _popup.PopupClient(Loc.GetString("rcd-component-tile-obstructed-message"), uid, user);
-                    return false;
-                }
-                return true;
-            default:
-                return false; //I don't know why this would happen, but sure I guess. Get out of here invalid state!
+                break;
         }
     }
 
-    private void NextMode(EntityUid uid, RCDComponent comp, EntityUid user)
+    #endregion
+
+    #region Utility functions
+
+    public bool TryGetMapGridData(EntityCoordinates location, [NotNullWhen(true)] out MapGridData? mapGridData)
     {
-        _audio.PlayPredicted(comp.SwapModeSound, uid, user);
+        mapGridData = null;
+        var gridUid = location.GetGridUid(EntityManager);
 
-        var mode = (int) comp.Mode;
-        mode = ++mode % _rcdModeCount;
-        comp.Mode = (RcdMode) mode;
-        Dirty(uid, comp);
+        if (!TryComp<MapGridComponent>(gridUid, out var mapGrid))
+        {
+            location = location.AlignWithClosestGridTile(1.75f, EntityManager);
+            gridUid = location.GetGridUid(EntityManager);
 
-        var msg = Loc.GetString("rcd-component-change-mode", ("mode", comp.Mode.ToString()));
-        _popup.PopupClient(msg, uid, user);
+            // Check if we got a grid ID the second time round
+            if (!TryComp(gridUid, out mapGrid))
+                return false;
+        }
+
+        gridUid = mapGrid.Owner;
+
+        var tile = _mapSystem.GetTileRef(gridUid.Value, mapGrid, location);
+        var position = _mapSystem.TileIndicesFor(gridUid.Value, mapGrid, location);
+        mapGridData = new MapGridData(gridUid.Value, mapGrid, location, tile, position);
+
+        return true;
     }
 
-    private bool IsTileBlocked(TileRef tile)
+    private bool DoesCustomBoundsIntersectWithFixture(PolygonShape boundingPolygon, Transform boundingTransform, EntityUid fixtureOwner, Fixture fixture)
     {
-        return _turf.IsTileBlocked(tile, CollisionGroup.MobMask);
+        var entXformComp = Transform(fixtureOwner);
+        var entXform = new Transform(new(), entXformComp.LocalRotation);
+
+        return boundingPolygon.ComputeAABB(boundingTransform, 0).Intersects(fixture.Shape.ComputeAABB(entXform, 0));
+    }
+
+    public void UpdateCachedPrototype(EntityUid uid, RCDComponent component)
+    {
+        if (component.ProtoId.Id != component.CachedPrototype?.Prototype)
+            component.CachedPrototype = _protoManager.Index(component.ProtoId);
+    }
+
+    #endregion
+}
+
+public struct MapGridData
+{
+    public EntityUid GridUid;
+    public MapGridComponent Component;
+    public EntityCoordinates Location;
+    public TileRef Tile;
+    public Vector2i Position;
+
+    public MapGridData(EntityUid gridUid, MapGridComponent component, EntityCoordinates location, TileRef tile, Vector2i position)
+    {
+        GridUid = gridUid;
+        Component = component;
+        Location = location;
+        Tile = tile;
+        Position = position;
     }
 }
 
 [Serializable, NetSerializable]
 public sealed partial class RCDDoAfterEvent : DoAfterEvent
 {
-    [DataField("location", required: true)]
-    public NetCoordinates Location = default!;
+    [DataField(required: true)]
+    public NetCoordinates Location { get; private set; } = default!;
 
-    [DataField("startingMode", required: true)]
-    public RcdMode StartingMode = default!;
+    [DataField]
+    public Direction Direction { get; private set; } = default!;
 
-    private RCDDoAfterEvent()
-    {
-    }
+    [DataField]
+    public ProtoId<RCDPrototype> StartingProtoId { get; private set; } = default!;
 
-    public RCDDoAfterEvent(NetCoordinates location, RcdMode startingMode)
+    [DataField]
+    public int Cost { get; private set; } = 1;
+
+    [DataField("fx")]
+    public NetEntity? Effect { get; private set; } = null;
+
+    private RCDDoAfterEvent() { }
+
+    public RCDDoAfterEvent(NetCoordinates location, Direction direction, ProtoId<RCDPrototype> startingProtoId, int cost, NetEntity? effect = null)
     {
         Location = location;
-        StartingMode = startingMode;
+        Direction = direction;
+        StartingProtoId = startingProtoId;
+        Cost = cost;
+        Effect = effect;
     }
 
     public override DoAfterEvent Clone() => this;
diff --git a/Content.Shared/Random/RulesPrototype.cs b/Content.Shared/Random/RulesPrototype.cs
index 6bbc3a68f8..20961af8e7 100644
--- a/Content.Shared/Random/RulesPrototype.cs
+++ b/Content.Shared/Random/RulesPrototype.cs
@@ -116,8 +116,8 @@ public sealed partial class NearbyAccessRule : RulesRule
     [DataField("count")]
     public int Count = 1;
 
-    [DataField("access", required: true, customTypeSerializer: typeof(PrototypeIdListSerializer<AccessLevelPrototype>))]
-    public List<string> Access = new();
+    [DataField("access", required: true)]
+    public List<ProtoId<AccessLevelPrototype>> Access = new();
 
     [DataField("range")]
     public float Range = 10f;
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 0c2c85b379..54f5fa4f4c 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -106,21 +106,20 @@ namespace Content.Shared.Roles
         [DataField("special", serverOnly: true)]
         public JobSpecial[] Special { get; private set; } = Array.Empty<JobSpecial>();
 
-        [DataField("access", customTypeSerializer: typeof(PrototypeIdListSerializer<AccessLevelPrototype>))]
-        public IReadOnlyCollection<string> Access { get; private set; } = Array.Empty<string>();
+        [DataField("access")]
+        public IReadOnlyCollection<ProtoId<AccessLevelPrototype>> Access { get; private set; } = Array.Empty<ProtoId<AccessLevelPrototype>>();
 
-        [DataField("accessGroups", customTypeSerializer: typeof(PrototypeIdListSerializer<AccessGroupPrototype>))]
-        public IReadOnlyCollection<string> AccessGroups { get; private set; } = Array.Empty<string>();
+        [DataField("accessGroups")]
+        public IReadOnlyCollection<ProtoId<AccessGroupPrototype>> AccessGroups { get; private set; } = Array.Empty<ProtoId<AccessGroupPrototype>>();
 
-        [DataField("extendedAccess", customTypeSerializer: typeof(PrototypeIdListSerializer<AccessLevelPrototype>))]
-        public IReadOnlyCollection<string> ExtendedAccess { get; private set; } = Array.Empty<string>();
+        [DataField("extendedAccess")]
+        public IReadOnlyCollection<ProtoId<AccessLevelPrototype>> ExtendedAccess { get; private set; } = Array.Empty<ProtoId<AccessLevelPrototype>>();
 
-        [DataField("extendedAccessGroups", customTypeSerializer: typeof(PrototypeIdListSerializer<AccessGroupPrototype>))]
-        public IReadOnlyCollection<string> ExtendedAccessGroups { get; private set; } = Array.Empty<string>();
-
-        [DataField("whitelistedSpecies", customTypeSerializer: typeof(PrototypeIdListSerializer<SpeciesPrototype>))]
-        public IReadOnlyCollection<string> WhitelistedSpecies { get; private set;  } = Array.Empty<string>();
+        [DataField("extendedAccessGroups")]
+        public IReadOnlyCollection<ProtoId<AccessGroupPrototype>> ExtendedAccessGroups { get; private set; } = Array.Empty<ProtoId<AccessGroupPrototype>>();
 
+        [DataField("whitelistedSpecies")]
+        public IReadOnlyCollection<ProtoId<SpeciesPrototype>> WhitelistedSpecies { get; private set; } = Array.Empty<ProtoId<SpeciesPrototype>>();
     }
 
     /// <summary>
diff --git a/Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs b/Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs
index fe4d59b81a..4844a1f3fd 100644
--- a/Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs
+++ b/Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Salvage.Expeditions.Modifiers;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
@@ -30,7 +31,11 @@ public sealed class SalvageExpeditionConsoleState : BoundUserInterfaceState
 [RegisterComponent, NetworkedComponent]
 public sealed partial class SalvageExpeditionConsoleComponent : Component
 {
-
+    /// <summary>
+    /// The sound made when spawning a coordinates disk
+    /// </summary>
+    [DataField]
+    public SoundSpecifier PrintSound = new SoundPathSpecifier("/Audio/Machines/terminal_insert_disc.ogg");
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Shuttles/Components/FTLDestinationComponent.cs b/Content.Shared/Shuttles/Components/FTLDestinationComponent.cs
index 58cff96c2b..d4bc536a29 100644
--- a/Content.Shared/Shuttles/Components/FTLDestinationComponent.cs
+++ b/Content.Shared/Shuttles/Components/FTLDestinationComponent.cs
@@ -23,4 +23,10 @@ public sealed partial class FTLDestinationComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public bool BeaconsOnly;
+
+    /// <summary>
+    /// Shuttles must use a corresponding CD to travel to this location.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    public bool RequireCoordinateDisk = false;
 }
diff --git a/Content.Shared/Shuttles/Components/SharedShuttleConsoleComponent.cs b/Content.Shared/Shuttles/Components/SharedShuttleConsoleComponent.cs
index 436c830d20..2ee03210ba 100644
--- a/Content.Shared/Shuttles/Components/SharedShuttleConsoleComponent.cs
+++ b/Content.Shared/Shuttles/Components/SharedShuttleConsoleComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Shared.Shuttles.Components
     [NetworkedComponent]
     public abstract partial class SharedShuttleConsoleComponent : Component
     {
-
+        public static string DiskSlotName = "disk_slot";
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Shuttles/Components/ShuttleDestinationCoordinatesComponent.cs b/Content.Shared/Shuttles/Components/ShuttleDestinationCoordinatesComponent.cs
new file mode 100644
index 0000000000..009dee49d1
--- /dev/null
+++ b/Content.Shared/Shuttles/Components/ShuttleDestinationCoordinatesComponent.cs
@@ -0,0 +1,15 @@
+namespace Content.Shared.Shuttles.Components;
+using Robust.Shared.GameStates;
+
+/// <summary>
+/// Enables a shuttle to travel to a destination with an item inserted into its console
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ShuttleDestinationCoordinatesComponent : Component
+{
+    /// <summary>
+    /// Uid for entity containing the FTLDestination component
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    public EntityUid? Destination;
+}
diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
index ca25a49b23..d859d9f485 100644
--- a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
+++ b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.UI.MapObjects;
@@ -10,7 +11,8 @@ namespace Content.Shared.Shuttles.Systems;
 
 public abstract partial class SharedShuttleSystem : EntitySystem
 {
-    [Dependency] private   readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
     [Dependency] protected readonly SharedMapSystem Maps = default!;
     [Dependency] protected readonly SharedTransformSystem XformSystem = default!;
 
@@ -34,7 +36,7 @@ public abstract partial class SharedShuttleSystem : EntitySystem
     /// <summary>
     /// Returns whether an entity can FTL to the specified map.
     /// </summary>
-    public bool CanFTLTo(EntityUid shuttleUid, MapId targetMap)
+    public bool CanFTLTo(EntityUid shuttleUid, MapId targetMap, EntityUid consoleUid)
     {
         var mapUid = _mapManager.GetMapEntityId(targetMap);
         var shuttleMap = _xformQuery.GetComponent(shuttleUid).MapID;
@@ -42,10 +44,40 @@ public abstract partial class SharedShuttleSystem : EntitySystem
         if (shuttleMap == targetMap)
             return true;
 
-        if (!TryComp<FTLDestinationComponent>(mapUid, out var destination) ||
-            !destination.Enabled)
-        {
+        if (!TryComp<FTLDestinationComponent>(mapUid, out var destination) || !destination.Enabled)
             return false;
+
+        if (destination.RequireCoordinateDisk)
+        {
+            if (!TryComp<ItemSlotsComponent>(consoleUid, out var slot))
+            {
+                return false;
+            }
+
+            if (!_itemSlots.TryGetSlot(consoleUid, SharedShuttleConsoleComponent.DiskSlotName, out var itemSlot, component: slot) || !itemSlot.HasItem)
+            {
+                return false;
+            }
+
+            if (itemSlot.Item is { Valid: true } disk)
+            {
+                ShuttleDestinationCoordinatesComponent? diskCoordinates = null;
+                if (!Resolve(disk, ref diskCoordinates))
+                {
+                    return false;
+                }
+
+                var diskCoords = diskCoordinates.Destination;
+
+                if (diskCoords == null || !TryComp<FTLDestinationComponent>(diskCoords.Value, out var diskDestination) || diskDestination != destination)
+                {
+                    return false;
+                }
+            }
+            else
+            {
+                return false;
+            }
         }
 
         if (HasComp<FTLMapComponent>(mapUid))
diff --git a/Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs
new file mode 100644
index 0000000000..49118d9799
--- /dev/null
+++ b/Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.Prototypes;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Sound.Components;
+
+/// <summary>
+/// Whenever this item is used upon by an entity, with a tag or component within a whitelist, in the hand of a user, play a sound
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class EmitSoundOnInteractUsingComponent : BaseEmitSoundComponent
+{
+    [DataField(required: true)]
+    public EntityWhitelist Whitelist = new();
+}
diff --git a/Content.Shared/Sound/SharedEmitSoundSystem.cs b/Content.Shared/Sound/SharedEmitSoundSystem.cs
index a1e25cf6ad..c617ef88c6 100644
--- a/Content.Shared/Sound/SharedEmitSoundSystem.cs
+++ b/Content.Shared/Sound/SharedEmitSoundSystem.cs
@@ -42,6 +42,7 @@ public abstract class SharedEmitSoundSystem : EntitySystem
         SubscribeLocalEvent<EmitSoundOnActivateComponent, ActivateInWorldEvent>(OnEmitSoundOnActivateInWorld);
         SubscribeLocalEvent<EmitSoundOnPickupComponent, GotEquippedHandEvent>(OnEmitSoundOnPickup);
         SubscribeLocalEvent<EmitSoundOnDropComponent, DroppedEvent>(OnEmitSoundOnDrop);
+        SubscribeLocalEvent<EmitSoundOnInteractUsingComponent, InteractUsingEvent>(OnEmitSoundOnInteractUsing);
 
         SubscribeLocalEvent<EmitSoundOnCollideComponent, StartCollideEvent>(OnEmitSoundOnCollide);
     }
@@ -103,6 +104,13 @@ public abstract class SharedEmitSoundSystem : EntitySystem
         TryEmitSound(uid, component, args.User);
     }
 
+    private void OnEmitSoundOnInteractUsing(Entity<EmitSoundOnInteractUsingComponent> ent, ref InteractUsingEvent args)
+    {
+        if (ent.Comp.Whitelist.IsValid(args.Used, EntityManager))
+        {
+            TryEmitSound(ent, ent.Comp, args.User);
+        }
+    }
     protected void TryEmitSound(EntityUid uid, BaseEmitSoundComponent component, EntityUid? user=null, bool predict=true)
     {
         if (component.Sound == null)
diff --git a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
index feb1cebb8e..b238c6fc72 100644
--- a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
+++ b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
@@ -4,7 +4,6 @@ using Content.Shared.DoAfter;
 using Content.Shared.Doors.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
-using Content.Shared.Paint;
 using Content.Shared.SprayPainter.Components;
 using Content.Shared.SprayPainter.Prototypes;
 using Robust.Shared.Audio.Systems;
@@ -130,8 +129,6 @@ public abstract class SharedSprayPainterSystem : EntitySystem
             return;
         }
 
-        RemComp<PaintedComponent>(ent);
-
         var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, painter.AirlockSprayTime, new SprayPainterDoorDoAfterEvent(sprite, style.Department), args.Used, target: ent, used: args.Used)
         {
             BreakOnMove = true,
diff --git a/Content.Shared/StatusIcon/StatusIconPrototype.cs b/Content.Shared/StatusIcon/StatusIconPrototype.cs
index 994de068f9..5d0f2e8724 100644
--- a/Content.Shared/StatusIcon/StatusIconPrototype.cs
+++ b/Content.Shared/StatusIcon/StatusIconPrototype.cs
@@ -46,6 +46,12 @@ public partial class StatusIconData : IComparable<StatusIconData>
     /// </summary>
     [DataField]
     public int Offset;
+
+    /// <summary>
+    /// Sets if the icon should be rendered with or without the effect of lighting.
+    /// </summary>
+    [DataField]
+    public bool IsShaded;
 }
 
 /// <summary>
diff --git a/Content.Shared/Storage/Components/SecretStashComponent.cs b/Content.Shared/Storage/Components/SecretStashComponent.cs
new file mode 100644
index 0000000000..8595f79ca5
--- /dev/null
+++ b/Content.Shared/Storage/Components/SecretStashComponent.cs
@@ -0,0 +1,90 @@
+using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Item;
+using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
+using Content.Shared.Tools;
+using Robust.Shared.GameStates;
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Storage.Components
+{
+    /// <summary>
+    ///     Logic for a secret slot stash, like plant pot or toilet cistern.
+    ///     Unlike <see cref="ItemSlotsComponent"/> it doesn't have interaction logic or verbs.
+    ///     Other classes like <see cref="ToiletComponent"/> should implement it.
+    /// </summary>
+    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+    [Access(typeof(SecretStashSystem))]
+    public sealed partial class SecretStashComponent : Component
+    {
+        /// <summary>
+        ///     Max item size that can be fitted into secret stash.
+        /// </summary>
+        [DataField("maxItemSize")]
+        public ProtoId<ItemSizePrototype> MaxItemSize = "Small";
+
+        /// <summary>
+        /// If stash has way to open then this will switch between open and closed.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public bool ToggleOpen;
+
+        /// <summary>
+        /// Prying the door.
+        /// </summary>
+        [DataField]
+        public float PryDoorTime = 1f;
+
+        [DataField]
+        public ProtoId<ToolQualityPrototype> PryingQuality = "Prying";
+
+        /// <summary>
+        /// Is stash openable?.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public bool OpenableStash = false;
+
+        /// <summary>
+        ///     IC secret stash name. For example "the toilet cistern".
+        ///     If empty string, will replace it with entity name in init.
+        /// </summary>
+        [DataField]
+        public string SecretPartName { get; set; } = "";
+
+        [DataField, AutoNetworkedField]
+        public string ExamineStash = "comp-secret-stash-on-examine-found-hidden-item";
+
+        /// <summary>
+        ///     Container used to keep secret stash item.
+        /// </summary>
+        [ViewVariables]
+        public ContainerSlot ItemContainer = default!;
+
+    }
+
+    /// <summary>
+    /// Simple pry event for prying open a stash door.
+    /// </summary>
+    [Serializable, NetSerializable]
+    public sealed partial class StashPryDoAfterEvent : SimpleDoAfterEvent
+    {
+    }
+
+    /// <summary>
+    /// Visualizers for handling stash open closed state if stash has door.
+    /// </summary>
+    [Serializable, NetSerializable]
+    public enum StashVisuals : byte
+    {
+        DoorVisualState,
+    }
+
+    [Serializable, NetSerializable]
+    public enum DoorVisualState : byte
+    {
+        DoorOpen,
+        DoorClosed
+    }
+}
diff --git a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
index 8a8b636a67..91acde47e1 100644
--- a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
@@ -159,11 +159,11 @@ public sealed class DumpableSystem : EntitySystem
         {
             dumped = true;
 
-            var targetPos = _transformSystem.GetWorldPosition(args.Args.Target.Value);
+            var (targetPos, targetRot) = _transformSystem.GetWorldPositionRotation(args.Args.Target.Value);
 
             foreach (var entity in dumpQueue)
             {
-                _transformSystem.SetWorldPosition(entity, targetPos + _random.NextVector2Box() / 4);
+                _transformSystem.SetWorldPositionRotation(entity, targetPos + _random.NextVector2Box() / 4, targetRot);
             }
         }
         else
diff --git a/Content.Server/Storage/EntitySystems/SecretStashSystem.cs b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
similarity index 55%
rename from Content.Server/Storage/EntitySystems/SecretStashSystem.cs
rename to Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
index 49be0a2f88..9aee1b982e 100644
--- a/Content.Server/Storage/EntitySystems/SecretStashSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
@@ -1,25 +1,37 @@
-using Content.Server.Popups;
-using Content.Server.Storage.Components;
+using Content.Shared.Popups;
+using Content.Shared.Storage.Components;
 using Content.Shared.Destructible;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Item;
 using Robust.Shared.Containers;
+using Content.Shared.Interaction;
+using Content.Shared.Tools.Systems;
+using Content.Shared.Examine;
 
-namespace Content.Server.Storage.EntitySystems
+namespace Content.Shared.Storage.EntitySystems
 {
+    /// <summary>
+    /// Secret Stash allows an item to be hidden within.
+    /// </summary>
     public sealed class SecretStashSystem : EntitySystem
     {
-        [Dependency] private readonly PopupSystem _popupSystem = default!;
+        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
         [Dependency] private readonly SharedItemSystem _item = default!;
+        [Dependency] private readonly SharedToolSystem _tool = default!;
+        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
         public override void Initialize()
         {
             base.Initialize();
             SubscribeLocalEvent<SecretStashComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<SecretStashComponent, DestructionEventArgs>(OnDestroyed);
+            SubscribeLocalEvent<SecretStashComponent, StashPryDoAfterEvent>(OnSecretStashPried);
+            SubscribeLocalEvent<SecretStashComponent, InteractUsingEvent>(OnInteractUsing);
+            SubscribeLocalEvent<SecretStashComponent, InteractHandEvent>(OnInteractHand);
+            SubscribeLocalEvent<SecretStashComponent, ExaminedEvent>(OnExamine);
         }
 
         private void OnInit(EntityUid uid, SecretStashComponent component, ComponentInit args)
@@ -42,6 +54,73 @@ namespace Content.Server.Storage.EntitySystems
             return component.ItemContainer.ContainedEntity != null;
         }
 
+        private void OnInteractUsing(EntityUid uid, SecretStashComponent component, InteractUsingEvent args)
+        {
+            if (args.Handled)
+                return;
+
+            if (!component.OpenableStash)
+                return;
+
+            // is player trying place or lift off cistern lid?
+            if (_tool.UseTool(args.Used, args.User, uid, component.PryDoorTime, component.PryingQuality, new StashPryDoAfterEvent()))
+                args.Handled = true;
+            // maybe player is trying to hide something inside cistern?
+            else if (component.ToggleOpen)
+            {
+                TryHideItem(uid, args.User, args.Used);
+                args.Handled = true;
+            }
+        }
+
+        private void OnInteractHand(EntityUid uid, SecretStashComponent component, InteractHandEvent args)
+        {
+            if (args.Handled)
+                return;
+
+            if (!component.OpenableStash)
+                return;
+
+            // trying to get something from stash?
+            if (component.ToggleOpen)
+            {
+                var gotItem = TryGetItem(uid, args.User);
+                if (gotItem)
+                {
+                    args.Handled = true;
+                    return;
+                }
+            }
+            args.Handled = true;
+        }
+
+        private void OnSecretStashPried(EntityUid uid, SecretStashComponent component, StashPryDoAfterEvent args)
+        {
+            if (args.Cancelled)
+                return;
+
+            ToggleOpen(uid, component);
+        }
+
+        public void ToggleOpen(EntityUid uid, SecretStashComponent? component = null, MetaDataComponent? meta = null)
+        {
+            if (!Resolve(uid, ref component))
+                return;
+
+            component.ToggleOpen = !component.ToggleOpen;
+
+            UpdateAppearance(uid, component);
+            Dirty(uid, component, meta);
+        }
+
+        private void UpdateAppearance(EntityUid uid, SecretStashComponent? component = null)
+        {
+            if (!Resolve(uid, ref component))
+                return;
+
+            _appearance.SetData(uid, StashVisuals.DoorVisualState, component.ToggleOpen ? DoorVisualState.DoorOpen : DoorVisualState.DoorClosed);
+        }
+
         /// <summary>
         ///     Tries to hide item inside secret stash from hands of user.
         /// </summary>
@@ -62,7 +141,7 @@ namespace Content.Server.Storage.EntitySystems
             if (container.ContainedEntity != null)
             {
                 var msg = Loc.GetString("comp-secret-stash-action-hide-container-not-empty");
-                _popupSystem.PopupEntity(msg, uid, userUid);
+                _popupSystem.PopupClient(msg, uid, userUid);
                 return false;
             }
 
@@ -71,7 +150,7 @@ namespace Content.Server.Storage.EntitySystems
             {
                 var msg = Loc.GetString("comp-secret-stash-action-hide-item-too-big",
                     ("item", itemToHideUid), ("stash", GetSecretPartName(uid, component)));
-                _popupSystem.PopupEntity(msg, uid, userUid);
+                _popupSystem.PopupClient(msg, uid, userUid);
                 return false;
             }
 
@@ -84,7 +163,7 @@ namespace Content.Server.Storage.EntitySystems
             // all done, show success message
             var successMsg = Loc.GetString("comp-secret-stash-action-hide-success",
                 ("item", itemToHideUid), ("this", GetSecretPartName(uid, component)));
-            _popupSystem.PopupEntity(successMsg, uid, userUid);
+            _popupSystem.PopupClient(successMsg, uid, userUid);
             return true;
         }
 
@@ -113,11 +192,23 @@ namespace Content.Server.Storage.EntitySystems
             // show success message
             var successMsg = Loc.GetString("comp-secret-stash-action-get-item-found-something",
                 ("stash", GetSecretPartName(uid, component)));
-            _popupSystem.PopupEntity(successMsg, uid, userUid);
+            _popupSystem.PopupClient(successMsg, uid, userUid);
 
             return true;
         }
 
+        private void OnExamine(EntityUid uid, SecretStashComponent component, ExaminedEvent args)
+        {
+            if (args.IsInDetailsRange && component.ToggleOpen)
+            {
+                if (HasItemInside(uid))
+                {
+                    var msg = Loc.GetString(component.ExamineStash);
+                    args.PushMarkup(msg);
+                }
+            }
+        }
+
         private string GetSecretPartName(EntityUid uid, SecretStashComponent stash)
         {
             if (stash.SecretPartName != "")
diff --git a/Content.Shared/Store/ListingLocalisationHelpers.cs b/Content.Shared/Store/ListingLocalisationHelpers.cs
new file mode 100644
index 0000000000..3ac75cd801
--- /dev/null
+++ b/Content.Shared/Store/ListingLocalisationHelpers.cs
@@ -0,0 +1,42 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Store;
+
+public static class ListingLocalisationHelpers
+{
+    /// <summary>
+    /// ListingData's Name field can be either a localisation string or the actual entity's name.
+    /// This function gets a localised name from the localisation string if it exists, and if not, it gets the entity's name.
+    /// If neither a localised string exists, or an associated entity name, it will return the value of the "Name" field.
+    /// </summary>
+    public static string GetLocalisedNameOrEntityName(ListingData listingData, IPrototypeManager prototypeManager)
+    {
+        bool wasLocalised = Loc.TryGetString(listingData.Name, out string? listingName);
+
+        if (!wasLocalised && listingData.ProductEntity != null)
+        {
+            var proto = prototypeManager.Index<EntityPrototype>(listingData.ProductEntity);
+            listingName = proto.Name;
+        }
+
+        return listingName ?? listingData.Name;
+    }
+
+    /// <summary>
+    /// ListingData's Description field can be either a localisation string or the actual entity's description.
+    /// This function gets a localised description from the localisation string if it exists, and if not, it gets the entity's description.
+    /// If neither a localised string exists, or an associated entity description, it will return the value of the "Description" field.
+    /// </summary>
+    public static string GetLocalisedDescriptionOrEntityDescription(ListingData listingData, IPrototypeManager prototypeManager)
+    {
+        bool wasLocalised = Loc.TryGetString(listingData.Description, out string? listingDesc);
+
+        if (!wasLocalised && listingData.ProductEntity != null)
+        {
+            var proto = prototypeManager.Index<EntityPrototype>(listingData.ProductEntity);
+            listingDesc = proto.Description;
+        }
+
+        return listingDesc ?? listingData.Description;
+    }
+}
diff --git a/Content.Shared/SubFloor/SharedTrayScannerSystem.cs b/Content.Shared/SubFloor/SharedTrayScannerSystem.cs
index da56c8d1c7..6e8393036d 100644
--- a/Content.Shared/SubFloor/SharedTrayScannerSystem.cs
+++ b/Content.Shared/SubFloor/SharedTrayScannerSystem.cs
@@ -48,7 +48,7 @@ public abstract class SharedTrayScannerSystem : EntitySystem
 
     private void OnTrayScannerGetState(EntityUid uid, TrayScannerComponent scanner, ref ComponentGetState args)
     {
-        args.State = new TrayScannerState(scanner.Enabled);
+        args.State = new TrayScannerState(scanner.Enabled, scanner.Range);
     }
 
     private void OnTrayScannerHandleState(EntityUid uid, TrayScannerComponent scanner, ref ComponentHandleState args)
@@ -56,6 +56,7 @@ public abstract class SharedTrayScannerSystem : EntitySystem
         if (args.Current is not TrayScannerState state)
             return;
 
+        scanner.Range = state.Range;
         SetScannerEnabled(uid, state.Enabled, scanner);
     }
 }
diff --git a/Content.Shared/SubFloor/TrayScannerComponent.cs b/Content.Shared/SubFloor/TrayScannerComponent.cs
index 98e43246a8..acde11ff50 100644
--- a/Content.Shared/SubFloor/TrayScannerComponent.cs
+++ b/Content.Shared/SubFloor/TrayScannerComponent.cs
@@ -22,9 +22,11 @@ public sealed partial class TrayScannerComponent : Component
 public sealed class TrayScannerState : ComponentState
 {
     public bool Enabled;
+    public float Range;
 
-    public TrayScannerState(bool enabled)
+    public TrayScannerState(bool enabled, float range)
     {
         Enabled = enabled;
+        Range = range;
     }
 }
diff --git a/Content.Shared/Toilet/Components/ToiletComponent.cs b/Content.Shared/Toilet/Components/ToiletComponent.cs
new file mode 100644
index 0000000000..5de74e08f6
--- /dev/null
+++ b/Content.Shared/Toilet/Components/ToiletComponent.cs
@@ -0,0 +1,40 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Toilet.Components
+{
+    /// <summary>
+    /// Toilets that can be flushed, seats toggled up and down, items hidden in cistern.
+    /// </summary>
+    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+    public sealed partial class ToiletComponent : Component
+    {
+        /// <summary>
+        /// Toggles seat state.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public bool ToggleSeat;
+
+
+        /// <summary>
+        /// Sound to play when toggling toilet seat.
+        /// </summary>
+        [DataField]
+        public SoundSpecifier SeatSound = new SoundPathSpecifier("/Audio/Effects/toilet_seat_down.ogg");
+    }
+
+    [Serializable, NetSerializable]
+    public enum ToiletVisuals : byte
+    {
+        SeatVisualState,
+    }
+
+    [Serializable, NetSerializable]
+    public enum SeatVisualState : byte
+    {
+        SeatUp,
+        SeatDown
+    }
+}
+
diff --git a/Content.Shared/Toilet/Systems/SharedToiletSystem.cs b/Content.Shared/Toilet/Systems/SharedToiletSystem.cs
new file mode 100644
index 0000000000..87df69e88d
--- /dev/null
+++ b/Content.Shared/Toilet/Systems/SharedToiletSystem.cs
@@ -0,0 +1,109 @@
+using Content.Shared.Buckle.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Verbs;
+using Content.Shared.Plunger.Components;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
+using Content.Shared.Toilet.Components;
+
+namespace Content.Shared.Toilet.Systems
+{
+    /// <summary>
+    /// Handles sprite changes for both toilet seat up and down as well as for lid open and closed. Handles interactions with hidden stash
+    /// </summary>
+
+    public abstract class SharedToiletSystem : EntitySystem
+    {
+        [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly SharedAudioSystem _audio = default!;
+        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<ToiletComponent, MapInitEvent>(OnMapInit);
+            SubscribeLocalEvent<ToiletComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleSeatVerb);
+            SubscribeLocalEvent<ToiletComponent, ActivateInWorldEvent>(OnActivateInWorld);
+        }
+
+        private void OnMapInit(EntityUid uid, ToiletComponent component, MapInitEvent args)
+        {
+            if (_random.Prob(0.5f))
+                component.ToggleSeat = true;
+
+            if (_random.Prob(0.3f))
+            {
+                TryComp<PlungerUseComponent>(uid, out var plunger);
+
+                if (plunger == null)
+                    return;
+
+                plunger.NeedsPlunger = true;
+            }
+
+            UpdateAppearance(uid);
+            Dirty(uid, component);
+        }
+
+        public bool CanToggle(EntityUid uid)
+        {
+            return TryComp<StrapComponent>(uid, out var strap) && strap.BuckledEntities.Count == 0;
+        }
+
+        private void OnToggleSeatVerb(EntityUid uid, ToiletComponent component, GetVerbsEvent<AlternativeVerb> args)
+        {
+            if (!args.CanInteract || !args.CanAccess || !CanToggle(uid) || args.Hands == null)
+                return;
+
+            AlternativeVerb toggleVerb = new()
+            {
+                Act = () => ToggleToiletSeat(uid, args.User, component)
+            };
+
+            if (component.ToggleSeat)
+            {
+                toggleVerb.Text = Loc.GetString("toilet-seat-close");
+                toggleVerb.Icon =
+                    new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/close.svg.192dpi.png"));
+            }
+            else
+            {
+                toggleVerb.Text = Loc.GetString("toilet-seat-open");
+                toggleVerb.Icon =
+                    new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/open.svg.192dpi.png"));
+            }
+            args.Verbs.Add(toggleVerb);
+        }
+
+        private void OnActivateInWorld(EntityUid uid, ToiletComponent comp, ActivateInWorldEvent args)
+        {
+            if (args.Handled)
+                return;
+
+            args.Handled = true;
+            ToggleToiletSeat(uid, args.User, comp);
+        }
+
+        public void ToggleToiletSeat(EntityUid uid, EntityUid? user = null, ToiletComponent? component = null, MetaDataComponent? meta = null)
+        {
+            if (!Resolve(uid, ref component))
+                return;
+
+            component.ToggleSeat = !component.ToggleSeat;
+
+            _audio.PlayPredicted(component.SeatSound, uid, uid);
+            UpdateAppearance(uid, component);
+            Dirty(uid, component, meta);
+        }
+
+        private void UpdateAppearance(EntityUid uid, ToiletComponent? component = null)
+        {
+            if (!Resolve(uid, ref component))
+                return;
+
+            _appearance.SetData(uid, ToiletVisuals.SeatVisualState, component.ToggleSeat ? SeatVisualState.SeatUp : SeatVisualState.SeatDown);
+        }
+    }
+}
diff --git a/Content.Shared/Toilet/ToiletComponent.cs b/Content.Shared/Toilet/ToiletComponent.cs
deleted file mode 100644
index 161bf81c99..0000000000
--- a/Content.Shared/Toilet/ToiletComponent.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.DoAfter;
-using Content.Shared.Tools;
-using Robust.Shared.Audio;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Toilet
-{
-    [RegisterComponent]
-    public sealed partial class ToiletComponent : Component
-    {
-        [DataField("pryLidTime")]
-        public float PryLidTime = 1f;
-
-        [DataField("pryingQuality", customTypeSerializer:typeof(PrototypeIdSerializer<ToolQualityPrototype>))]
-        public string PryingQuality = "Prying";
-
-        [DataField("toggleSound")]
-        public SoundSpecifier ToggleSound = new SoundPathSpecifier("/Audio/Effects/toilet_seat_down.ogg");
-
-        [DataField("lidOpen")]
-        public bool LidOpen = false;
-
-        [DataField("isSeatUp")]
-        public bool IsSeatUp = false;
-    }
-
-    [Serializable, NetSerializable]
-    public sealed partial class ToiletPryDoAfterEvent : SimpleDoAfterEvent
-    {
-    }
-}
diff --git a/Content.Shared/Toilet/ToiletVisuals.cs b/Content.Shared/Toilet/ToiletVisuals.cs
deleted file mode 100644
index c5992bc0be..0000000000
--- a/Content.Shared/Toilet/ToiletVisuals.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Toilet;
-
-[Serializable, NetSerializable]
-public enum ToiletVisuals
-{
-    LidOpen,
-    SeatUp
-}
diff --git a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
new file mode 100644
index 0000000000..5bf7480202
--- /dev/null
+++ b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
@@ -0,0 +1,108 @@
+using Content.Shared.Weapons.Melee.Components;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+
+namespace Content.Shared.Weapons.Melee;
+
+/// <summary>
+/// This handles <see cref="MeleeSoundComponent"/>
+/// </summary>
+public sealed class MeleeSoundSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+
+    public const float DamagePitchVariation = 0.05f;
+
+    /// <summary>
+    /// Plays the SwingSound from a weapon component
+    /// for immediate feedback, misses and such
+    /// (Swinging a weapon goes "whoosh" whether it hits or not)
+    /// </summary>
+    public void PlaySwingSound(EntityUid userUid, EntityUid weaponUid, MeleeWeaponComponent weaponComponent)
+    {
+        _audio.PlayPredicted(weaponComponent.SwingSound, weaponUid, userUid);
+    }
+
+    /// <summary>
+    /// Takes a "damageType" string as an argument and uses it to
+    /// search one of the various Dictionaries in the MeleeSoundComponent
+    /// for a sound to play, and falls back if that fails
+    /// </summary>
+    /// <param name="damageType"> Serves as a lookup key for a hit sound </param>
+    /// <param name="hitSoundOverride"> A sound can be supplied by the <see cref="MeleeHitEvent"/> itself to override everything else </param>
+    public void PlayHitSound(EntityUid targetUid, EntityUid? userUid, string? damageType, SoundSpecifier? hitSoundOverride, MeleeWeaponComponent weaponComponent)
+    {
+        var hitSound      = weaponComponent.HitSound;
+        var noDamageSound = weaponComponent.NoDamageSound;
+
+        var playedSound = false;
+
+        if (Deleted(targetUid))
+            return;
+
+        // hitting can obv destroy an entity so we play at coords and not following them
+        var coords = Transform(targetUid).Coordinates;
+        // Play sound based off of highest damage type.
+        if (TryComp<MeleeSoundComponent>(targetUid, out var damageSoundComp))
+        {
+            if (damageType == null && damageSoundComp.NoDamageSound != null)
+            {
+                _audio.PlayPredicted(damageSoundComp.NoDamageSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                playedSound = true;
+            }
+            else if (damageType != null && damageSoundComp.SoundTypes?.TryGetValue(damageType, out var damageSoundType) == true)
+            {
+                _audio.PlayPredicted(damageSoundType, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                playedSound = true;
+            }
+            else if (damageType != null && damageSoundComp.SoundGroups?.TryGetValue(damageType, out var damageSoundGroup) == true)
+            {
+                _audio.PlayPredicted(damageSoundGroup, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                playedSound = true;
+            }
+        }
+
+        // Use weapon sounds if the thing being hit doesn't specify its own sounds.
+        if (!playedSound)
+        {
+            if (hitSoundOverride != null)
+            {
+                _audio.PlayPredicted(hitSoundOverride, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                playedSound = true;
+            }
+            else if (hitSound != null)
+            {
+                _audio.PlayPredicted(hitSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                playedSound = true;
+            }
+            else
+            {
+                _audio.PlayPredicted(noDamageSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                playedSound = true;
+            }
+        }
+
+        // Fallback to generic sounds.
+        if (!playedSound)
+        {
+            switch (damageType)
+            {
+                // Unfortunately heat returns caustic group so can't just use the damagegroup in that instance.
+                case "Burn":
+                case "Heat":
+                case "Radiation":
+                case "Cold":
+                    _audio.PlayPredicted(new SoundPathSpecifier("/Audio/Items/welder.ogg"), targetUid, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                    break;
+                // No damage, fallback to tappies
+                case null:
+                    _audio.PlayPredicted(new SoundCollectionSpecifier("WeakHit"), targetUid, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                    break;
+                case "Brute":
+                    _audio.PlayPredicted(new SoundCollectionSpecifier("MetalThud"), targetUid, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                    break;
+            }
+        }
+    }
+
+}
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 489f0cdf09..625b5d5cfd 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -21,8 +21,6 @@ using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Weapons.Ranged.Systems;
 using Content.Shared._White;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
@@ -36,23 +34,22 @@ namespace Content.Shared.Weapons.Melee;
 
 public abstract class SharedMeleeWeaponSystem : EntitySystem
 {
-    [Dependency] protected readonly IGameTiming Timing = default!;
-    [Dependency] protected readonly IMapManager MapManager = default!;
-    [Dependency] private   readonly IPrototypeManager _protoManager = default!;
-    [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
-    [Dependency] protected readonly ActionBlockerSystem Blocker = default!;
-    [Dependency] protected readonly DamageableSystem Damageable = default!;
-    [Dependency] private   readonly InventorySystem _inventory = default!;
-    [Dependency] protected readonly SharedAudioSystem Audio = default!;
-    [Dependency] protected readonly SharedCombatModeSystem CombatMode = default!;
-    [Dependency] protected readonly SharedInteractionSystem Interaction = default!;
-    [Dependency] private   readonly SharedPhysicsSystem _physics = default!;
-    [Dependency] protected readonly SharedPopupSystem PopupSystem = default!;
-    [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
-    [Dependency] private   readonly StaminaSystem _stamina = default!;
-    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] protected readonly ISharedAdminLogManager   AdminLogger     = default!;
+    [Dependency] protected readonly ActionBlockerSystem      Blocker         = default!;
+    [Dependency] protected readonly SharedCombatModeSystem   CombatMode      = default!;
+    [Dependency] protected readonly DamageableSystem         Damageable      = default!;
+    [Dependency] protected readonly SharedInteractionSystem  Interaction     = default!;
+    [Dependency] protected readonly IMapManager              MapManager      = default!;
+    [Dependency] protected readonly SharedPopupSystem        PopupSystem     = default!;
+    [Dependency] protected readonly IGameTiming              Timing          = default!;
+    [Dependency] protected readonly SharedTransformSystem    TransformSystem = default!;
+    [Dependency] private   readonly InventorySystem         _inventory       = default!;
+    [Dependency] private   readonly MeleeSoundSystem        _meleeSound      = default!;
+    [Dependency] private   readonly SharedPhysicsSystem     _physics         = default!;
+    [Dependency] private   readonly IPrototypeManager       _protoManager    = default!;
+    [Dependency] private   readonly StaminaSystem           _stamina         = default!;
+    [Dependency] private   readonly IConfigurationManager   _cfg             = default!;
 
-    public const float DamagePitchVariation = 0.05f;
     private const int AttackMask = (int) (CollisionGroup.MobMask | CollisionGroup.Opaque);
 
     /// <summary>
@@ -90,7 +87,8 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         SubscribeAllEvent<StopAttackEvent>(OnStopAttack);
 
 #if DEBUG
-        SubscribeLocalEvent<MeleeWeaponComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<MeleeWeaponComponent,
+                            MapInitEvent>                   (OnMapInit);
     }
 
     private void OnMapInit(EntityUid uid, MeleeWeaponComponent component, MapInitEvent args)
@@ -487,8 +485,8 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
             }
             var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, null);
             RaiseLocalEvent(meleeUid, missEvent);
-            Audio.PlayPredicted(component.SwingSound, meleeUid, user);
             miss = true; // WD EDIT
+            _meleeSound.PlaySwingSound(user, meleeUid, component);
             return;
         }
 
@@ -550,7 +548,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
 
         }
 
-        PlayHitSound(target.Value, user, GetHighestDamageSound(modifiedDamage, _protoManager), hitEvent.HitSoundOverride, component.HitSound, component.NoDamageSound);
+        _meleeSound.PlayHitSound(target.Value, user, GetHighestDamageSound(modifiedDamage, _protoManager), hitEvent.HitSoundOverride, component);
 
         if (damageResult?.GetTotal() > FixedPoint2.Zero)
         {
@@ -598,7 +596,9 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
             var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, direction);
             RaiseLocalEvent(meleeUid, missEvent);
 
-            Audio.PlayPredicted(component.SwingSound, meleeUid, user);
+            // immediate audio feedback
+            _meleeSound.PlaySwingSound(user, meleeUid, component);
+
             return true;
         }
 
@@ -706,7 +706,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         if (entities.Count != 0)
         {
             var target = entities.First();
-            PlayHitSound(target, user, GetHighestDamageSound(appliedDamage, _protoManager), hitEvent.HitSoundOverride, component.HitSound, component.NoDamageSound);
+            _meleeSound.PlayHitSound(target, user, GetHighestDamageSound(appliedDamage, _protoManager), hitEvent.HitSoundOverride, component);
         }
 
         if (appliedDamage.GetTotal() > FixedPoint2.Zero)
@@ -750,77 +750,6 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         return true;
     }
 
-    public void PlayHitSound(EntityUid target, EntityUid? user, string? type, SoundSpecifier? hitSoundOverride, SoundSpecifier? hitSound, SoundSpecifier? noDamageSound)
-    {
-        var playedSound = false;
-
-        if (Deleted(target))
-            return;
-
-        // hitting can obv destroy an entity so we play at coords and not following them
-        var coords = Transform(target).Coordinates;
-        // Play sound based off of highest damage type.
-        if (TryComp<MeleeSoundComponent>(target, out var damageSoundComp))
-        {
-            if (type == null && damageSoundComp.NoDamageSound != null)
-            {
-                Audio.PlayPredicted(damageSoundComp.NoDamageSound, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                playedSound = true;
-            }
-            else if (type != null && damageSoundComp.SoundTypes?.TryGetValue(type, out var damageSoundType) == true)
-            {
-                Audio.PlayPredicted(damageSoundType, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                playedSound = true;
-            }
-            else if (type != null && damageSoundComp.SoundGroups?.TryGetValue(type, out var damageSoundGroup) == true)
-            {
-                Audio.PlayPredicted(damageSoundGroup, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                playedSound = true;
-            }
-        }
-
-        // Use weapon sounds if the thing being hit doesn't specify its own sounds.
-        if (!playedSound)
-        {
-            if (hitSoundOverride != null)
-            {
-                Audio.PlayPredicted(hitSoundOverride, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                playedSound = true;
-            }
-            else if (hitSound != null)
-            {
-                Audio.PlayPredicted(hitSound, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                playedSound = true;
-            }
-            else if (noDamageSound != null)
-            {
-                Audio.PlayPredicted(noDamageSound, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                playedSound = true;
-            }
-        }
-
-        // Fallback to generic sounds.
-        if (!playedSound)
-        {
-            switch (type)
-            {
-                // Unfortunately heat returns caustic group so can't just use the damagegroup in that instance.
-                case "Burn":
-                case "Heat":
-                case "Radiation":
-                case "Cold":
-                    Audio.PlayPredicted(new SoundPathSpecifier("/Audio/Items/welder.ogg"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                    break;
-                // No damage, fallback to tappies
-                case null:
-                    Audio.PlayPredicted(new SoundCollectionSpecifier("WeakHit"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                    break;
-                case "Brute":
-                    Audio.PlayPredicted(new SoundCollectionSpecifier("MetalThud"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                    break;
-            }
-        }
-    }
 
     public static string? GetHighestDamageSound(DamageSpecifier modifiedDamage, IPrototypeManager protoManager)
     {
@@ -857,7 +786,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         }
 
         // Play a sound to give instant feedback; same with playing the animations
-        Audio.PlayPredicted(component.SwingSound, meleeUid, user);
+        _meleeSound.PlaySwingSound(user, meleeUid, component);
         return true;
     }
 
diff --git a/Content.Shared/Wires/SharedWiresSystem.cs b/Content.Shared/Wires/SharedWiresSystem.cs
index f069687ffb..b4b0768e0f 100644
--- a/Content.Shared/Wires/SharedWiresSystem.cs
+++ b/Content.Shared/Wires/SharedWiresSystem.cs
@@ -28,15 +28,24 @@ public abstract class SharedWiresSystem : EntitySystem
         if (args.Cancelled)
             return;
 
-        TogglePanel(uid, panel, !panel.Open);
+        if (!TogglePanel(uid, panel, !panel.Open, args.User))
+            return;
+
         AdminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(args.User):user} screwed {ToPrettyString(uid):target}'s maintenance panel {(panel.Open ? "open" : "closed")}");
 
         var sound = panel.Open ? panel.ScrewdriverOpenSound : panel.ScrewdriverCloseSound;
         Audio.PlayPredicted(sound, uid, args.User);
+        args.Handled = true;
     }
 
     private void OnInteractUsing(Entity<WiresPanelComponent> ent, ref InteractUsingEvent args)
     {
+        if (!Tool.HasQuality(args.Used, ent.Comp.OpeningTool))
+            return;
+
+        if (!CanTogglePanel(ent, args.User))
+            return;
+
         if (!Tool.UseTool(
                 args.Used,
                 args.User,
@@ -89,14 +98,25 @@ public abstract class SharedWiresSystem : EntitySystem
             Appearance.SetData(uid, WiresVisuals.MaintenancePanelState, panel.Open && panel.Visible, appearance);
     }
 
-    public void TogglePanel(EntityUid uid, WiresPanelComponent component, bool open)
+    public bool TogglePanel(EntityUid uid, WiresPanelComponent component, bool open, EntityUid? user = null)
     {
+        if (!CanTogglePanel((uid, component), user))
+            return false;
+
         component.Open = open;
         UpdateAppearance(uid, component);
         Dirty(uid, component);
 
         var ev = new PanelChangedEvent(component.Open);
         RaiseLocalEvent(uid, ref ev);
+        return true;
+    }
+
+    public bool CanTogglePanel(Entity<WiresPanelComponent> ent, EntityUid? user)
+    {
+        var attempt = new AttemptChangePanelEvent(ent.Comp.Open, user);
+        RaiseLocalEvent(ent, ref attempt);
+        return !attempt.Cancelled;
     }
 
     public bool IsPanelOpen(Entity<WiresPanelComponent?> entity)
diff --git a/Content.Shared/Wires/WiresPanelComponent.cs b/Content.Shared/Wires/WiresPanelComponent.cs
index 9c7444778e..a18e590e21 100644
--- a/Content.Shared/Wires/WiresPanelComponent.cs
+++ b/Content.Shared/Wires/WiresPanelComponent.cs
@@ -57,6 +57,12 @@ public sealed partial class WiresPanelComponent : Component
     public LocId? ExamineTextOpen = "wires-panel-component-on-examine-open";
 }
 
+/// <summary>
+/// Event raised on a <see cref="WiresPanelComponent"/> before its open state is about to be changed.
+/// </summary>
+[ByRefEvent]
+public record struct AttemptChangePanelEvent(bool Open, EntityUid? User, bool Cancelled = false);
+
 /// <summary>
 /// Event raised when a panel is opened or closed.
 /// </summary>
diff --git a/Resources/Audio/Effects/Fluids/attributions.yml b/Resources/Audio/Effects/Fluids/attributions.yml
index 4e28c99252..aebe3e3c3f 100644
--- a/Resources/Audio/Effects/Fluids/attributions.yml
+++ b/Resources/Audio/Effects/Fluids/attributions.yml
@@ -12,3 +12,13 @@
   license: "CC0-1.0"
   copyright: "Created by brittmosel"
   source: "https://freesound.org/people/brittmosel/sounds/529300/"
+
+- files: ["splash.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by deadrobotmusic"
+  source: "https://freesound.org/people/deadrobotmusic/sounds/609953/"
+
+- files: ["flush.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by the_toilet_guy"
+  source: "https://freesound.org/people/the_toilet_guy/sounds/98770/"
diff --git a/Resources/Audio/Effects/Fluids/flush.ogg b/Resources/Audio/Effects/Fluids/flush.ogg
new file mode 100644
index 0000000000..f4ef31c2ab
Binary files /dev/null and b/Resources/Audio/Effects/Fluids/flush.ogg differ
diff --git a/Resources/Audio/Effects/Fluids/splash.ogg b/Resources/Audio/Effects/Fluids/splash.ogg
new file mode 100644
index 0000000000..4233eff6db
Binary files /dev/null and b/Resources/Audio/Effects/Fluids/splash.ogg differ
diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml
index e63b678ef8..c6fea50bd2 100644
--- a/Resources/Audio/Items/attributions.yml
+++ b/Resources/Audio/Items/attributions.yml
@@ -107,3 +107,13 @@
   license: "CC0-1.0"
   copyright: "Bhijn and Myr (github username deathride58)"
   source: "https://github.com/space-wizards/space-station-14/pull/23476"
+
+- files: ["drill_hit.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Created by vanilla with sounds from MinecraftGamerLR and stomachache on freesound.org"
+  source: "https://github.com/space-wizards/space-station-14/pull/26622"
+
+- files: ["drill_use.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original sound by stomachache on freesound.org, processed by vanilla"
+  source: "https://freesound.org/s/262213/"
diff --git a/Resources/Audio/Items/drill_hit.ogg b/Resources/Audio/Items/drill_hit.ogg
index 0f8fa631aa..dcdfe5df3a 100644
Binary files a/Resources/Audio/Items/drill_hit.ogg and b/Resources/Audio/Items/drill_hit.ogg differ
diff --git a/Resources/Audio/Items/drill_use.ogg b/Resources/Audio/Items/drill_use.ogg
index 82f37cd35b..6cd027d3b2 100644
Binary files a/Resources/Audio/Items/drill_use.ogg and b/Resources/Audio/Items/drill_use.ogg differ
diff --git a/Resources/Audio/Machines/attributions.yml b/Resources/Audio/Machines/attributions.yml
index 5ef62f6d5d..38267ebd69 100644
--- a/Resources/Audio/Machines/attributions.yml
+++ b/Resources/Audio/Machines/attributions.yml
@@ -153,22 +153,11 @@
   copyright: "dakamakat on freesound.org"
   source: "https://freesound.org/people/Dakamakat/sounds/717370/"
 
-- files: ["energyshield_up.ogg"]
-  license: "CC0-1.0"
-  copyright: "unfa on freesound.org"
-  source: "https://freesound.org/people/unfa/sounds/584173/"
-
-- files: ["energyshield_down.ogg"]
-  license: "CC-BY-4.0"
-  copyright: "SilverIllusionist on freesound.org"
-  source: "https://freesound.org/people/SilverIllusionist/sounds/673556/"
-
-- files: ["energyshield_ambient.ogg"]
-  license: "CC0-1.0"
-  copyright: "julianmateo_ on freesound.org"
-  source: "https://freesound.org/people/julianmateo_/sounds/524165/"
-
-- files: ["energyshield_parry.ogg"]
-  license: "CC-BY-4.0"
-  copyright: "Robinhood76 on freesound.org"
-  source: "https://freesound.org/people/Robinhood76/sounds/107613/"
\ No newline at end of file
+- files:
+  - twobeep.ogg
+  - chime.ogg
+  - buzz-sigh.ogg
+  - buzztwo.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from TG station."
+  source: "https://github.com/tgstation/tgstation/tree/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0"
diff --git a/Resources/Audio/Machines/buzz-sigh.ogg b/Resources/Audio/Machines/buzz-sigh.ogg
new file mode 100644
index 0000000000..109c196e2c
Binary files /dev/null and b/Resources/Audio/Machines/buzz-sigh.ogg differ
diff --git a/Resources/Audio/Machines/buzz-two.ogg b/Resources/Audio/Machines/buzz-two.ogg
new file mode 100644
index 0000000000..3f79e2a0e9
Binary files /dev/null and b/Resources/Audio/Machines/buzz-two.ogg differ
diff --git a/Resources/Audio/Machines/chime.ogg b/Resources/Audio/Machines/chime.ogg
new file mode 100644
index 0000000000..f20eb11d11
Binary files /dev/null and b/Resources/Audio/Machines/chime.ogg differ
diff --git a/Resources/Audio/Machines/twobeep.ogg b/Resources/Audio/Machines/twobeep.ogg
new file mode 100644
index 0000000000..26fc5a95a5
Binary files /dev/null and b/Resources/Audio/Machines/twobeep.ogg differ
diff --git a/Resources/Audio/Weapons/glug.ogg b/Resources/Audio/Weapons/glug.ogg
new file mode 100644
index 0000000000..424bedd351
Binary files /dev/null and b/Resources/Audio/Weapons/glug.ogg differ
diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index b4b7f699fe..a8a2f143eb 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -136,5 +136,21 @@ Entries:
   id: 18
   time: '2024-03-29T05:03:34.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/26500
+- author: Simyon
+  changes:
+  - message: The aghost command now accepts a optional username argument to aghost
+      other people.
+    type: Tweak
+  id: 19
+  time: '2024-03-31T02:05:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26546
+- author: PJB3005
+  changes:
+  - message: The new "grant_connect_bypass" command grants a player the ability to
+      connect, bypassing whitelist, player cap and panic bunker.
+    type: Add
+  id: 20
+  time: '2024-04-09T15:25:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26771
 Name: Admin
 Order: 1
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 8c70fdc638..b7e07e53bc 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,511 +1,4 @@
 Entries:
-- author: Alekshhh
-  changes:
-  - message: Cerberus now has a wideswing that works similarly to spears.
-    type: Tweak
-  id: 5759
-  time: '2024-01-20T23:38:27.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24328
-- author: TheShuEd
-  changes:
-  - message: Added new Floral anomaly!
-    type: Add
-  id: 5760
-  time: '2024-01-21T01:31:12.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24351
-- author: Menshin
-  changes:
-  - message: The PA control box should now properly detect the PA parts in all situations
-      (notably on Origin)
-    type: Fix
-  - message: The PA control box now automatically face the control box on part scanning
-    type: Tweak
-  id: 5761
-  time: '2024-01-21T09:17:17.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24356
-- author: metalgearsloth
-  changes:
-  - message: Fix revolver prediction.
-    type: Fix
-  id: 5762
-  time: '2024-01-21T11:16:46.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/19649
-- author: metalgearsloth
-  changes:
-  - message: Fix shuttle docking highlights being inaccurate.
-    type: Fix
-  id: 5763
-  time: '2024-01-21T12:14:47.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24369
-- author: icekot8
-  changes:
-  - message: Increased the size of flatpacks made by the Flatpacker 1001.
-    type: Tweak
-  id: 5764
-  time: '2024-01-21T17:07:59.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24367
-- author: Nairodian
-  changes:
-  - message: All vent critter events now have a small delay and alert message before
-      they spawn.
-    type: Add
-  id: 5765
-  time: '2024-01-22T01:33:38.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24383
-- author: Flareguy
-  changes:
-  - message: The Research Director's hardsuit now uses its older sprites.
-    type: Tweak
-  id: 5766
-  time: '2024-01-22T01:52:32.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24377
-- author: SonicHDC
-  changes:
-  - message: Added reinforced diagonal!
-    type: Add
-  id: 5767
-  time: '2024-01-22T14:53:19.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24393
-- author: Alekshhh
-  changes:
-  - message: Hud eyepatches have been added to BarDrobes, MediDrobes and SecTechs.
-      They're just cooler looking huds.
-    type: Add
-  id: 5768
-  time: '2024-01-22T14:59:32.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24132
-- author: CrigCrag
-  changes:
-  - message: Removed the revolutionaries gamemode pending a rework.
-    type: Remove
-  id: 5769
-  time: '2024-01-23T02:11:09.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24420
-- author: themias
-  changes:
-  - message: Added different footstep sounds for blood, soda and juice
-    type: Add
-  id: 5770
-  time: '2024-01-23T04:18:33.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24406
-- author: TheShuEd
-  changes:
-  - message: 'Flesh and Rock anom reworked: It should be easier to maintain them now
-      (I guess)'
-    type: Tweak
-  id: 5771
-  time: '2024-01-23T12:32:05.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24381
-- author: metalgearsloth
-  changes:
-  - message: Fix thrusters.
-    type: Fix
-  id: 5772
-  time: '2024-01-23T12:49:19.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24446
-- author: '0x6273'
-  changes:
-  - message: Hotplates now work again
-    type: Fix
-  id: 5773
-  time: '2024-01-23T13:06:14.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24450
-- author: Boaz1111
-  changes:
-  - message: Lizards can now properly eat fruit cakes and banana cream pie slices.
-    type: Fix
-  id: 5774
-  time: '2024-01-23T18:08:32.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24457
-- author: icekot8
-  changes:
-  - message: The bounty of briefcases has been removed
-    type: Remove
-  id: 5775
-  time: '2024-01-23T18:26:28.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24392
-- author: Errant
-  changes:
-  - message: '"Not enough oxygen" hud alerts now indicate the proper gas for nitrogen
-      breathers.'
-    type: Fix
-  id: 5776
-  time: '2024-01-23T20:17:41.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24373
-- author: themias
-  changes:
-  - message: Cyborgs can no longer spawn with the Wheelchair Bound or Muted trait
-    type: Fix
-  id: 5777
-  time: '2024-01-23T20:18:01.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24459
-- author: Nimfar11
-  changes:
-  - message: Adds solo comfy benches in different colors.
-    type: Add
-  id: 5778
-  time: '2024-01-23T22:15:48.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24203
-- author: Tin-Man-Tim
-  changes:
-  - message: Attempting to microwave metal now can cause the microwave to spark and
-      explode.
-    type: Tweak
-  id: 5779
-  time: '2024-01-23T22:59:10.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23887
-- author: DrMelon
-  changes:
-  - message: The Microwave works as intended after power outages again.
-    type: Fix
-  id: 5780
-  time: '2024-01-24T01:14:55.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23997
-- author: Krunk
-  changes:
-  - message: To prevent accidental spills, buckets can no longer be quick-equipped.
-    type: Fix
-  id: 5781
-  time: '2024-01-24T02:35:37.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24472
-- author: lzk228
-  changes:
-  - message: Fixed escaping from locked artifact crate.
-    type: Fix
-  id: 5782
-  time: '2024-01-25T00:46:07.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24442
-- author: Krunk
-  changes:
-  - message: Players will once again spawn at arrivals instead of cryostorage.
-    type: Fix
-  id: 5783
-  time: '2024-01-25T00:48:58.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24476
-- author: Krunk
-  changes:
-  - message: Paper cups can now be worn as party hats!
-    type: Add
-  id: 5784
-  time: '2024-01-25T01:02:33.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24334
-- author: Blackern5000
-  changes:
-  - message: Botany's hatchet, spade, and hoe have received a damage decrease to 10,
-      10, and 6 damage respectively.
-    type: Tweak
-  id: 5785
-  time: '2024-01-25T01:37:11.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24481
-- author: Minty642
-  changes:
-  - message: Fixed Reinforced Glass Recipe in Ore Processor!
-    type: Fix
-  - message: Added Premium Material that can only be processed by Industrial Ore Processor!
-    type: Add
-  id: 5786
-  time: '2024-01-25T08:33:56.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24345
-- author: Blackern5000
-  changes:
-  - message: Smoking now causes mild lung cancer in the form of cellular damage.
-    type: Tweak
-  id: 5787
-  time: '2024-01-25T09:51:26.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24546
-- author: metalgearsloth
-  changes:
-  - message: Add title2.ogg to space ambience tracks.
-    type: Tweak
-  id: 5788
-  time: '2024-01-25T13:59:49.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24501
-- author: Tayrtahn
-  changes:
-  - message: Glued mobs can no longer struggle free from their captor's hands.
-    type: Tweak
-  id: 5789
-  time: '2024-01-25T14:01:13.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24488
-- author: mirrorcult
-  changes:
-  - message: Atomic Amnesia MMX, Vibe Ace, Monument and Marhaba have been removed
-      as lobby music tracks
-    type: Remove
-  id: 5790
-  time: '2024-01-25T14:08:29.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24480
-- author: Dutch-VanDerLinde
-  changes:
-  - message: To prevent accidental spills, paper cups can no longer be quick-equipped.
-    type: Fix
-  id: 5791
-  time: '2024-01-25T22:04:31.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24560
-- author: Agoichi
-  changes:
-  - message: Bio hoods hiding your face now
-    type: Tweak
-  - message: Bio hoods now can be used as a breath mask
-    type: Tweak
-  - message: You can not eat while you wearing bio hood
-    type: Tweak
-  id: 5792
-  time: '2024-01-26T00:13:42.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24570
-- author: yathxyz
-  changes:
-  - message: Updated nixpkgs input
-    type: Tweak
-  id: 5793
-  time: '2024-01-26T01:40:52.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24572
-- author: mirrorcult
-  changes:
-  - message: We lied Atomic Amnesia MMX is back
-    type: Add
-  id: 5794
-  time: '2024-01-26T05:48:29.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24575
-- author: EmoGarbage404
-  changes:
-  - message: Cigarettes no longer deal cellular damage when smoked.
-    type: Remove
-  id: 5795
-  time: '2024-01-26T09:50:03.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24568
-- author: ERORR404V1
-  changes:
-  - message: Added mime hardsuit
-    type: Add
-  id: 5796
-  time: '2024-01-26T14:43:50.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24198
-- author: icekot8
-  changes:
-  - message: Correct display of syndicate jaws of life in hand
-    type: Add
-  id: 5797
-  time: '2024-01-27T02:27:14.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24583
-- author: Agoichi
-  changes:
-  - message: Detective cabinet now have security holoprojector in interests of investigation
-    type: Tweak
-  - message: Security lockers have chance to spawn security holoprojector (0.5)
-    type: Tweak
-  id: 5798
-  time: '2024-01-27T02:29:40.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24582
-- author: TheShuEd
-  changes:
-  - message: Flesh and Rock anomalies have been reworked to place entities more dynamically
-      when spawning.
-    type: Tweak
-  id: 5799
-  time: '2024-01-27T02:52:07.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24449
-- author: PJB3005
-  changes:
-  - message: PACMAN-type portable generators now show power statistics for the network
-      they're connected to.
-    type: Add
-  - message: JRPACMAN has been buffed from 5 kW to 8 kW.
-    type: Tweak
-  id: 5800
-  time: '2024-01-27T02:53:44.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24604
-- author: Blackern5000
-  changes:
-  - message: Shotgun slugs can now be printed in the security techfab.
-    type: Add
-  - message: Shotgun slugs now fire a single strong projectile when fired.
-    type: Tweak
-  id: 5801
-  time: '2024-01-27T02:56:57.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24196
-- author: I-JustUser-I
-  changes:
-  - message: Zombie Outbreak event now has a minimum limit of 15 players.
-    type: Tweak
-  id: 5802
-  time: '2024-01-27T03:53:09.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24577
-- author: mirrorcult
-  changes:
-  - message: Navmap now defaults to showing departments
-    type: Tweak
-  id: 5803
-  time: '2024-01-27T12:08:50.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24613
-- author: Tayrtahn
-  changes:
-  - message: Vending machines can now be repaired with a welder.
-    type: Tweak
-  id: 5804
-  time: '2024-01-27T12:12:53.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24603
-- author: graevy
-  changes:
-  - message: Added hallway screen prototypes and comms console text broadcasts.
-    type: Add
-  id: 5805
-  time: '2024-01-27T13:51:25.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24189
-- author: mirrorcult
-  changes:
-  - message: Lights are now shaded with the same color that they glow.
-    type: Tweak
-  id: 5806
-  time: '2024-01-27T17:43:45.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24612
-- author: Boaz1111
-  changes:
-  - message: The PKA shuttle gun now breaks rocks in one hit.
-    type: Tweak
-  id: 5807
-  time: '2024-01-27T17:47:35.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24627
-- author: FungiFellow
-  changes:
-  - message: Ion Storms are twice as likely to occur.
-    type: Tweak
-  id: 5808
-  time: '2024-01-27T23:14:09.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24633
-- author: PJB3005
-  changes:
-  - message: Security barriers need 5 seconds to lock and unlock.
-    type: Tweak
-  id: 5809
-  time: '2024-01-28T00:28:02.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24637
-- author: themias
-  changes:
-  - message: Added cowboy hats and boots to autodrobe, secdrobe, and maints
-    type: Add
-  - message: Added cowboy accent
-    type: Add
-  id: 5810
-  time: '2024-01-28T03:23:16.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24299
-- author: shampunj
-  changes:
-  - message: A new game preset! Can only be selected by admins. All at once.
-    type: Add
-  id: 5811
-  time: '2024-01-28T10:41:36.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23171
-- author: Doctor-Cpu
-  changes:
-  - message: 3kliksphilips name.
-    type: Fix
-  id: 5812
-  time: '2024-01-28T10:46:32.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24657
-- author: mirrorcult
-  changes:
-  - message: Speech sounds are now quieter
-    type: Tweak
-  id: 5813
-  time: '2024-01-28T10:49:55.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24579
-- author: TheShuEd
-  changes:
-  - message: The fire anomaly is now heavier in content.
-    type: Tweak
-  - message: Artifacts no longer block projectiles.
-    type: Tweak
-  id: 5814
-  time: '2024-01-29T01:30:55.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24666
-- author: Krunk
-  changes:
-  - message: Health analysis interfaces now also display a subject's temperature in
-      Kelvin.
-    type: Add
-  id: 5815
-  time: '2024-01-29T01:32:54.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24643
-- author: Ubaser
-  changes:
-  - message: Detectives now work as independent agents, separate from security, and
-      are encouraged to answer any requests for help.
-    type: Tweak
-  id: 5816
-  time: '2024-01-29T06:45:27.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23114
-- author: mirrorcult
-  changes:
-  - message: Rotting examine text doesn't have weird grammatical errors now
-    type: Fix
-  id: 5817
-  time: '2024-01-29T07:50:18.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24689
-- author: Eden077
-  changes:
-  - message: Synaptizine now deals less poison damage.
-    type: Tweak
-  id: 5818
-  time: '2024-01-29T07:55:52.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24676
-- author: mirrorcult
-  changes:
-  - message: Various annoying sounds are now a little quieter
-    type: Tweak
-  id: 5819
-  time: '2024-01-29T09:51:31.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24690
-- author: SpeltIncorrectyl
-  changes:
-  - message: Portable generators can now be connected to the signal network and controlled
-      remotely via devices like a signal transmitter.
-    type: Add
-  id: 5820
-  time: '2024-01-29T14:56:29.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24157
-- author: Tayrtahn
-  changes:
-  - message: Welders properly display their lit status again.
-    type: Fix
-  id: 5821
-  time: '2024-01-29T23:04:52.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24705
-- author: Tayrtahn
-  changes:
-  - message: Water bottles now display their fill level while held.
-    type: Add
-  id: 5822
-  time: '2024-01-29T23:19:56.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24708
-- author: SlamBamActionman
-  changes:
-  - message: Arachnids slipping in water now get a cute hat!
-    type: Add
-  id: 5823
-  time: '2024-01-30T00:21:26.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23822
-- author: Tayrtahn
-  changes:
-  - message: Pressing shift as a ghost no longer cancels following your target
-    type: Fix
-  id: 5824
-  time: '2024-01-30T01:33:35.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24715
-- author: liltenhead
-  changes:
-  - message: Jugs are now destructible.
-    type: Tweak
-  id: 5825
-  time: '2024-01-30T08:11:43.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24719
-- author: Emisse
-  changes:
-  - message: Aspid
-    type: Remove
-  id: 5826
-  time: '2024-01-30T10:26:02.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24725
 - author: mirrorcult
   changes:
   - message: Throwing items now scale a bit when thrown to simulate rising/falling
@@ -3793,3 +3286,542 @@
   id: 6258
   time: '2024-03-30T04:00:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/25830
+- author: liltenhead
+  changes:
+  - message: Changed the syndicate hardbomb to have less of a chance to completely
+      destroy tiles.
+    type: Tweak
+  id: 6259
+  time: '2024-03-30T04:36:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26548
+- author: takemysoult
+  changes:
+  - message: stimulants removes chloral hydrate from body
+    type: Tweak
+  id: 6260
+  time: '2024-03-30T06:52:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25886
+- author: Flareguy
+  changes:
+  - message: Removed SCAF armor.
+    type: Remove
+  id: 6261
+  time: '2024-03-31T02:01:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26566
+- author: lzk228
+  changes:
+  - message: Syndicate duffelbag storage increased from 8x5 to 9x5.
+    type: Tweak
+  id: 6262
+  time: '2024-03-31T02:21:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26565
+- author: Velcroboy
+  changes:
+  - message: Changed plastic flaps to be completely constructable/deconstructable
+    type: Tweak
+  id: 6263
+  time: '2024-03-31T02:24:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26341
+- author: Flareguy
+  changes:
+  - message: Security glasses have been moved from research to roundstart gear. All
+      officers now start with them instead of sunglasses by default.
+    type: Tweak
+  - message: You can now craft security glasses.
+    type: Add
+  id: 6264
+  time: '2024-03-31T03:00:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26487
+- author: brainfood1183
+  changes:
+  - message: Toilets can now be connected to the disposal system.
+    type: Add
+  id: 6265
+  time: '2024-03-31T03:21:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/22133
+- author: DrMelon
+  changes:
+  - message: Syndicate Uplinks now have a searchbar to help those dirty, rotten antagonists
+      find appropriate equipment more easily!
+    type: Tweak
+  id: 6266
+  time: '2024-03-31T04:09:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24287
+- author: chromiumboy
+  changes:
+  - message: Additional construction options have been added to the Rapid Construction
+      Device (RCD), along with a radial style UI for fast navigation
+    type: Add
+  - message: The number of charges and the length of time required to build a structure
+      with the RCD now vary depending on the complexity of the constructed fixture
+    type: Tweak
+  id: 6267
+  time: '2024-03-31T04:29:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/22799
+- author: UBlueberry
+  changes:
+  - message: Nanotransen is now recruitin' personnel that speak with a Southern drawl.
+    type: Add
+  id: 6268
+  time: '2024-03-31T04:39:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26543
+- author: Tayrtahn
+  changes:
+  - message: You can no longer drink out of or put liquids into buckets worn on your
+      head.
+    type: Fix
+  id: 6269
+  time: '2024-03-31T04:40:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24412
+- author: DrTeaspoon
+  changes:
+  - message: Hypopen no longer shows chemical contents when examined, when not held
+      by the examinee.
+    type: Fix
+  id: 6270
+  time: '2024-03-31T04:59:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26453
+- author: lzk228
+  changes:
+  - message: Hairflower was removed.
+    type: Remove
+  - message: Now you can wear poppy (and other flowers) on your head instead of crafting
+      hairflower with it.
+    type: Tweak
+  id: 6271
+  time: '2024-03-31T05:33:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25475
+- author: EmoGarbage404
+  changes:
+  - message: Borgs, Emitters, and APEs can no longer have their panels opened while
+      locked. APEs and Emitters additionally cannot be unanchored either.
+    type: Add
+  id: 6272
+  time: '2024-03-31T06:34:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26600
+- author: lzk228
+  changes:
+  - message: Flower crown and wreath were combined. Now you can wear wreath both on
+      head and on neck.
+    type: Tweak
+  id: 6273
+  time: '2024-03-31T08:52:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26605
+- author: Ubaser
+  changes:
+  - message: Throwing knives now additionally do armour piercing damage.
+    type: Tweak
+  id: 6274
+  time: '2024-03-31T11:48:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26380
+- author: graevy
+  changes:
+  - message: clicking the brig timer button will now cancel its countdown
+    type: Tweak
+  id: 6275
+  time: '2024-03-31T20:44:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26557
+- author: lzk228
+  changes:
+  - message: Briefcases was added to CuraDrobe and LawDrobe.
+    type: Tweak
+  id: 6276
+  time: '2024-03-31T20:52:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26527
+- author: RiceMar
+  changes:
+  - message: Added milk cartons to the BoozeOMat vendor. Got milk?
+    type: Add
+  id: 6277
+  time: '2024-04-01T00:07:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26635
+- author: nikthechampiongr
+  changes:
+  - message: Radio jammers now actually block suit sensors.
+    type: Fix
+  id: 6278
+  time: '2024-04-01T02:13:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26632
+- author: Flareguy
+  changes:
+  - message: All wheeled objects now have lower friction. Portable items, like fuel
+      canisters & portable scrubbers, should now be easier to carry around.
+    type: Tweak
+  - message: High-capacity reagent tanks are now much heavier.
+    type: Tweak
+  id: 6279
+  time: '2024-04-01T03:23:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26601
+- author: Tayrtahn
+  changes:
+  - message: spears, darts, and hypodarts can inject targets again.
+    type: Fix
+  - message: arrows can no longer inject targets they don't actually hit.
+    type: Fix
+  id: 6280
+  time: '2024-04-01T03:39:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26268
+- author: SoulFN
+  changes:
+  - message: Changed textures of the assault borg modules
+    type: Tweak
+  id: 6281
+  time: '2024-04-01T04:21:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26502
+- author: Keer-Sar
+  changes:
+  - message: Cyborgs now have audio for some emotes.
+    type: Add
+  id: 6282
+  time: '2024-04-01T04:35:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26594
+- author: SlamBamActionman
+  changes:
+  - message: Added Coordinates Disks to the Salvage expeditions console, which are
+      now a requirement for expedition FTL.
+    type: Add
+  id: 6283
+  time: '2024-04-01T04:50:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/23240
+- author: kseandi
+  changes:
+  - message: NT has declassified the documentation for door electronics, now anyone
+      can configure its access using network configurator or multitool.
+    type: Add
+  id: 6284
+  time: '2024-04-01T06:06:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/17778
+- author: musicmanvr
+  changes:
+  - message: Added Sol Dry, 8 new cocktails and coconut water.
+    type: Add
+  id: 6285
+  time: '2024-04-01T06:41:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25367
+- author: f0x-n3rd
+  changes:
+  - message: Added pages for each categories from the chemical page in the guidebook,
+      no more infinite scrolling when looking up certain chemicals.
+    type: Add
+  id: 6286
+  time: '2024-04-01T07:20:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25831
+- author: TheShuEd
+  changes:
+  - message: Added new transformation particles types for APE and CHIMP
+    type: Add
+  - message: Added new anomaly behaviour mechanic. Different behaviors can change
+      the gameplay of an anomaly. Players can get random behaviors by bombarding the
+      anomaly with new particles
+    type: Add
+  id: 6287
+  time: '2024-04-01T08:29:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24683
+- author: Sk1tch
+  changes:
+  - message: Added chat window opacity slider to options.
+    type: Add
+  id: 6288
+  time: '2024-04-01T20:48:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24990
+- author: TheShuEd
+  changes:
+  - message: added procedurally generating books to library.
+    type: Add
+  - message: full books resprite
+    type: Add
+  id: 6289
+  time: '2024-04-01T21:00:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25840
+- author: osjarw
+  changes:
+  - message: Ambuzol plus pills now have different sprites from ambuzol pills. Now
+      CBURN agents and Nukies who bought the syndicate zombie bundle might realize
+      that they also have some ambuzol plus.
+    type: Tweak
+  id: 6290
+  time: '2024-04-02T00:50:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26651
+- author: osjarw
+  changes:
+  - message: Air injectors finally have working indicator lights while enabled.
+    type: Fix
+  id: 6291
+  time: '2024-04-02T05:17:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26654
+- author: Simyon
+  changes:
+  - message: The hands of cyborgs are now explosion proof. Your beakers wont ever
+      break again!
+    type: Fix
+  id: 6292
+  time: '2024-04-02T05:18:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26515
+- author: lzk228
+  changes:
+  - message: Typing indicator now can be shaded by shadows.
+    type: Tweak
+  id: 6293
+  time: '2024-04-03T02:12:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26678
+- author: EmoGarbage404
+  changes:
+  - message: Increased time between pulses for various anomalies.
+    type: Tweak
+  id: 6294
+  time: '2024-04-03T03:15:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26677
+- author: Plykiya
+  changes:
+  - message: Dropped items are no longer rotated to world north.
+    type: Fix
+  id: 6295
+  time: '2024-04-03T05:31:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26662
+- author: deltanedas
+  changes:
+  - message: Disabled scooping foam due to a reagent duplication bug.
+    type: Fix
+  id: 6296
+  time: '2024-04-03T13:41:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26686
+- author: Aserovich
+  changes:
+  - message: New lobby art!
+    type: Add
+  id: 6297
+  time: '2024-04-04T05:28:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26505
+- author: Beck Thompson
+  changes:
+  - message: Items thrown at disposals now have to be insertable to display the miss
+      message.
+    type: Fix
+  id: 6298
+  time: '2024-04-04T06:25:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26716
+- author: Tayrtahn
+  changes:
+  - message: Some devices may have broken wiring at the start of each round.
+    type: Add
+  id: 6299
+  time: '2024-04-04T06:28:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26695
+- author: lzk228
+  changes:
+  - message: Turning off thrusters and gyroscopes now stop consume power.
+    type: Fix
+  id: 6300
+  time: '2024-04-04T06:28:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26690
+- author: Aexxie
+  changes:
+  - message: Added the option to disable your OOC Patron name color.
+    type: Add
+  id: 6301
+  time: '2024-04-04T07:20:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26653
+- author: DinoWattz
+  changes:
+  - message: Fixed pocket slots being able to hide character snout markings.
+    type: Fix
+  id: 6302
+  time: '2024-04-04T08:35:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26708
+- author: VasilisThePikachu
+  changes:
+  - message: Mop buckets and Janitorial Trolleys will not spill their contents as
+      soon as they are pushed.
+    type: Fix
+  - message: Mop buckets are no longer solid. So you can now walk through them.
+    type: Fix
+  id: 6303
+  time: '2024-04-04T08:39:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26706
+- author: ZeroDayDaemon
+  changes:
+  - message: Lowered the number of ducks in the duck crate and reduced the price of
+      it.
+    type: Tweak
+  id: 6304
+  time: '2024-04-04T19:30:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26729
+- author: PrPleGoo
+  changes:
+  - message: The medical HUD's brightness now scales with lighting again.
+    type: Tweak
+  - message: Most HUD icon's brightness now scale with lighting.
+    type: Tweak
+  id: 6305
+  time: '2024-04-04T23:05:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26726
+- author: Daemon
+  changes:
+  - message: Practice projectiles have been given standardized minimal damage.
+    type: Tweak
+  - message: The practice laser gun now works with shooting targets.
+    type: Tweak
+  id: 6306
+  time: '2024-04-05T03:15:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26731
+- author: Daemon
+  changes:
+  - message: Shooting targets can now have their popup type changed with a left click
+      to show total damage, damage of a single hit, both, or just a notice that it
+      was hit.
+    type: Tweak
+  id: 6307
+  time: '2024-04-05T07:19:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26734
+- author: Vermidia
+  changes:
+  - message: Baseball bats now require a knife to craft
+    type: Tweak
+  id: 6308
+  time: '2024-04-05T15:41:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26742
+- author: deltanedas
+  changes:
+  - message: Making fultons now requires cloth and they are faster to make.
+    type: Tweak
+  id: 6309
+  time: '2024-04-05T15:42:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26747
+- author: superjj18
+  changes:
+  - message: Broadcasting works again!
+    type: Fix
+  id: 6310
+  time: '2024-04-05T17:29:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26750
+- author: Golinth
+  changes:
+  - message: Fixed mindshield icons being glow in the dark
+    type: Fix
+  id: 6311
+  time: '2024-04-05T20:35:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26754
+- author: Blackern5000
+  changes:
+  - message: Added sap
+    type: Add
+  - message: Added syrup, it can be made by boiling sap.
+    type: Add
+  - message: Dionae now bleed sap instead of water
+    type: Tweak
+  id: 6312
+  time: '2024-04-05T21:06:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25748
+- author: osjarw
+  changes:
+  - message: Thin firelocks are now constructable/deconstructable
+    type: Fix
+  id: 6313
+  time: '2024-04-06T01:55:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26745
+- author: BITTERLYNX
+  changes:
+  - message: Rodents are more visually pleasing to burn
+    type: Fix
+  - message: mothroach and hammy also more visually pleasing to burn
+    type: Fix
+  id: 6314
+  time: '2024-04-06T04:41:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26758
+- author: Plykiya
+  changes:
+  - message: You can now carefully walk over glass shards and D4.
+    type: Tweak
+  id: 6315
+  time: '2024-04-06T04:49:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26763
+- author: PursuitInAshes
+  changes:
+  - message: Sake Bottles can now be found in the booze-o-mat.
+    type: Tweak
+  id: 6316
+  time: '2024-04-06T20:16:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26776
+- author: osjarw
+  changes:
+  - message: Removed broken anom behaviour, which causes APE shots to fly through
+      the anom.
+    type: Remove
+  id: 6317
+  time: '2024-04-06T22:27:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26775
+- author: Vermidia
+  changes:
+  - message: Water coolers show how full/what they're full of again.
+    type: Fix
+  id: 6318
+  time: '2024-04-06T23:58:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26784
+- author: Crotalus
+  changes:
+  - message: Show missing materials in lathe tooltip
+    type: Add
+  id: 6319
+  time: '2024-04-08T03:16:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26795
+- author: chromiumboy
+  changes:
+  - message: Fixed the RCD not being able to build on top of puddles
+    type: Fix
+  - message: RCD constructions can no longer be rotated while in progress
+    type: Tweak
+  - message: The RCD now reports construction mode changes to its user
+    type: Add
+  id: 6320
+  time: '2024-04-08T03:17:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26792
+- author: lzk228
+  changes:
+  - message: Bombsuit and jani bombsuit are similar now.
+    type: Tweak
+  id: 6321
+  time: '2024-04-08T15:05:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26806
+- author: lzk228
+  changes:
+  - message: Clothing restock crate was splitted to clothing and autodrobe restock
+      crates.
+    type: Tweak
+  - message: Clothing is cheaper.
+    type: Tweak
+  id: 6322
+  time: '2024-04-08T15:10:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26805
+- author: Hanzdegloker
+  changes:
+  - message: Spears can now be quipped to your suit slot and cost slightly more to
+      make.
+    type: Tweak
+  id: 6323
+  time: '2024-04-08T15:34:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26724
+- author: KittenColony
+  changes:
+  - message: Added 13 new gauze wraps for moth that fit their twig bodies
+    type: Add
+  - message: Gauze markings have been moved to the Overlay category, allowing gauze
+      to not take up marking points
+    type: Tweak
+  id: 6324
+  time: '2024-04-09T08:04:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25481
+- author: Killerqu00
+  changes:
+  - message: Quartermasters can now skip a single bounty in the list once every 15
+      minutes.
+    type: Add
+  id: 6325
+  time: '2024-04-09T22:18:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26537
+- author: SkaldetSkaeg
+  changes:
+  - message: The Flippo lighter is now quieter and has a delay on use.
+    type: Tweak
+  id: 6326
+  time: '2024-04-09T22:20:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26846
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index f918d9320f..6c838abb85 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUmAndXGabriel08X, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, artak10t, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, beck-thompson, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, CrafterKolyan, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DmitriyMX, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, Kadeo64, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nails-n-Tape, Nairodian, Naive817, NakataRin, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, Nylux, OctoRocket, OldDanceJacket, OliverOtter, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, Phill101, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, Ranger6012, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, renodubois, RiceMar1244, RieBi, RIKELOLDABOSS, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SamV522, SaphireLattice, ScalyChimp, scrato, Scribbles0, ScumbagDog, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stanislav4ix, Stealthbomber16, StrawberryMoses, Subversionary, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, volundr-, Vordenburg, vulppine, wafehling, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, youarereadingthis, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUmAndXGabriel08X, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, CrafterKolyan, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DmitriyMX, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, Kadeo64, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mephisto72, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nails-n-Tape, Nairodian, Naive817, NakataRin, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, Nylux, OctoRocket, OldDanceJacket, OliverOtter, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, Phill101, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, RIKELOLDABOSS, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, Subversionary, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Vordenburg, vulppine, wafehling, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
diff --git a/Resources/Credits/Patrons.yml b/Resources/Credits/Patrons.yml
index 193caa7350..f7e8df9bc0 100644
--- a/Resources/Credits/Patrons.yml
+++ b/Resources/Credits/Patrons.yml
@@ -1,13 +1,9 @@
-- Name: "Tomeno"
-  Tier: Revolutionary
 - Name: "Daniel Thompson"
   Tier: Revolutionary
 - Name: "Farewell Fire"
   Tier: Syndicate Agent
 - Name: "CPM311"
   Tier: Revolutionary
-- Name: "Bobberunio"
-  Tier: Revolutionary
 - Name: "vifs_vestige"
   Tier: Syndicate Agent
 - Name: "Anthony Fleck"
@@ -30,8 +26,6 @@
   Tier: Revolutionary
 - Name: "clyf"
   Tier: Nuclear Operative
-- Name: "spinnermaster"
-  Tier: Syndicate Agent
 - Name: "Will M."
   Tier: Revolutionary
 - Name: "The Hateful Flesh"
@@ -78,8 +72,6 @@
   Tier: Syndicate Agent
 - Name: "Saphire"
   Tier: Revolutionary
-- Name: "DubzyVEVO"
-  Tier: Revolutionary
 - Name: "Never Solus"
   Tier: Syndicate Agent
 - Name: "Gnomo"
@@ -100,8 +92,6 @@
   Tier: Revolutionary
 - Name: "tokie"
   Tier: Nuclear Operative
-- Name: "BlueisDumb"
-  Tier: Nuclear Operative
 - Name: "Enricoc3l"
   Tier: Revolutionary
 - Name: "DadNotTheBelt"
@@ -138,14 +128,10 @@
   Tier: Revolutionary
 - Name: "Adam Smedstad"
   Tier: Revolutionary
-- Name: "oBerry"
-  Tier: Nuclear Operative
 - Name: "DireBoar"
   Tier: Revolutionary
 - Name: "Ignoramis"
   Tier: Revolutionary
-- Name: "Repo"
-  Tier: Nuclear Operative
 - Name: "612"
   Tier: Revolutionary
 - Name: "Higgtastic"
@@ -208,8 +194,6 @@
   Tier: Revolutionary
 - Name: "Georgia Partyka"
   Tier: Syndicate Agent
-- Name: "YuNii"
-  Tier: Syndicate Agent
 - Name: "Nojan Niaki"
   Tier: Revolutionary
 - Name: "nokko"
@@ -284,5 +268,23 @@
   Tier: Revolutionary
 - Name: "Black Rose"
   Tier: Revolutionary
-- Name: "Dourbii"
+- Name: "Kim"
+  Tier: Nuclear Operative
+- Name: "Kyu, The Meme Fairy"
+  Tier: Syndicate Agent
+- Name: "Russian TS"
+  Tier: Nuclear Operative
+- Name: "Andrew"
+  Tier: Revolutionary
+- Name: "Jack"
+  Tier: Syndicate Agent
+- Name: "Brandon Roughley"
+  Tier: Syndicate Agent
+- Name: "Sean Lilly"
+  Tier: Syndicate Agent
+- Name: "Dieselmohawk D."
+  Tier: Revolutionary
+- Name: "Hannah Dawson"
+  Tier: Syndicate Agent
+- Name: "Godfiend"
   Tier: Revolutionary
diff --git a/Resources/Locale/en-US/accent/southern.ftl b/Resources/Locale/en-US/accent/southern.ftl
new file mode 100644
index 0000000000..7e1657a3ed
--- /dev/null
+++ b/Resources/Locale/en-US/accent/southern.ftl
@@ -0,0 +1,17 @@
+accent-southern-words-1 = you all
+accent-southern-words-replace-1 = y'all
+
+accent-southern-words-2 = you guys
+accent-southern-words-replace-2 = y'all
+
+accent-southern-words-3 = isn't
+accent-southern-words-replace-3 = ain't
+
+accent-southern-words-4 = is not
+accent-southern-words-replace-4 = ain't
+
+accent-southern-words-5 = aren't
+accent-southern-words-replace-5 = ain't
+
+accent-southern-words-6 = are not
+accent-southern-words-replace-6 = ain't
diff --git a/Resources/Locale/en-US/administration/commands/aghost.ftl b/Resources/Locale/en-US/administration/commands/aghost.ftl
new file mode 100644
index 0000000000..4de0639981
--- /dev/null
+++ b/Resources/Locale/en-US/administration/commands/aghost.ftl
@@ -0,0 +1,3 @@
+aghost-description = Makes you an admin ghost.
+aghost-no-mind-self = You can't ghost here!
+aghost-no-mind-other = They can't ghost here!
diff --git a/Resources/Locale/en-US/administration/commands/connection-commands.ftl b/Resources/Locale/en-US/administration/commands/connection-commands.ftl
new file mode 100644
index 0000000000..66991042d2
--- /dev/null
+++ b/Resources/Locale/en-US/administration/commands/connection-commands.ftl
@@ -0,0 +1,16 @@
+## Strings for the "grant_connect_bypass" command.
+
+cmd-grant_connect_bypass-desc = Temporarily allow a user to bypass regular connection checks.
+cmd-grant_connect_bypass-help = Usage: grant_connect_bypass <user> [duration minutes]
+    Temporarily grants a user the ability to bypass regular connections restrictions.
+    The bypass only applies to this game server and will expire after (by default) 1 hour.
+    They will be able to join regardless of whitelist, panic bunker, or player cap.
+
+cmd-grant_connect_bypass-arg-user = <user>
+cmd-grant_connect_bypass-arg-duration = [duration minutes]
+
+cmd-grant_connect_bypass-invalid-args = Expected 1 or 2 arguments
+cmd-grant_connect_bypass-unknown-user = Unable to find user '{$user}'
+cmd-grant_connect_bypass-invalid-duration = Invalid duration '{$duration}'
+
+cmd-grant_connect_bypass-success = Successfully added bypass for user '{$user}'
diff --git a/Resources/Locale/en-US/anomaly/anomaly.ftl b/Resources/Locale/en-US/anomaly/anomaly.ftl
index 3a398d482e..da5882fa62 100644
--- a/Resources/Locale/en-US/anomaly/anomaly.ftl
+++ b/Resources/Locale/en-US/anomaly/anomaly.ftl
@@ -8,20 +8,29 @@ anomaly-particles-delta = Delta particles
 anomaly-particles-epsilon = Epsilon particles
 anomaly-particles-zeta = Zeta particles
 anomaly-particles-omega = Omega particles
+anomaly-particles-sigma = Sigma particles
 
 anomaly-scanner-component-scan-complete = Scan complete!
 
 anomaly-scanner-ui-title = anomaly scanner
 anomaly-scanner-no-anomaly = No anomaly currently scanned.
 anomaly-scanner-severity-percentage = Current severity: [color=gray]{$percent}[/color]
+anomaly-scanner-severity-percentage-unknown = Current severity: [color=red]ERROR[/color]
 anomaly-scanner-stability-low = Current anomaly state: [color=gold]Decaying[/color]
 anomaly-scanner-stability-medium = Current anomaly state: [color=forestgreen]Stable[/color]
 anomaly-scanner-stability-high = Current anomaly state: [color=crimson]Growing[/color]
+anomaly-scanner-stability-unknown = Current anomaly state: [color=red]ERROR[/color]
 anomaly-scanner-point-output = Point output: [color=gray]{$point}[/color]
+anomaly-scanner-point-output-unknown = Point output: [color=red]ERROR[/color]
 anomaly-scanner-particle-readout = Particle Reaction Analysis:
 anomaly-scanner-particle-danger = - [color=crimson]Danger type:[/color] {$type}
 anomaly-scanner-particle-unstable = - [color=plum]Unstable type:[/color] {$type}
 anomaly-scanner-particle-containment = - [color=goldenrod]Containment type:[/color] {$type}
+anomaly-scanner-particle-transformation = - [color=#6b75fa]Transformation type:[/color] {$type}
+anomaly-scanner-particle-danger-unknown = - [color=crimson]Danger type:[/color] [color=red]ERROR[/color]
+anomaly-scanner-particle-unstable-unknown = - [color=plum]Unstable type:[/color] [color=red]ERROR[/color]
+anomaly-scanner-particle-containment-unknown = - [color=goldenrod]Containment type:[/color] [color=red]ERROR[/color]
+anomaly-scanner-particle-transformation-unknown = - [color=#6b75fa]Transformation type:[/color] [color=red]ERROR[/color]
 anomaly-scanner-pulse-timer = Time until next pulse: [color=gray]{$time}[/color]
 
 anomaly-gorilla-core-slot-name = Anomaly core
@@ -65,3 +74,23 @@ anomaly-command-supercritical = Makes a target anomaly go supercritical
 # Flavor text on the footer
 anomaly-generator-flavor-left = Anomaly may spawn inside the operator.
 anomaly-generator-flavor-right = v1.1
+
+anomaly-behavior-unknown = [color=red]ERROR. Cannot be read.[/color]
+
+anomaly-behavior-title = behavior deviation analysis:
+anomaly-behavior-point =[color=gold]Anomaly produces {$mod}% of the points[/color] 
+
+anomaly-behavior-safe = [color=forestgreen]The anomaly is extremely stable. Extremely rare pulsations.[/color]
+anomaly-behavior-slow = [color=forestgreen]The frequency of pulsations is much less frequent.[/color]
+anomaly-behavior-light = [color=forestgreen]Pulsation power is significantly reduced.[/color]
+anomaly-behavior-balanced = No behavior deviations detected.
+anomaly-behavior-delayed-force = The frequency of pulsations is greatly reduced, but their power is increased.
+anomaly-behavior-rapid = The frequency of the pulsation is much higher, but its strength is attenuated.
+anomaly-behavior-reflect = A protective coating was detected.
+anomaly-behavior-nonsensivity = A weak reaction to particles was detected.
+anomaly-behavior-sensivity = Amplified reaction to particles was detected.
+anomaly-behavior-secret = Interference detected. Some data cannot be read
+anomaly-behavior-inconstancy = [color=crimson]Impermanence has been detected. Particle types can change over time.[/color]
+anomaly-behavior-fast = [color=crimson]The pulsation frequency is strongly increased.[/color]
+anomaly-behavior-strenght = [color=crimson]The pulsation power is significantly increased.[/color]
+anomaly-behavior-moving = [color=crimson]Coordinate instability was detected.[/color]
\ No newline at end of file
diff --git a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
index ec80d91f47..bf7868e3df 100644
--- a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
@@ -1,5 +1,6 @@
 bounty-console-menu-title = Cargo bounty console
 bounty-console-label-button-text = Print label
+bounty-console-skip-button-text = Skip
 bounty-console-time-label = Time: [color=orange]{$time}[/color]
 bounty-console-reward-label = Reward: [color=limegreen]${$reward}[/color]
 bounty-console-manifest-label = Manifest: [color=orange]{$item}[/color]
diff --git a/Resources/Locale/en-US/chemistry/components/scoopable-component.ftl b/Resources/Locale/en-US/chemistry/components/scoopable-component.ftl
new file mode 100644
index 0000000000..c2593cc61e
--- /dev/null
+++ b/Resources/Locale/en-US/chemistry/components/scoopable-component.ftl
@@ -0,0 +1 @@
+scoopable-component-popup = You scoop up {$scooped} into {THE($beaker)}.
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index 46c4ad83a6..baf61827a6 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -42,12 +42,15 @@ ui-options-volume-percent = { TOSTRING($volume, "P0") }
 ui-options-show-held-item = Show held item next to cursor
 ui-options-show-combat-mode-indicators = Show combat mode indicators with cursor
 ui-options-opaque-storage-window = Opaque storage window
+ui-options-show-ooc-patron-color = Show OOC Patreon color
 ui-options-show-looc-on-head = Show LOOC chat above characters head
 ui-options-fancy-speech = Show names in speech bubbles
 ui-options-fancy-name-background = Add background to speech bubble names
 ui-options-enable-color-name = Add colors to character names
 ui-options-colorblind-friendly = Colorblind friendly mode
 ui-options-reduced-motion = Reduce motion of visual effects
+ui-options-chat-window-opacity = Chat window opacity
+ui-options-chat-window-opacity-percent = { TOSTRING($opacity, "P0") }
 ui-options-screen-shake-intensity = Screen shake intensity
 ui-options-screen-shake-percent = { TOSTRING($intensity, "P0") }
 ui-options-vsync = VSync
diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index 72404e80c1..adba66e78d 100644
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -189,6 +189,7 @@ flavor-complex-tonic-water = like angry water
 flavor-complex-cola = like cola
 flavor-complex-energy-drink = like battery acid
 flavor-complex-dr-gibb = like malpractice
+flavor-complex-ginger-soda = like ginger
 flavor-complex-grape-soda = like grape soda
 flavor-complex-lemon-lime-soda = like lemon-lime soda
 flavor-complex-pwr-game-soda = like gaming
@@ -201,6 +202,7 @@ flavor-complex-vodka = like fermented grain
 flavor-complex-tequila = like fermented death
 flavor-complex-sake = like sweet, alcoholic rice
 flavor-complex-rum = like fermented sugar
+flavor-complex-coconut-rum = like nutty fermented sugar
 flavor-complex-coffee-liquor = like strong, bitter coffee
 flavor-complex-whiskey = like molasses
 flavor-complex-shitty-wine = like grape rinds
@@ -213,6 +215,11 @@ flavor-complex-ice = like ice
 flavor-complex-mopwata = like stagnant, dirty water
 
 ## Cocktails
+flavor-complex-arnold-palmer = like a hole-in-one
+flavor-complex-blue-hawaiian = like the tropics
+flavor-complex-cosmopolitan = sweet and tangy
+flavor-complex-painkiller = like spiked pineapple juice
+flavor-complex-pina-colada = like tropical sun
 flavor-complex-long-island = suspiciously like iced tea
 flavor-complex-three-mile-island = like tea brewed in nuclear runoff
 flavor-complex-whiskey-cola = like carbonated molasses
diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
index d8c88f3c34..23a178d282 100644
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -164,6 +164,9 @@ ghost-role-information-cerberus-rules = You are an intelligent, demonic dog. Try
 ghost-role-information-ert-leader-name = ERT Leader
 ghost-role-information-ert-leader-description = Lead a team of specialists to resolve the station's issues.
 
+ghost-role-information-ert-chaplain-name = ERT Chaplain
+ghost-role-information-ert-chaplain-description = Assist with mourning to resolve the station's crew moral issues.
+
 ghost-role-information-ert-janitor-name = ERT Janitor
 ghost-role-information-ert-janitor-description = Assist with custodial efforts to resolve the station's issues.
 
diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index c30b49553c..496e38b9a0 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -22,6 +22,14 @@ guide-entry-cargo-bounties = Cargo Bounties
 guide-entry-salvage = Salvage
 guide-entry-survival = Survival
 guide-entry-chemicals = Chemicals
+guide-entry-elements = Elements
+guide-entry-narcotics = Narcotics
+guide-entry-pyrotechnics = Pyrotechnic
+guide-entry-toxins = Toxins
+guide-entry-foods = Foods
+guide-entry-biological = Biological
+guide-entry-others = Others
+guide-entry-botanical = Botanicals
 guide-entry-ss14 = Space Station 14
 guide-entry-janitorial = Janitorial
 guide-entry-bartender = Bartender
diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl
index 41a7770fec..6b517469c4 100644
--- a/Resources/Locale/en-US/job/job-description.ftl
+++ b/Resources/Locale/en-US/job/job-description.ftl
@@ -19,6 +19,7 @@ job-description-paramedic = Rescue critically injured patients all over the stat
 job-description-detective = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes.
 job-description-doctor = Diagnose and heal crewmembers through medicinal chemicals, advanced medicine, and defibrillators. Make sure the dead don't rot, and that cadavers are in the morgue.
 job-description-engineer = Keep the station's main engine & solars active, optimize the power network, and make emergency repairs using your hardsuit in spaced areas.
+job-description-ertchaplain = Ensure the station crew's last rights are taken care of.
 job-description-ertengineer = Ensure that the station has power and clean air.
 job-description-ertjanitor = Ensure that the station is properly cleaned--for morale.
 job-description-ertleader = Lead the Emergency Response Team in dealing with threats to Nanotrasen assets.
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
index 8cd35cac88..51a81fb06a 100644
--- a/Resources/Locale/en-US/job/job-names.ftl
+++ b/Resources/Locale/en-US/job/job-names.ftl
@@ -38,6 +38,7 @@ job-name-cargotech = Cargo Technician
 job-name-chef = Chef
 job-name-clown = Clown
 job-name-ertleader = ERT Leader
+job-name-ertchaplain = ERT Chaplain
 job-name-ertengineer = ERT Engineer
 job-name-ertsecurity = ERT Security
 job-name-ertmedic = ERT Medic
@@ -63,6 +64,7 @@ JobChiefMedicalOfficer = Chief Medical Officer
 JobClown = Clown
 JobDetective = Detective
 JobBrigmedic = Brigmedic
+JobERTChaplain = ERT Chaplain
 JobERTEngineer = ERT Engineer
 JobERTJanitor = ERT Janitor
 JobERTLeader = ERT Leader
diff --git a/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl b/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
index 92f313086c..71dd50d409 100644
--- a/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
+++ b/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
@@ -13,6 +13,10 @@ lathe-menu-material-amount = { $amount ->
     [1] {NATURALFIXED($amount, 2)} {$unit}
     *[other] {NATURALFIXED($amount, 2)} {MAKEPLURAL($unit)}
 }
+lathe-menu-material-amount-missing = { $amount ->
+    [1] {NATURALFIXED($amount, 2)} {$unit} of {$material} ([color=red]{NATURALFIXED($missingAmount, 2)} {$unit} missing[/color])
+    *[other] {NATURALFIXED($amount, 2)} {MAKEPLURAL($unit)} of {$material} ([color=red]{NATURALFIXED($missingAmount, 2)} {MAKEPLURAL($unit)} missing[/color])
+}
 lathe-menu-no-materials-message = No materials loaded.
 lathe-menu-fabricating-message = Fabricating...
 lathe-menu-materials-title = Materials
diff --git a/Resources/Locale/en-US/lock/lock-component.ftl b/Resources/Locale/en-US/lock/lock-component.ftl
index f9f975c96e..380605697b 100644
--- a/Resources/Locale/en-US/lock/lock-component.ftl
+++ b/Resources/Locale/en-US/lock/lock-component.ftl
@@ -3,8 +3,9 @@ lock-comp-on-examined-is-unlocked = The {$entityName} seems to be unlocked.
 lock-comp-do-lock-success = You lock the {$entityName}.
 lock-comp-do-unlock-success = You unlock the {$entityName}.
 lock-comp-has-user-access-fail = Access denied
+lock-comp-generic-fail = {CAPITALIZE(SUBJECT($target))} {CONJUGATE-BE($target)} locked.
 
 ## ToggleLockVerb
 
 toggle-lock-verb-unlock = Unlock
-toggle-lock-verb-lock = Lock
\ No newline at end of file
+toggle-lock-verb-lock = Lock
diff --git a/Resources/Locale/en-US/machine-linking/receiver_ports.ftl b/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
index 4d2dd25af2..dc45677c8d 100644
--- a/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
+++ b/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
@@ -70,6 +70,9 @@ signal-port-description-set-particle-epsilon = Sets the type of particle this de
 signal-port-name-set-particle-zeta = Set particle type: zeta
 signal-port-description-set-particle-zeta = Sets the type of particle this device emits to zeta.
 
+signal-port-name-set-particle-sigma = Set particle type: sigma
+signal-port-description-set-particle-sigma = Sets the type of particle this device emits to sigma.
+
 signal-port-name-logic-input-a = Input A
 signal-port-description-logic-input-a = First input of a logic gate.
 
diff --git a/Resources/Locale/en-US/markings/gauze.ftl b/Resources/Locale/en-US/markings/gauze.ftl
index 9a45a0a2fa..f8bedc3195 100644
--- a/Resources/Locale/en-US/markings/gauze.ftl
+++ b/Resources/Locale/en-US/markings/gauze.ftl
@@ -1,17 +1,17 @@
 marking-GauzeLefteyePatch-gauze_lefteye_2 = Gauze eyepatch (Left)
 marking-GauzeLefteyePatch = Gauze eyepatch (Left)
 
-marking-GauzeLefteyeTape-gauze_lefteye_1 = Gauze eyepad (Left)
-marking-GauzeLefteyeTape = Gauze eyepad (Left)
+marking-GauzeLefteyePad-gauze_lefteye_1 = Gauze eyepad (Left)
+marking-GauzeLefteyePad = Gauze eyepad (Left)
 
 marking-GauzeRighteyePatch-gauze_righteye_2 = Gauze eyepatch (Right)
 marking-GauzeRighteyePatch = Gauze eyepatch (Right)
 
-marking-GauzeRighteyeTape-gauze_righteye_1 = Gauze eyepad (Right)
-marking-GauzeRighteyeTape = Gauze eyepad (Right)
+marking-GauzeRighteyePad-gauze_righteye_1 = Gauze eyepad (Right)
+marking-GauzeRighteyePad = Gauze eyepad (Right)
 
-marking-GauzeShoulder-gauze_shoulder = Gauze Shoulder
-marking-GauzeShoulder = Gauze Shoulder
+marking-GauzeShoulder-gauze_shoulder = Gauze Shoulder Sling
+marking-GauzeShoulder = Gauze Shoulder Sling
 
 marking-GauzeStomach-gauze_abdomen = Gauze Stomach Wrap
 marking-GauzeStomach = Gauze Stomach Wrap
@@ -46,17 +46,57 @@ marking-GauzeUpperLegRight = Gauze Thigh Wrap (Right)
 marking-GauzeBlindfold-gauze_blindfold = Gauze Blindfold
 marking-GauzeBlindfold = Gauze Blindfold
 
-marking-GauzeLizardBlindfold-gauze_lizardblindfold = Gauze Blindfold
+marking-GauzeLizardBlindfold-gauze_lizard_blindfold = Gauze Blindfold
 marking-GauzeLizardBlindfold = Gauze Blindfold
 
-marking-GauzeLizardFootRight-gauze_lizardfoot_r = Gauze Foot Wrap (Right)
+marking-GauzeLizardFootRight-gauze_lizard_foot_r = Gauze Foot Wrap (Right)
 marking-GauzeLizardFootRight = Gauze Foot Wrap (Right)
 
-marking-GauzeLizardFootLeft-gauze_lizardfoot_l = Gauze Foot Wrap (Left)
+marking-GauzeLizardFootLeft-gauze_lizard_foot_l = Gauze Foot Wrap (Left)
 marking-GauzeLizardFootLeft = Gauze Foot Wrap (Left)
 
-marking-GauzeLizardLefteyePatch-gauze_lizardlefteye = Adjusted Gauze eyepatch (Left)
-marking-GauzeLizardLefteyePatch = Adjusted Gauze eyepatch (Left)
+marking-GauzeLizardLefteyePatch-gauze_lizard_lefteye = Reptilian Gauze eyepatch (Left)
+marking-GauzeLizardLefteyePatch = Reptilian Gauze eyepatch (Left)
+
+marking-GauzeLizardRighteyePatch-gauze_lizard_righteye = Reptilian Gauze eyepatch (Right)
+marking-GauzeLizardRighteyePatch = Reptilian Gauze Eyepatch (Right)
+
+marking-GauzeMothStomach-gauze_moth_abdomen = Insectoid Stomach Wrap
+marking-GauzeMothStomach = Insectoid Stomach Wrap
+
+marking-GauzeMothShoulder-gauze_moth_shoulder = Insectoid Shoulder Sling
+marking-GauzeMothShoulder = Insectoid Shoulder Sling
+
+marking-GauzeMothBlindfold-gauze_moth_blindfold = Insectoid Blindfold
+marking-GauzeMothBlindfold = Insectoid Blindfold
+
+marking-GauzeMothLeftEyePatch-gauze_moth_lefteye_2 = Insectoid Gauze eyepatch (Left)
+marking-GauzeMothLeftEyePatch = Insectoid Gauze eyepatch (Left)
+
+marking-GauzeMothLeftEyePad-gauze_moth_lefteye_1 = Insectoid Gauze eyepad (Left)
+marking-GauzeMothLeftEyePad = Insectoid Gauze eyepad (Left)
+
+marking-GauzeMothRightEyePatch-gauze_moth_righteye_2 = Insectoid Gauze eyepatch (Right)
+marking-GauzeMothRightEyePatch = Insectoid Gauze eyepatch (Right)
+
+marking-GauzeMothRightEyePad-gauze_moth_righteye_1 = Insectoid Gauze eyepad (Right)
+marking-GauzeMothRightEyePad = Insectoid Gauze eyepad (Right)
+
+marking-GauzeMothUpperArmRight-gauze_moth_upperarm_r = Insectoid Gauze Forearm Wrap (Right)
+marking-GauzeMothUpperArmRight = Insectoid Gauze Forearm Wrap (Right)
+
+marking-GauzeMothUpperArmLeft-gauze_moth_upperarm_l = Insectoid Gauze Forearm Wrap (Left)
+marking-GauzeMothUpperArmLeft = Insectoid Gauze Forearm Wrap (Left)
+
+marking-GauzeMothUpperLegRight-gauze_moth_upperleg_r = Insectoid Gauze Thigh Wrap (Right)
+marking-GauzeMothUpperLegRight = Insectoid Insectoid Gauze Thigh Wrap (Right)
+
+marking-GauzeMothUpperLegLeft-gauze_moth_upperleg_l = Insectoid Gauze Thigh Wrap (Left)
+marking-GauzeMothUpperLegLeft = Insectoid Gauze Thigh Wrap (Left)
+
+marking-GauzeMothLowerLegRight-gauze_moth_lowerleg_r = Insectoid Gauze Shin Wrap (Right)
+marking-GauzeMothLowerLegRight = Insectoid Gauze Shin Wrap (Right)
+
+marking-GauzeMothLowerLegLeft-gauze_moth_lowerleg_l = Insectoid Gauze Shin Wrap (Left)
+marking-GauzeMothLowerLegLeft = Insectoid Gauze Shin Wrap (Left)
 
-marking-GauzeLizardRighteyePatch-gauze_lizardrighteye = Adjusted Gauze eyepatch (Right)
-marking-GauzeLizardRighteyePatch = Adjusted Gauze Eyepatch (Right)
\ No newline at end of file
diff --git a/Resources/Locale/en-US/paint/paint.ftl b/Resources/Locale/en-US/paint/paint.ftl
deleted file mode 100644
index 200b1f6e3f..0000000000
--- a/Resources/Locale/en-US/paint/paint.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-paint-success = {THE($target)} has been covered in paint!
-paint-failure = Can't cover {THE($target)} in paint!
-paint-failure-painted = {THE($target)} is already covered in paint!
-paint-empty = {THE($used)} is empty!
-paint-removed = You clean off the paint!
-paint-closed = You must open {THE($used)}  first!
-paint-verb = Paint
-paint-remove-verb = Remove Paint
diff --git a/Resources/Locale/en-US/paper/story-generation.ftl b/Resources/Locale/en-US/paper/story-generation.ftl
new file mode 100644
index 0000000000..bcd1c8901e
--- /dev/null
+++ b/Resources/Locale/en-US/paper/story-generation.ftl
@@ -0,0 +1,244 @@
+story-gen-book-type1 = book
+story-gen-book-type2 = folio
+story-gen-book-type3 = collection
+story-gen-book-type4 = notes
+story-gen-book-type5 = manuscript
+story-gen-book-type6 = records
+story-gen-book-type7 = tome
+story-gen-book-type8 = journal
+story-gen-book-type9 = archives
+story-gen-book-type10= codex
+story-gen-book-type11= memories
+story-gen-book-type12= compendium
+
+story-gen-book-genre1 = work of crime fiction
+story-gen-book-genre2 = comedy
+story-gen-book-genre3 = horror story
+story-gen-book-genre4 = poem
+story-gen-book-genre5 = novella
+story-gen-book-genre6 = chronicle
+story-gen-book-genre7 = work of science-fiction
+story-gen-book-genre8 = fantasy story
+story-gen-book-genre9 = romance
+story-gen-book-genre10= thriller
+story-gen-book-genre11= work of historical fiction
+story-gen-book-genre12= biography
+story-gen-book-genre13= adventure story
+story-gen-book-genre14= drama
+
+story-gen-book-appearance1 = ancient
+story-gen-book-appearance2 = shabby
+story-gen-book-appearance3 = dirty
+story-gen-book-appearance4 = unusual
+story-gen-book-appearance5 = faded
+story-gen-book-appearance6 = nasty
+story-gen-book-appearance7 = dusty
+story-gen-book-appearance8 = scary
+story-gen-book-appearance9 = bloody
+story-gen-book-appearance10= bright
+story-gen-book-appearance11= dubious
+story-gen-book-appearance12= intriguing
+story-gen-book-appearance13= ugly
+story-gen-book-appearance14= crooked
+story-gen-book-appearance15= crumpled
+story-gen-book-appearance16= dirty
+story-gen-book-appearance17= elegant
+story-gen-book-appearance18= ornate
+story-gen-book-appearance19= weathered
+story-gen-book-appearance20= chrisp
+story-gen-book-appearance21= lavish
+story-gen-book-appearance22= tattered
+story-gen-book-appearance23= polished
+story-gen-book-appearance24= embossed
+story-gen-book-appearance25= mismatched
+story-gen-book-appearance26= gilded
+story-gen-book-appearance27= strange
+
+story-gen-book-character1 = clown
+story-gen-book-character2 = mime
+story-gen-book-character3 = reporter
+story-gen-book-character4 = butcher
+story-gen-book-character5 = bartender
+story-gen-book-character6 = janitor
+story-gen-book-character7 = engineer
+story-gen-book-character8 = scientist
+story-gen-book-character9 = guard
+story-gen-book-character10 = doctor
+story-gen-book-character11 = chemist
+story-gen-book-character12 = prisoner
+story-gen-book-character13 = researcher
+story-gen-book-character14 = trader
+story-gen-book-character15 = captain
+story-gen-book-character16 = lizard
+story-gen-book-character17 = moth
+story-gen-book-character18 = diona
+story-gen-book-character19 = cat-girl
+story-gen-book-character20 = cat
+story-gen-book-character21 = corgi
+story-gen-book-character22 = dog
+story-gen-book-character23 = opossum
+story-gen-book-character24 = sloth
+story-gen-book-character25 = syndicate agent
+story-gen-book-character26 = revenant
+story-gen-book-character27 = rat king
+story-gen-book-character28 = ninja
+story-gen-book-character29 = space dragon
+story-gen-book-character30 = revolutionary
+story-gen-book-character31 = nuclear operative
+story-gen-book-character32 = narsie cultist
+story-gen-book-character33 = ratwar cultist
+story-gen-book-character34 = greytider
+story-gen-book-character35 = arachnid
+story-gen-book-character36 = vox
+story-gen-book-character37 = dwarf
+story-gen-book-character38 = thief
+story-gen-book-character39 = wizard
+story-gen-book-character40 = slime
+
+story-gen-book-character-trait1 = stupid
+story-gen-book-character-trait2 = smart
+story-gen-book-character-trait3 = funny
+story-gen-book-character-trait4 = attractive  
+story-gen-book-character-trait5 = charming
+story-gen-book-character-trait6 = nasty
+story-gen-book-character-trait7 = dying
+story-gen-book-character-trait8 = old
+story-gen-book-character-trait9 = young
+story-gen-book-character-trait10 = rich
+story-gen-book-character-trait11 = poor
+story-gen-book-character-trait12 = popular
+story-gen-book-character-trait13 = absent-minded
+story-gen-book-character-trait14 = stern
+story-gen-book-character-trait15 = сharismatic
+story-gen-book-character-trait16 = stoic
+story-gen-book-character-trait17 = cute
+story-gen-book-character-trait18 = dwarven
+story-gen-book-character-trait19 = beer-smelling 
+story-gen-book-character-trait20 = joyful
+story-gen-book-character-trait21 = painfully beautiful
+story-gen-book-character-trait22 = robotic
+story-gen-book-character-trait23 = holographic
+story-gen-book-character-trait24 = hysterically laughing
+
+story-gen-book-event1 = a zombie outbreak
+story-gen-book-event2 = a nuclear  explosion
+story-gen-book-event3 = a mass murder
+story-gen-book-event4 = a sudden depressurization
+story-gen-book-event5 = a blackout
+story-gen-book-event6 = the starvation of the protagonists
+story-gen-book-event7 = a wasting illness
+story-gen-book-event8 = love at first sight
+story-gen-book-event9 = a rush of inspiration
+story-gen-book-event10 = the occurrence of some mystical phenomena
+story-gen-book-event11 = divine intervention
+story-gen-book-event12 = the characters' own selfish motives
+story-gen-book-event13 = an unforeseen deception
+story-gen-book-event14 = the resurrection of one of these characters from the dead
+story-gen-book-event15 = the terrible torture of the protagonist
+story-gen-book-event16 = the inadvertent loosing of a gravitational singularity
+story-gen-book-event17 = a psychic prediction of future events
+story-gen-book-event18 = an antimatter explosion
+story-gen-book-event19 = a chance meeting with a cat-girl
+story-gen-book-event20 = drinking far too much alcohol
+story-gen-book-event21 = eating way too much pizza
+story-gen-book-event22 = having a quarrel with a close friend
+story-gen-book-event23 = the sudden loss of their home in a fiery blaze
+story-gen-book-event24 = the loss of a PDA
+
+story-gen-book-action1 = share in a kiss with a
+story-gen-book-action2 = strangle to death a
+story-gen-book-action3 = manage to blow apart a
+story-gen-book-action4 = manage to win a game of chess against a
+story-gen-book-action5 = narrowly lose a game of chess against a
+story-gen-book-action6 = reveal the hidden secrets of a
+story-gen-book-action7 = manipulate a
+story-gen-book-action8 = sacrifice upon an altar a
+story-gen-book-action9 = attend the wedding of a
+story-gen-book-action10 = join forces to defeat their common enemy, a
+story-gen-book-action11 = are forced to work together to escape a
+story-gen-book-action12 = give a valuable gift to
+
+story-gen-book-action-trait1 = terribly 
+story-gen-book-action-trait2 = disgustingly 
+story-gen-book-action-trait3 = marvelously
+story-gen-book-action-trait4 = nicely
+story-gen-book-action-trait5 = weirdly
+story-gen-book-action-trait6 = amusingly
+story-gen-book-action-trait7 = fancifully
+story-gen-book-action-trait8 = impressively
+story-gen-book-action-trait9 = irresponsibly 
+story-gen-book-action-trait10 = severely 
+story-gen-book-action-trait11 = ruthlessly 
+story-gen-book-action-trait12 = playfully 
+story-gen-book-action-trait13 = thoughtfully
+
+story-gen-book-location1 = in an underground complex
+story-gen-book-location2 = while on an expedition
+story-gen-book-location3 = while trapped in outer space
+story-gen-book-location4 = while in a news office
+story-gen-book-location5 = in a hidden garden
+story-gen-book-location6 = in the kitchen of a local restaurant
+story-gen-book-location7 = under the counter of the local sports bar 
+story-gen-book-location8 = in an ancient library
+story-gen-book-location9 = while deep in bowels of the space station's maintenance corridors
+story-gen-book-location10 = on the bridge of a starship
+story-gen-book-location11 = while in a grungy public bathroom
+story-gen-book-location12 = while trapped inside a crate
+story-gen-book-location13 = while stuck inside a locker
+story-gen-book-location14 = while stationed on Barratry
+story-gen-book-location15 = while in the hall of rustic church
+story-gen-book-location16 = while in a crematorium
+story-gen-book-location17 = standing too close to an anomaly
+story-gen-book-location18 = while huddling on the evacuation shuttle
+story-gen-book-location19 = standing in freshly fallen snow
+story-gen-book-location20 = lost in the woods
+story-gen-book-location21 = iin the harsh desert
+story-gen-book-location22 = worrying about their social media networks
+story-gen-book-location23 = atop of a mountain
+story-gen-book-location24 = while driving a car
+story-gen-book-location25 = in an escape pod
+story-gen-book-location26 = while abroad in a fictional country
+story-gen-book-location27 = clinging to the wing of an inflight airplane
+story-gen-book-location28 = inside a pocket dimension
+story-gen-book-location29 = onboard a Wizard Federation shuttle
+story-gen-book-location30 = standing atop of a mountain of corpses
+story-gen-book-location31 = while psychically projected into their subconscious
+story-gen-book-location32 = while trapped in a shadow dimension
+story-gen-book-location33 = while trying to escape a destroyed space station
+story-gen-book-location34 = while sandwiched between a Tesla ball and a gravitational singularity
+
+story-gen-book-element1 = The plot
+story-gen-book-element2 = The twist
+story-gen-book-element3 = The climax
+story-gen-book-element4 = The final act
+story-gen-book-element5 = The ending
+story-gen-book-element6 = The moral of the story
+story-gen-book-element7 = The theme of this work
+story-gen-book-element8 = The literary style
+story-gen-book-element9 = The illustrations
+
+story-gen-book-element-trait1 = terrifying
+story-gen-book-element-trait2 = disgusting
+story-gen-book-element-trait3 = wonderful
+story-gen-book-element-trait4 = cute
+story-gen-book-element-trait5 = boring
+story-gen-book-element-trait6 = strange
+story-gen-book-element-trait7 = amusing
+story-gen-book-element-trait8 = whimsical
+story-gen-book-element-trait9 = impressive
+story-gen-book-element-trait10 = interesting
+story-gen-book-element-trait11 = inadequate
+story-gen-book-element-trait12 = sad
+story-gen-book-element-trait13 = rather depressing
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Resources/Locale/en-US/rcd/components/rcd-component.ftl b/Resources/Locale/en-US/rcd/components/rcd-component.ftl
index f03eeaa528..9741bde388 100644
--- a/Resources/Locale/en-US/rcd/components/rcd-component.ftl
+++ b/Resources/Locale/en-US/rcd/components/rcd-component.ftl
@@ -1,18 +1,47 @@
 
 ### UI
 
-# Shown when an RCD is examined in details range
-rcd-component-examine-detail = It's currently on {$mode} mode.
+rcd-component-examine-mode-details = It's currently set to '{$mode}' mode.
+rcd-component-examine-build-details = It's currently set to build {MAKEPLURAL($name)}.
+
 
 ### Interaction Messages
 
-# Shown when changing RCD Mode
-rcd-component-change-mode = The RCD is now set to {$mode} mode.
+# Mode change
+rcd-component-change-mode = The RCD is now set to '{$mode}' mode.
+rcd-component-change-build-mode = The RCD is now set to build {MAKEPLURAL($name)}.
 
-rcd-component-no-ammo-message = The RCD is out of ammo!
-rcd-component-tile-obstructed-message = That tile is obstructed!
-rcd-component-tile-indestructible-message = That tile can't be destroyed!
+# Ammo count
+rcd-component-no-ammo-message = The RCD has run out of charges!
+rcd-component-insufficient-ammo-message = The RCD doesn't have enough charges left!
+
+# Deconstruction
+rcd-component-tile-indestructible-message = That tile can't be destructed!
 rcd-component-deconstruct-target-not-on-whitelist-message = You can't deconstruct that!
-rcd-component-cannot-build-floor-tile-not-empty-message = You can only build a floor in space or on plating!
-rcd-component-cannot-build-wall-tile-not-empty-message = You cannot build a wall on space!
-rcd-component-cannot-build-airlock-tile-not-empty-message = Cannot build an airlock on space!
+rcd-component-nothing-to-deconstruct-message = There's nothing to deconstruct!
+rcd-component-tile-obstructed-message = You can't deconstruct tiles when there's something on top of them!
+
+# Construction
+rcd-component-no-valid-grid = You're too far into open space to build here!
+rcd-component-must-build-on-empty-tile-message = A foundation already exists here!
+rcd-component-cannot-build-on-empty-tile-message = You can't build that without a foundation!
+rcd-component-must-build-on-subfloor-message = You can only build that on exposed subfloor!
+rcd-component-cannot-build-on-subfloor-message = You can't build that on exposed subfloor!
+rcd-component-cannot-build-on-occupied-tile-message = You can't build here, the space is already occupied!
+rcd-component-cannot-build-identical-tile = That tile already exists there!
+
+
+### Category names
+
+rcd-component-walls-and-flooring = Walls and flooring
+rcd-component-windows-and-grilles = Windows and grilles
+rcd-component-airlocks = Airlocks
+rcd-component-electrical = Electrical
+rcd-component-lighting = Lighting
+
+
+### Prototype names (note: constructable items will be puralized)
+
+rcd-component-deconstruct = deconstruct
+rcd-component-floor-steel = steel tile
+rcd-component-plating = hull plate
diff --git a/Resources/Locale/en-US/reagents/meta/biological.ftl b/Resources/Locale/en-US/reagents/meta/biological.ftl
index a320bbdcb3..d8f0f6c413 100644
--- a/Resources/Locale/en-US/reagents/meta/biological.ftl
+++ b/Resources/Locale/en-US/reagents/meta/biological.ftl
@@ -7,6 +7,9 @@ reagent-desc-insect-blood = Okay, this is really gross. It almost looks.. alive?
 reagent-name-slime = slime
 reagent-desc-slime = You thought this was gradient blood at first, but you were mistaken.
 
+reagent-name-sap = sap
+reagent-desc-sap = Sticky, sweet tree blood.
+
 reagent-name-hemocyanin-blood = blue blood
 reagent-desc-hemocyanin-blood = Contains copper as opposed to iron which gives it a distinct blue color.
 
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
index 099d23c465..4c38e92558 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
@@ -82,6 +82,9 @@ reagent-desc-atomic-bomb = Nuclear proliferation never tasted so good.
 reagent-name-b52 = b-52
 reagent-desc-b52 = Coffee, irish cream, and cognac. You will get bombed.
 
+reagent-name-blue-hawaiian = blue hawaiian
+reagent-desc-blue-hawaiian = Aloha! Does that mean hello or goodbye?
+
 reagent-name-bahama-mama = bahama mama
 reagent-desc-bahama-mama = Tropical cocktail.
 
@@ -106,6 +109,12 @@ reagent-desc-booger = Ewww...
 reagent-name-brave-bull = brave bull
 reagent-desc-brave-bull = It's just as effective as Dutch-Courage!
 
+reagent-name-coconut-rum = coconut rum
+reagent-desc-coconut-rum = Rum with coconut for that tropical feel.
+
+reagent-name-cosmopolitan = cosmopolitan
+reagent-desc-cosmopolitan = Even in the worst situations, nothing beats a fresh cosmopolitan.
+
 reagent-name-cuba-libre = cuba libre
 reagent-desc-cuba-libre = Rum, mixed with cola. Viva la revolucion.
 
@@ -190,9 +199,15 @@ reagent-desc-moonshine = Artisanal homemade liquor. What could go wrong?
 reagent-name-neurotoxin = neurotoxin
 reagent-desc-neurotoxin = A strong neurotoxin that puts the subject into a death-like state.
 
+reagent-name-painkiller = painkiller
+reagent-desc-painkiller = A cure for what ails you.
+
 reagent-name-patron = patron
 reagent-desc-patron = Tequila with silver in it, a favorite of alcoholic women in the club scene.
 
+reagent-name-pina-colada = piña colada
+reagent-desc-pina-colada = For getting lost in the rain.
+
 reagent-name-red-mead = red mead
 reagent-desc-red-mead = The true Viking's drink! Even though it has a strange red color.
 
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
index ad0ade7c96..359e866fd9 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
@@ -4,6 +4,12 @@ reagent-desc-coffee = A drink made from brewed coffee beans. Contains a moderate
 reagent-name-cream = cream
 reagent-desc-cream = The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?
 
+reagent-name-coconut-water = coconut water
+reagent-desc-coconut-water = A favorite of survivors on deserted islands.
+
+reagent-name-cream-of-coconut = cream of coconut
+reagent-desc-cream-of-coconut = Sweet, syrupy version of coconut cream with added sugar.
+
 reagent-name-cafe-latte = cafe latte
 reagent-desc-cafe-latte = A nice, strong and tasty beverage while you are reading.
 
@@ -17,7 +23,7 @@ reagent-name-iced-coffee = iced coffee
 reagent-desc-iced-coffee = Coffee and ice, refreshing and cool.
 
 reagent-name-iced-green-tea = iced green tea
-reagent-desc-iced-green-tea = cold green tea.
+reagent-desc-iced-green-tea = Cold green tea.
 
 reagent-name-iced-tea = iced tea
 reagent-desc-iced-tea = No relation to a certain rap artist/actor.
@@ -25,6 +31,9 @@ reagent-desc-iced-tea = No relation to a certain rap artist/actor.
 reagent-name-lemonade = lemonade
 reagent-desc-lemonade = Drink using lemon juice, water, and a sweetener such as cane sugar or honey.
 
+reagent-name-arnold-palmer = arnold palmer
+reagent-desc-arnold-palmer = Now watch this drive.
+
 reagent-name-milk = milk
 reagent-desc-milk = An opaque white liquid produced by the mammary glands of mammals.
 
@@ -86,4 +95,4 @@ reagent-name-white-gilgamesh = white gilgamesh
 reagent-desc-white-gilgamesh = A sickening mixture of milk and beer. Makes you feel like you're made of wood.
 
 reagent-name-mopwata = mopwata
-reagent-desc-mopwata = Dirty, stagnant mop water.
\ No newline at end of file
+reagent-desc-mopwata = Dirty, stagnant mop water.
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
index 08017c265d..300284aee9 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
@@ -1,6 +1,9 @@
 reagent-name-cola = cola
 reagent-desc-cola = A sweet, carbonated soft drink. Caffeine free.
 
+reagent-name-shirley-temple = shirley temple
+reagent-desc-shirley-temple = A favorite amongst younger members of the crew.
+
 reagent-name-changeling-sting = changeling sting
 reagent-desc-changeling-sting = You take a tiny sip and feel a burning sensation...
 
@@ -28,6 +31,12 @@ reagent-desc-root-beer = A very sweet, carbonated drink reminiscent of sarsparil
 reagent-name-root-beer-float = root beer float
 reagent-desc-root-beer-float = Root beer, but now with ice cream on top. It truly is the magnum opus of Canadian summertime drinks.
 
+reagent-name-sol-dry = sol dry
+reagent-desc-sol-dry = Sweet ginger soda from outer space!
+
+reagent-name-roy-rogers = roy rogers
+reagent-desc-roy-rogers = Solid proof that there IS something known as too sweet.
+
 reagent-name-space-mountain-wind = Space Mountain Wind
 reagent-desc-space-mountain-wind = Blows right through you like a space wind.
 
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
index 38cd16b01c..809fbafffd 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
@@ -39,3 +39,6 @@ reagent-desc-soysauce = A salty soy-based flavoring.
 
 reagent-name-table-salt = table salt
 reagent-desc-table-salt = Commonly known as salt, Sodium Chloride is often used to season food or kill borers instantly.
+
+reagent-name-syrup = syrup
+reagent-desc-syrup = Delicious syrup made from tree sap, somehow stickier than glue.
diff --git a/Resources/Locale/en-US/shell.ftl b/Resources/Locale/en-US/shell.ftl
index 7a66fbc794..34460f001a 100644
--- a/Resources/Locale/en-US/shell.ftl
+++ b/Resources/Locale/en-US/shell.ftl
@@ -47,3 +47,4 @@ shell-argument-number-invalid = Argument {$index} must be a valid number!
 
 # Hints
 shell-argument-username-hint = <username>
+shell-argument-username-optional-hint = [username]
diff --git a/Resources/Locale/en-US/speech/speech-chatsan.ftl b/Resources/Locale/en-US/speech/speech-chatsan.ftl
index 6ce575e648..25e6c6f1ea 100644
--- a/Resources/Locale/en-US/speech/speech-chatsan.ftl
+++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl
@@ -117,3 +117,6 @@ chatsan-replacement-42 = of course
 
 chatsan-word-43 = ig
 chatsan-replacement-43 = i guess
+
+chatsan-word-44 = tbf
+chatsan-replacement-44 = to be fair
diff --git a/Resources/Locale/en-US/storage/components/secret-stash-component.ftl b/Resources/Locale/en-US/storage/components/secret-stash-component.ftl
index d41933b374..d0dfed2b5d 100644
--- a/Resources/Locale/en-US/storage/components/secret-stash-component.ftl
+++ b/Resources/Locale/en-US/storage/components/secret-stash-component.ftl
@@ -5,6 +5,7 @@ comp-secret-stash-action-hide-success = You hide { THE($item) } in { $this }
 comp-secret-stash-action-hide-container-not-empty = There's already something in here?!
 comp-secret-stash-action-hide-item-too-big = { THE($item) } is too big to fit in {$stash}!
 comp-secret-stash-action-get-item-found-something = There was something inside {$stash}!
+comp-secret-stash-on-examine-found-hidden-item = There is something hidden inside.
 
 secret-stash-part-plant = the plant
 secret-stash-part-toilet = the toilet cistern
diff --git a/Resources/Locale/en-US/store/store.ftl b/Resources/Locale/en-US/store/store.ftl
index 7af2b05533..d663cc61f7 100644
--- a/Resources/Locale/en-US/store/store.ftl
+++ b/Resources/Locale/en-US/store/store.ftl
@@ -6,3 +6,5 @@ store-ui-traitor-flavor = Copyright (C) NT -30643
 store-ui-traitor-warning = Operatives must lock their uplinks after use to avoid detection.
 
 store-withdraw-button-ui = Withdraw {$currency}
+
+store-not-account-owner = This {$store} is not bound to you!
diff --git a/Resources/Locale/en-US/toilet/toilet-component.ftl b/Resources/Locale/en-US/toilet/toilet-component.ftl
index 7807759e42..1129f61b4d 100644
--- a/Resources/Locale/en-US/toilet/toilet-component.ftl
+++ b/Resources/Locale/en-US/toilet/toilet-component.ftl
@@ -7,3 +7,5 @@ toilet-component-suicide-message-others = {CAPITALIZE(THE($victim))} bashes them
 toilet-component-suicide-message = You bash yourself with {THE($owner)}!
 toilet-seat-close = Close Seat
 toilet-seat-open = Open Seat
+
+plunger-unblock = You unblock the {THE($target)}!
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index b82cb0033a..fa17dc23ec 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -33,5 +33,8 @@ 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-southern-name = Southern Drawl
+trait-southern-desc = You have a different way of speakin'.
+
 trait-snoring-name = Snoring
 trait-snoring-desc = You will snore while sleeping.
diff --git a/Resources/Locale/en-US/ui/general.ftl b/Resources/Locale/en-US/ui/general.ftl
new file mode 100644
index 0000000000..1471261dcb
--- /dev/null
+++ b/Resources/Locale/en-US/ui/general.ftl
@@ -0,0 +1,3 @@
+### Loc for the various UI-related verbs
+ui-verb-toggle-open = Toggle UI
+verb-instrument-openui = Play Music
diff --git a/Resources/Maps/Shuttles/emergency_meta.yml b/Resources/Maps/Shuttles/emergency_meta.yml
index 57e9f98f40..385f5e3bbf 100644
--- a/Resources/Maps/Shuttles/emergency_meta.yml
+++ b/Resources/Maps/Shuttles/emergency_meta.yml
@@ -21,7 +21,7 @@ entities:
   - uid: 1
     components:
     - type: MetaData
-      name: grid
+      name: NT Evac Meta
     - type: Transform
       pos: -2.4375,0.859375
       parent: invalid
diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml
index c11434603e..4491f8202b 100644
--- a/Resources/Maps/core.yml
+++ b/Resources/Maps/core.yml
@@ -74,207 +74,207 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABbQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADbQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAgQAAAAAAbgAAAAABbgAAAAADbgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACbQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADbQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAgQAAAAAAbgAAAAACbgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: DgAAAAABDgAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAAADgAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAABDgAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAACDgAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAACegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAADegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAbQAAAAAAbgAAAAAAbgAAAAADbQAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAA
+          tiles: DgAAAAABDgAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAAADgAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAABDgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAABegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAbQAAAAAAbgAAAAAAbgAAAAADbQAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: bAAAAAAAbAAAAAAAXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAADXQAAAAAAXQAAAAAAaAAAAAADbAAAAAAAbAAAAAAAXQAAAAABaAAAAAADJAAAAAABJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAABaAAAAAADJAAAAAADJAAAAAAAJAAAAAACfgAAAAAAbAAAAAAAbgAAAAADbgAAAAABbgAAAAABbQAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: bAAAAAAAbAAAAAAAXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAABXQAAAAAAXQAAAAABaAAAAAABbAAAAAAAbAAAAAAAXQAAAAACaAAAAAADJAAAAAAAJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAADaAAAAAADJAAAAAADJAAAAAAAJAAAAAADfgAAAAAAbAAAAAAAbgAAAAABbgAAAAABbgAAAAACbQAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: bAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACXQAAAAACaAAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAXQAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAADaAAAAAADXQAAAAADbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAJAAAAAABJAAAAAADJAAAAAADXQAAAAACJAAAAAABXQAAAAACXQAAAAACaAAAAAAAXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACHwAAAAABfgAAAAAAXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbQAAAAAAbgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAbQAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAACegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: bAAAAAAAfgAAAAAAHwAAAAACHwAAAAADXQAAAAAAaAAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAADHwAAAAACXQAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAJAAAAAADJAAAAAAAJAAAAAABXQAAAAABJAAAAAACXQAAAAACXQAAAAABaAAAAAADXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACHwAAAAADfgAAAAAAXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbQAAAAAAbgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAbQAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAACegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-2:
           ind: -1,-2
-          tiles: XQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAACaAAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABaAAAAAADaAAAAAADaAAAAAAAaAAAAAADaAAAAAADaAAAAAAAaAAAAAABaAAAAAABaAAAAAACaAAAAAACTgAAAAAATgAAAAACaAAAAAABTgAAAAADTgAAAAACaAAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAADaAAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADHwAAAAABfgAAAAAAHwAAAAADfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAAAXQAAAAADfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAADaAAAAAADaAAAAAAAaAAAAAABXQAAAAAAXQAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAABHwAAAAACfgAAAAAAbgAAAAADfgAAAAAAJAAAAAACfgAAAAAAaAAAAAAAaAAAAAABXQAAAAAAJAAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAbgAAAAADfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAADaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADXQAAAAACTgAAAAABTgAAAAABTgAAAAADXQAAAAADXQAAAAAATgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAABJAAAAAADJAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABJAAAAAACXQAAAAABJAAAAAACJAAAAAAAJAAAAAADfgAAAAAAJAAAAAADJAAAAAAAbgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAXQAAAAADXQAAAAADbQAAAAAAfgAAAAAAHwAAAAACHwAAAAADXQAAAAAAaAAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAXQAAAAACXQAAAAAD
+          tiles: XQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAACaAAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAADaAAAAAAAaAAAAAAAaAAAAAABaAAAAAACaAAAAAACaAAAAAADaAAAAAADaAAAAAABaAAAAAABaAAAAAACTgAAAAADTgAAAAAAaAAAAAADTgAAAAABTgAAAAABaAAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAaAAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAHwAAAAADfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAaAAAAAACaAAAAAABXQAAAAAAXQAAAAABfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAACaAAAAAABaAAAAAABaAAAAAABXQAAAAABXQAAAAACfgAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAACHwAAAAACfgAAAAAAbgAAAAABfgAAAAAAJAAAAAADfgAAAAAAaAAAAAACaAAAAAAAXQAAAAADJAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAbgAAAAADfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAACaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABXQAAAAABTgAAAAAATgAAAAADTgAAAAAAXQAAAAAAXQAAAAAATgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAAAXQAAAAAAJAAAAAADJAAAAAACJAAAAAAAfgAAAAAAJAAAAAAAJAAAAAABbgAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAHwAAAAABHwAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAbQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAXQAAAAAAaAAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAXQAAAAADXQAAAAAC
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: aAAAAAABaAAAAAADXQAAAAAAXQAAAAABaAAAAAAAXQAAAAABXQAAAAACXQAAAAACaAAAAAABXQAAAAABaAAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAABTgAAAAAATgAAAAACaAAAAAAAaAAAAAACaAAAAAABaAAAAAAAaAAAAAAAaAAAAAABaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAaAAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAADfgAAAAAAHwAAAAACJAAAAAACJAAAAAADJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAHwAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAJAAAAAAAegAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADJAAAAAAAfgAAAAAAHwAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAegAAAAAAegAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAAHwAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAJAAAAAACJAAAAAABJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABaAAAAAACXQAAAAAAHwAAAAADfgAAAAAAHwAAAAADJAAAAAACJAAAAAAAJAAAAAABJAAAAAADXQAAAAABXQAAAAACJAAAAAABfgAAAAAAJAAAAAAAaAAAAAADaAAAAAAAaAAAAAACXQAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAATgAAAAABTgAAAAABJAAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAAAaAAAAAACXQAAAAADHwAAAAABHwAAAAACHwAAAAADHwAAAAADHwAAAAACHwAAAAAAHwAAAAABXQAAAAABXQAAAAABXQAAAAADaAAAAAAAaAAAAAADaAAAAAABaAAAAAACaAAAAAADXQAAAAACHwAAAAABHwAAAAAAHwAAAAACHwAAAAABXQAAAAADXQAAAAABaAAAAAACXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAaAAAAAABaAAAAAACaAAAAAAAaAAAAAABXQAAAAACHwAAAAABHwAAAAABfgAAAAAAHwAAAAAAXQAAAAADXQAAAAACaAAAAAABHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAACaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAJAAAAAAAJAAAAAADJAAAAAACXQAAAAACXQAAAAACaAAAAAADXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAACfgAAAAAAJAAAAAABHwAAAAACHwAAAAAAXQAAAAAAXQAAAAAAaAAAAAABXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAADXQAAAAACXQAAAAABaAAAAAAD
+          tiles: aAAAAAADaAAAAAADXQAAAAADXQAAAAACaAAAAAABXQAAAAAAXQAAAAADXQAAAAAAaAAAAAAAXQAAAAADaAAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAATgAAAAAATgAAAAACaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAADaAAAAAADaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAAAaAAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAADJAAAAAAAJAAAAAABJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAHwAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAJAAAAAADegAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAACJAAAAAACfgAAAAAAHwAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAegAAAAADegAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAADJAAAAAADJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAHwAAAAACfgAAAAAAHwAAAAADJAAAAAADJAAAAAADJAAAAAADJAAAAAADXQAAAAADXQAAAAAAJAAAAAADfgAAAAAAJAAAAAAAaAAAAAADaAAAAAADaAAAAAABXQAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAATgAAAAADTgAAAAADJAAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAABaAAAAAADXQAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAABXQAAAAADXQAAAAAAXQAAAAABaAAAAAACaAAAAAADaAAAAAABaAAAAAACaAAAAAABXQAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAXQAAAAADXQAAAAADaAAAAAABXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAaAAAAAABXQAAAAACHwAAAAACHwAAAAACfgAAAAAAHwAAAAAAXQAAAAADXQAAAAADaAAAAAADHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAADaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAABaAAAAAABXQAAAAADfgAAAAAAJAAAAAACJAAAAAABJAAAAAAAXQAAAAABXQAAAAAAaAAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAABfgAAAAAAJAAAAAACHwAAAAACHwAAAAABXQAAAAADXQAAAAAAaAAAAAABXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADHwAAAAADHwAAAAADXQAAAAACXQAAAAACaAAAAAAD
           version: 6
         1,-2:
           ind: 1,-2
-          tiles: XQAAAAABXQAAAAAAaAAAAAADXQAAAAABaAAAAAADXQAAAAABfgAAAAAAHwAAAAAAaAAAAAADaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAACHwAAAAABfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAADfgAAAAAAHwAAAAAAaAAAAAACaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAHwAAAAACfgAAAAAAHwAAAAABJAAAAAAAHwAAAAACfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAHwAAAAADaAAAAAACaAAAAAACaAAAAAABXQAAAAABaAAAAAABHwAAAAABHwAAAAACHwAAAAADJAAAAAACHwAAAAABfgAAAAAAXQAAAAACaAAAAAAAXQAAAAABfgAAAAAAHwAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAADaAAAAAACHwAAAAACfgAAAAAAHwAAAAADJAAAAAAAHwAAAAABfgAAAAAAaAAAAAABaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACJAAAAAAAHwAAAAACfgAAAAAAXQAAAAABaAAAAAABXQAAAAACJAAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAJAAAAAAAHwAAAAACfgAAAAAAXQAAAAADaAAAAAADaAAAAAABaAAAAAAAaAAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAAAaAAAAAABXQAAAAAAfgAAAAAAHwAAAAADJAAAAAACHwAAAAADfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAXQAAAAABfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAXQAAAAACfgAAAAAAHwAAAAABHwAAAAACXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAADaAAAAAADXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAHwAAAAADJAAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAABfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAAAaAAAAAADXQAAAAACaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAaAAAAAADaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAACaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA
+          tiles: XQAAAAABXQAAAAACaAAAAAADXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAHwAAAAACaAAAAAACaAAAAAACaAAAAAAAaAAAAAABaAAAAAABHwAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAHwAAAAAAaAAAAAACaAAAAAACaAAAAAADaAAAAAADaAAAAAABHwAAAAADfgAAAAAAHwAAAAADJAAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAHwAAAAABaAAAAAACaAAAAAACaAAAAAADXQAAAAAAaAAAAAABHwAAAAAAHwAAAAACHwAAAAABJAAAAAACHwAAAAABfgAAAAAAXQAAAAADaAAAAAABXQAAAAAAfgAAAAAAHwAAAAACaAAAAAAAaAAAAAABaAAAAAAAaAAAAAABaAAAAAABHwAAAAACfgAAAAAAHwAAAAAAJAAAAAACHwAAAAADfgAAAAAAaAAAAAACaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACJAAAAAADHwAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACJAAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAJAAAAAAAHwAAAAADfgAAAAAAXQAAAAADaAAAAAABaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAABaAAAAAAAaAAAAAADaAAAAAABXQAAAAAAfgAAAAAAHwAAAAADJAAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAaAAAAAACXQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAADHwAAAAABXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAACJAAAAAADXQAAAAABXQAAAAABXQAAAAABfgAAAAAAHwAAAAABfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAAAaAAAAAAAXQAAAAACaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAAAaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAADfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA
           version: 6
         1,-1:
           ind: 1,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAbQAAAAAAgQAAAAAAgQAAAAAAbQAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAbgAAAAABfgAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAHwAAAAABHwAAAAAC
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAbQAAAAAAgQAAAAAAgQAAAAAAbQAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAbgAAAAABfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACfgAAAAAAJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABfgAAAAAAHwAAAAAAHwAAAAAA
           version: 6
         -2,-2:
           ind: -2,-2
-          tiles: EgAAAAAAXQAAAAADegAAAAABegAAAAAAXQAAAAACfgAAAAAAJAAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAaAAAAAACXQAAAAABXQAAAAADXQAAAAACEgAAAAABXQAAAAACegAAAAAAegAAAAACXQAAAAADfgAAAAAAXQAAAAADTgAAAAACTgAAAAACaAAAAAABTgAAAAACaAAAAAABaAAAAAAAaAAAAAADaAAAAAAAaAAAAAACEgAAAAAAXQAAAAACegAAAAACegAAAAAAXQAAAAACfgAAAAAAXQAAAAACTgAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAADaAAAAAABXQAAAAAAXQAAAAABXQAAAAADEgAAAAADXQAAAAABegAAAAABegAAAAADXQAAAAABaAAAAAACXQAAAAAAaAAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAEgAAAAAAXQAAAAABegAAAAAAegAAAAACXQAAAAABaAAAAAAAXQAAAAADTgAAAAACXQAAAAABXQAAAAACaAAAAAAAHwAAAAAAHwAAAAAAJgAAAAADJgAAAAABJgAAAAADEgAAAAADXQAAAAACegAAAAABegAAAAAAXQAAAAADfgAAAAAAXQAAAAABTgAAAAADXQAAAAAAXQAAAAAAaAAAAAAAHwAAAAABHwAAAAACTgAAAAADTgAAAAABTgAAAAAAXQAAAAADXQAAAAAAKAAAAAACKAAAAAAAXQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABXQAAAAAAaAAAAAADHwAAAAAAHwAAAAADJgAAAAABJgAAAAABJgAAAAACKAAAAAADKAAAAAADKAAAAAACKAAAAAADXQAAAAACfgAAAAAAXQAAAAACaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbgAAAAAAgQAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAABegAAAAADegAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAABfgAAAAAAegAAAAAAegAAAAABegAAAAADegAAAAABegAAAAABfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAAAegAAAAABegAAAAAAegAAAAABegAAAAAAegAAAAAAegAAAAADfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAAAegAAAAABegAAAAACegAAAAACegAAAAABegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAA
+          tiles: EgAAAAACXQAAAAADegAAAAABegAAAAACXQAAAAADfgAAAAAAJAAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABaAAAAAAAXQAAAAAAXQAAAAABXQAAAAAAEgAAAAACXQAAAAAAegAAAAAAegAAAAAAXQAAAAACfgAAAAAAXQAAAAACTgAAAAAATgAAAAAAaAAAAAACTgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAADEgAAAAAAXQAAAAACegAAAAAAegAAAAABXQAAAAADfgAAAAAAXQAAAAABTgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACaAAAAAADXQAAAAAAXQAAAAAAXQAAAAADEgAAAAADXQAAAAAAegAAAAABegAAAAADXQAAAAACaAAAAAAAXQAAAAADaAAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACEgAAAAAAXQAAAAACegAAAAABegAAAAABXQAAAAAAaAAAAAACXQAAAAACTgAAAAAAXQAAAAABXQAAAAAAaAAAAAADHwAAAAADHwAAAAAAJgAAAAADJgAAAAABJgAAAAAAEgAAAAACXQAAAAABegAAAAADegAAAAABXQAAAAABfgAAAAAAXQAAAAAATgAAAAACXQAAAAACXQAAAAADaAAAAAADHwAAAAADHwAAAAABTgAAAAABTgAAAAAATgAAAAABXQAAAAACXQAAAAABKAAAAAACKAAAAAADXQAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAXQAAAAADaAAAAAACHwAAAAADHwAAAAAAJgAAAAABJgAAAAAAJgAAAAABKAAAAAAAKAAAAAADKAAAAAAAKAAAAAACXQAAAAABfgAAAAAAXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbgAAAAACgQAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAACXQAAAAADaAAAAAABXQAAAAADfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAADfgAAAAAAegAAAAAAegAAAAACegAAAAAAegAAAAABegAAAAABfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAACfgAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAACegAAAAABfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACegAAAAACegAAAAADegAAAAAAegAAAAABegAAAAAAegAAAAADfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAAAegAAAAACegAAAAACegAAAAABegAAAAAAegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         -2,-1:
           ind: -2,-1
-          tiles: egAAAAACegAAAAACegAAAAAAegAAAAACegAAAAACaAAAAAADXQAAAAACaAAAAAABXQAAAAABfgAAAAAAegAAAAABegAAAAACegAAAAAAewAAAAADewAAAAADfgAAAAAATgAAAAAATgAAAAAAKAAAAAABTgAAAAADTgAAAAADaAAAAAADXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAegAAAAABegAAAAACegAAAAADewAAAAADewAAAAAAfgAAAAAATgAAAAABTgAAAAAAKAAAAAAATgAAAAADTgAAAAABaAAAAAAAXQAAAAABaAAAAAABXQAAAAADfgAAAAAAegAAAAACegAAAAADegAAAAABewAAAAAAewAAAAACfgAAAAAAegAAAAAAegAAAAABegAAAAADegAAAAAAegAAAAAAaAAAAAABXQAAAAADaAAAAAAAXQAAAAADfgAAAAAAegAAAAADegAAAAAAegAAAAABewAAAAABewAAAAADfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAJAAAAAADfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAewAAAAAAewAAAAABewAAAAADfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADXQAAAAADfgAAAAAAHwAAAAADHwAAAAADHwAAAAACQAAAAAAAfgAAAAAAaAAAAAABfgAAAAAAKAAAAAADKAAAAAACKAAAAAAAfgAAAAAAXQAAAAACaAAAAAADaAAAAAAAXQAAAAADfgAAAAAAHwAAAAADHwAAAAADHwAAAAABQAAAAAAAQAAAAAAAXQAAAAABfgAAAAAAKAAAAAACKAAAAAADKAAAAAABfgAAAAAAXQAAAAACXQAAAAABaAAAAAAAXQAAAAADfgAAAAAAHwAAAAABHwAAAAACHwAAAAACQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbgAAAAABbgAAAAABfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXwAAAAABXwAAAAAAJAAAAAACXwAAAAADXwAAAAAAXwAAAAAAXwAAAAAAXQAAAAAAXQAAAAACXQAAAAABaAAAAAAAegAAAAAAegAAAAAAegAAAAADegAAAAACegAAAAACHwAAAAAAHwAAAAACXwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAACXQAAAAAAXQAAAAACXQAAAAAAaAAAAAABegAAAAAAegAAAAADegAAAAACegAAAAAAegAAAAADHwAAAAABHwAAAAAAXwAAAAACHwAAAAAAHwAAAAABHwAAAAADHwAAAAACXQAAAAADXQAAAAACXQAAAAADaAAAAAABegAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAACHwAAAAACHwAAAAACXwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAACXQAAAAABXQAAAAACXQAAAAAAaAAAAAACegAAAAAAegAAAAACegAAAAABegAAAAADfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAABaAAAAAAAegAAAAADegAAAAADegAAAAABegAAAAADegAAAAAA
+          tiles: egAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAACaAAAAAABXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAegAAAAACegAAAAACegAAAAACewAAAAACewAAAAABfgAAAAAATgAAAAACTgAAAAABKAAAAAACTgAAAAADTgAAAAAAaAAAAAACXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAegAAAAADegAAAAABegAAAAADewAAAAAAewAAAAABfgAAAAAATgAAAAABTgAAAAACKAAAAAAATgAAAAAATgAAAAABaAAAAAABXQAAAAABaAAAAAADXQAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAADewAAAAACewAAAAACfgAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAADegAAAAADaAAAAAACXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAegAAAAABegAAAAACegAAAAABewAAAAAAewAAAAADfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAewAAAAACewAAAAACewAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAQAAAAAAAfgAAAAAAaAAAAAACfgAAAAAAKAAAAAADKAAAAAACKAAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAADXQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACQAAAAAAAQAAAAAAAXQAAAAABfgAAAAAAKAAAAAAAKAAAAAACKAAAAAACfgAAAAAAXQAAAAABXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbgAAAAADbgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXwAAAAABXwAAAAABJAAAAAADXwAAAAADXwAAAAAAXwAAAAABXwAAAAAAXQAAAAADXQAAAAABXQAAAAADaAAAAAACegAAAAABegAAAAADegAAAAADegAAAAABegAAAAAAHwAAAAADHwAAAAABXwAAAAADHwAAAAACHwAAAAABHwAAAAADHwAAAAADXQAAAAACXQAAAAADXQAAAAACaAAAAAABegAAAAACegAAAAAAegAAAAADegAAAAADegAAAAABHwAAAAABHwAAAAAAXwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAADXQAAAAADXQAAAAABXQAAAAADaAAAAAACegAAAAADegAAAAADegAAAAABegAAAAABegAAAAACHwAAAAACHwAAAAADXwAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAACXQAAAAABXQAAAAABXQAAAAABaAAAAAABegAAAAACegAAAAADegAAAAAAegAAAAADfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACaAAAAAABegAAAAABegAAAAAAegAAAAACegAAAAADegAAAAAD
           version: 6
         1,0:
           ind: 1,0
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAACMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAADaAAAAAABXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABTgAAAAABTgAAAAABaAAAAAABaAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAADaAAAAAABaAAAAAAAaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAATgAAAAABXQAAAAADXQAAAAABXQAAAAAAJAAAAAADJAAAAAADJAAAAAAAXQAAAAAAXQAAAAACaAAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABfgAAAAAAJAAAAAACJAAAAAACJAAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAJAAAAAAAJAAAAAACJAAAAAABXQAAAAACXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAgQAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAAAaAAAAAADaAAAAAAAfgAAAAAAaAAAAAABaAAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAAAaAAAAAACaAAAAAACHQAAAAAAaAAAAAAAaAAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAgQAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAADaAAAAAABaAAAAAAAXQAAAAADaAAAAAABaAAAAAADXQAAAAAAXQAAAAADfgAAAAAAXQAAAAACXQAAAAADbAAAAAAAbQAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACaAAAAAAAaAAAAAADXQAAAAADaAAAAAAAaAAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAABXQAAAAABbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABaAAAAAAAaAAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAACXQAAAAACfgAAAAAAXQAAAAABXQAAAAAC
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAAAaAAAAAABaAAAAAACMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAaAAAAAADXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADTgAAAAABTgAAAAACaAAAAAADaAAAAAACbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAAAXQAAAAABXQAAAAACJAAAAAAAJAAAAAAAJAAAAAABXQAAAAACXQAAAAACaAAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAABfgAAAAAAJAAAAAAAJAAAAAADJAAAAAABXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAADfgAAAAAAJAAAAAAAJAAAAAABJAAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAJAAAAAACJAAAAAABJAAAAAABXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADaAAAAAAAaAAAAAAAfgAAAAAAaAAAAAADaAAAAAADXQAAAAADXQAAAAABfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADaAAAAAAAaAAAAAAAHQAAAAADaAAAAAAAaAAAAAABXQAAAAABXQAAAAADfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAgQAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACaAAAAAAAaAAAAAAAXQAAAAAAaAAAAAADaAAAAAADXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAADaAAAAAABaAAAAAAAXQAAAAADaAAAAAAAaAAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAADbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAADaAAAAAABaAAAAAADfgAAAAAAaAAAAAADaAAAAAACXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAAC
           version: 6
         2,-2:
           ind: 2,-2
-          tiles: HwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAAHwAAAAAAHwAAAAAAewAAAAAAfgAAAAAAewAAAAACHwAAAAABHwAAAAADMwAAAAAAHwAAAAADHwAAAAADewAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAADHwAAAAABewAAAAAAewAAAAACewAAAAAAHwAAAAABHwAAAAACMwAAAAAAHwAAAAACHwAAAAACewAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAADfgAAAAAAHwAAAAADHwAAAAAAewAAAAAAfgAAAAAAewAAAAABHwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAACewAAAAABfgAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAewAAAAABewAAAAAAewAAAAACewAAAAADewAAAAAAewAAAAACfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAegAAAAABegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAXQAAAAAAegAAAAABegAAAAAAegAAAAADfgAAAAAAHwAAAAABHwAAAAACHwAAAAAAXQAAAAABXQAAAAAAegAAAAABJAAAAAABfgAAAAAAHwAAAAACXQAAAAABXQAAAAAAXQAAAAACegAAAAADegAAAAABegAAAAACHwAAAAAAHwAAAAACHwAAAAADHwAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAACfgAAAAAAJAAAAAADfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAcAAAAAACcAAAAAADcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACaAAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAAAaAAAAAADXQAAAAACTgAAAAACTgAAAAADaAAAAAAATgAAAAACTgAAAAADaAAAAAACaAAAAAABTgAAAAADaAAAAAADTgAAAAABTgAAAAACTgAAAAACaAAAAAADTgAAAAAAaAAAAAABaAAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAABaAAAAAACXQAAAAACXQAAAAAAXQAAAAAAaAAAAAADXQAAAAABXQAAAAACXQAAAAACaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAABaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAA
+          tiles: HwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACfgAAAAAAHwAAAAABHwAAAAAAewAAAAACfgAAAAAAewAAAAABHwAAAAABHwAAAAABMwAAAAAAHwAAAAACHwAAAAACewAAAAABfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAACewAAAAADewAAAAACewAAAAABHwAAAAADHwAAAAADMwAAAAAAHwAAAAADHwAAAAABewAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAACewAAAAACfgAAAAAAewAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAACewAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAewAAAAAAewAAAAADewAAAAADewAAAAADewAAAAAAewAAAAABfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADXQAAAAAAegAAAAABegAAAAABegAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABXQAAAAADXQAAAAABegAAAAACJAAAAAABfgAAAAAAHwAAAAABXQAAAAAAXQAAAAACXQAAAAABegAAAAADegAAAAABegAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAADfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAcAAAAAABcAAAAAADcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACaAAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAADXQAAAAABTgAAAAABTgAAAAACaAAAAAACTgAAAAADTgAAAAADaAAAAAAAaAAAAAACTgAAAAACaAAAAAADTgAAAAACTgAAAAAATgAAAAADaAAAAAADTgAAAAAAaAAAAAADaAAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADaAAAAAAAXQAAAAACXQAAAAAAXQAAAAACaAAAAAACXQAAAAADXQAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAA
           version: 6
         2,-1:
           ind: 2,-1
-          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAADaAAAAAAAXQAAAAADfgAAAAAAgQAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAADaAAAAAAAXQAAAAADfgAAAAAAgQAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAACfgAAAAAAfgAAAAAAbgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAABaAAAAAABaAAAAAACfgAAAAAAbgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACaAAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbgAAAAABgQAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbgAAAAABgQAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADfgAAAAAAdQAAAAADdQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbgAAAAACfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAdQAAAAABdQAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACbgAAAAABbgAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAABaAAAAAABXQAAAAABfgAAAAAAdQAAAAABdQAAAAAAcAAAAAABJAAAAAACJAAAAAADJAAAAAACfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADJAAAAAACfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAACfgAAAAAAdQAAAAAAdQAAAAABfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAaAAAAAACaAAAAAAAaAAAAAADaAAAAAACfgAAAAAAXQAAAAADaAAAAAADXQAAAAACfgAAAAAAdQAAAAACdQAAAAACcAAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACaAAAAAADXQAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAABfgAAAAAAgQAAAAAAbgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAADfgAAAAAAfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAABaAAAAAAAaAAAAAACfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbgAAAAAAgQAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbgAAAAABgQAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAdQAAAAACdQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbgAAAAACfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADfgAAAAAAdQAAAAACdQAAAAACcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABbgAAAAABbgAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAADfgAAAAAAXQAAAAACaAAAAAACXQAAAAAAfgAAAAAAdQAAAAADdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAdQAAAAABdQAAAAADcAAAAAADJAAAAAADJAAAAAABJAAAAAABfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAABTgAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAABfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAAAfgAAAAAAdQAAAAAAdQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACfgAAAAAAaAAAAAAAaAAAAAADaAAAAAACaAAAAAADfgAAAAAAXQAAAAABaAAAAAADXQAAAAAAfgAAAAAAdQAAAAABdQAAAAACcAAAAAAC
           version: 6
         -2,0:
           ind: -2,0
-          tiles: aAAAAAACaAAAAAACaAAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAABaAAAAAADegAAAAAAegAAAAADegAAAAAAegAAAAACegAAAAACaAAAAAADaAAAAAABXwAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAaAAAAAACegAAAAABegAAAAACegAAAAADegAAAAACegAAAAAAaAAAAAACaAAAAAAAXwAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAaAAAAAACegAAAAACegAAAAADegAAAAACegAAAAABegAAAAACaAAAAAABaAAAAAADaAAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAABaAAAAAADegAAAAABegAAAAAAegAAAAACegAAAAAAegAAAAACewAAAAADewAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADMwAAAAAAegAAAAADegAAAAABegAAAAADegAAAAAAXQAAAAAAXQAAAAABXQAAAAAAHwAAAAACewAAAAADMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAAAXQAAAAAAXQAAAAABMwAAAAAAegAAAAACHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAJAAAAAACHwAAAAAAHwAAAAAAewAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAABXQAAAAABXQAAAAACMwAAAAAAegAAAAABJAAAAAAAJAAAAAACJAAAAAABfgAAAAAAJAAAAAABHwAAAAAAHwAAAAACewAAAAACMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAADXQAAAAACXQAAAAAAMwAAAAAAegAAAAACJAAAAAABJAAAAAADJAAAAAACfgAAAAAAJAAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACaAAAAAADaAAAAAABaAAAAAAAaAAAAAACaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABaAAAAAABaAAAAAACaAAAAAADaAAAAAACaAAAAAABaAAAAAABaAAAAAABaAAAAAACfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAAAegAAAAABXQAAAAADXQAAAAADaAAAAAABXQAAAAACeQAAAAABeQAAAAACeQAAAAADeQAAAAABeQAAAAAAeQAAAAACLgAAAAAALgAAAAAAegAAAAADegAAAAABegAAAAABJAAAAAABfgAAAAAAXQAAAAAAaAAAAAADXQAAAAADfgAAAAAAJAAAAAAAeQAAAAAAeQAAAAACeQAAAAACeQAAAAABfgAAAAAALgAAAAAAegAAAAADegAAAAAAegAAAAABegAAAAAAXQAAAAADXQAAAAABaAAAAAADXQAAAAAAXQAAAAACYAAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAfgAAAAAALgAAAAAAaAAAAAACaAAAAAACaAAAAAABaAAAAAABXQAAAAAAXQAAAAADaAAAAAACXQAAAAABXQAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAABYAAAAAACfgAAAAAAfgAAAAAA
+          tiles: aAAAAAACaAAAAAACaAAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAaAAAAAABegAAAAACegAAAAABegAAAAACegAAAAAAegAAAAADaAAAAAADaAAAAAACXwAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAABaAAAAAACegAAAAACegAAAAABegAAAAABegAAAAABegAAAAABaAAAAAAAaAAAAAADXwAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADaAAAAAAAegAAAAABegAAAAABegAAAAABegAAAAABegAAAAABaAAAAAACaAAAAAAAaAAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAADaAAAAAABegAAAAACegAAAAAAegAAAAACegAAAAABegAAAAADewAAAAAAewAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAADMwAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAAAXQAAAAABXQAAAAAAXQAAAAABHwAAAAAAewAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAACXQAAAAAAXQAAAAAAMwAAAAAAegAAAAABHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAJAAAAAADHwAAAAABHwAAAAADewAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAABXQAAAAACXQAAAAABMwAAAAAAegAAAAAAJAAAAAACJAAAAAACJAAAAAABfgAAAAAAJAAAAAADHwAAAAAAHwAAAAACewAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAADXQAAAAADXQAAAAAAMwAAAAAAegAAAAACJAAAAAABJAAAAAABJAAAAAACfgAAAAAAJAAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAADaAAAAAABaAAAAAADaAAAAAACaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADaAAAAAACaAAAAAADaAAAAAAAaAAAAAAAaAAAAAACaAAAAAACaAAAAAAAaAAAAAACfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAABegAAAAAAegAAAAABXQAAAAABXQAAAAABaAAAAAAAXQAAAAADeQAAAAACeQAAAAAAeQAAAAAAeQAAAAADeQAAAAAAeQAAAAADLgAAAAAALgAAAAAAegAAAAADegAAAAABegAAAAAAJAAAAAACfgAAAAAAXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAJAAAAAABeQAAAAACeQAAAAACeQAAAAABeQAAAAACfgAAAAAALgAAAAAAegAAAAACegAAAAAAegAAAAADegAAAAADXQAAAAADXQAAAAABaAAAAAADXQAAAAADXQAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAfgAAAAAALgAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAABXQAAAAABXQAAAAADaAAAAAADXQAAAAADXQAAAAACYAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAAAfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAABfgAAAAAAfgAAAAAA
           version: 6
         1,-3:
           ind: 1,-3
-          tiles: bQAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAbQAAAAAAbQAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACbQAAAAAAbQAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABJAAAAAACJAAAAAACJAAAAAABJAAAAAACfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAJAAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAACJAAAAAAAJAAAAAACJAAAAAACJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACJAAAAAADJAAAAAABJAAAAAAAJAAAAAACfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAJAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABXQAAAAABXQAAAAABaAAAAAACXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAHwAAAAADaAAAAAADaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABHwAAAAAAfgAAAAAAHwAAAAACTgAAAAADaAAAAAADaAAAAAABaAAAAAADaAAAAAABXQAAAAABfgAAAAAAHwAAAAACaAAAAAADaAAAAAACaAAAAAACaAAAAAADaAAAAAAAHwAAAAADfgAAAAAAHwAAAAAA
+          tiles: bQAAAAAAfgAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADbQAAAAAAbQAAAAAAJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAABHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAbQAAAAAAbQAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAJAAAAAACJAAAAAADJAAAAAADJAAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAJAAAAAACfgAAAAAAgQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABHwAAAAAAHwAAAAABHwAAAAABHwAAAAABJAAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACJAAAAAABJAAAAAACJAAAAAADJAAAAAADfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAJAAAAAABfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAXQAAAAACXQAAAAABaAAAAAADXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAHwAAAAABaAAAAAABaAAAAAAAaAAAAAABaAAAAAACaAAAAAACHwAAAAACfgAAAAAAHwAAAAACTgAAAAADaAAAAAAAaAAAAAADaAAAAAABaAAAAAACXQAAAAABfgAAAAAAHwAAAAACaAAAAAADaAAAAAAAaAAAAAABaAAAAAAAaAAAAAACHwAAAAACfgAAAAAAHwAAAAAC
           version: 6
         0,-3:
           ind: 0,-3
-          tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbgAAAAABbgAAAAADfgAAAAAAbAAAAAAAbAAAAAAAgQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACXQAAAAADJAAAAAAAJAAAAAAAJAAAAAADfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAACaAAAAAABaAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACXQAAAAADaAAAAAAAaAAAAAABJAAAAAAAfgAAAAAAXQAAAAACXQAAAAABHwAAAAADHwAAAAABHwAAAAABJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABJAAAAAACJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADJAAAAAACfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAbgAAAAACbgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAgQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABaAAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAADaAAAAAADaAAAAAADaAAAAAABaAAAAAAATgAAAAABaAAAAAACTgAAAAADaAAAAAAB
+          tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbgAAAAACbgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAgQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADJAAAAAACJAAAAAADJAAAAAACfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAABaAAAAAAAaAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADaAAAAAACaAAAAAACJAAAAAADfgAAAAAAXQAAAAAAXQAAAAACHwAAAAADHwAAAAAAHwAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADJAAAAAACfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAbgAAAAAAbgAAAAABbgAAAAACfgAAAAAAfgAAAAAAgQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABaAAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAADaAAAAAADaAAAAAADaAAAAAADaAAAAAABTgAAAAABaAAAAAAATgAAAAACaAAAAAAB
           version: 6
         1,1:
           ind: 1,1
-          tiles: bAAAAAAAbAAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAABJAAAAAACXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAABaAAAAAADXQAAAAADXQAAAAACaAAAAAAAXQAAAAABfgAAAAAAXQAAAAADaAAAAAACaAAAAAABaAAAAAAAXQAAAAAAaAAAAAADaAAAAAADaAAAAAADXQAAAAADaAAAAAADaAAAAAACaAAAAAADaAAAAAACaAAAAAAAXQAAAAABfgAAAAAAXQAAAAABaAAAAAABaAAAAAAAaAAAAAABXQAAAAAAaAAAAAACaAAAAAAAaAAAAAADXQAAAAADXQAAAAABaAAAAAABXQAAAAADXQAAAAACXQAAAAABJAAAAAADfgAAAAAAXQAAAAADaAAAAAAAaAAAAAADaAAAAAAAXQAAAAABaAAAAAADaAAAAAACaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAABdQAAAAABdAAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: bAAAAAAAbAAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAACJAAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAXQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAXQAAAAACaAAAAAAAaAAAAAADaAAAAAACXQAAAAABaAAAAAABaAAAAAAAaAAAAAACaAAAAAAAaAAAAAACXQAAAAAAfgAAAAAAXQAAAAADaAAAAAADaAAAAAACaAAAAAACXQAAAAADaAAAAAACaAAAAAADaAAAAAACXQAAAAABXQAAAAADaAAAAAABXQAAAAACXQAAAAACXQAAAAAAJAAAAAACfgAAAAAAXQAAAAADaAAAAAAAaAAAAAADaAAAAAAAXQAAAAAAaAAAAAABaAAAAAACaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACdQAAAAADdAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,1:
           ind: 0,1
-          tiles: fgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbgAAAAACbgAAAAAAbAAAAAAAbAAAAAAAbgAAAAADbgAAAAADfgAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACaAAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAACaAAAAAADaAAAAAADaAAAAAADaAAAAAACaAAAAAADaAAAAAACaAAAAAACaAAAAAAAaAAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAAAaAAAAAADaAAAAAACaAAAAAAAXQAAAAABXQAAAAADXQAAAAABaAAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAADcAAAAAADdQAAAAABdAAAAAACdAAAAAADdAAAAAACXQAAAAACXQAAAAABXQAAAAABHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAcAAAAAADcAAAAAAAdQAAAAABdAAAAAADdAAAAAACdAAAAAACfgAAAAAAXQAAAAABXQAAAAACHwAAAAADHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAbgAAAAACbgAAAAADfgAAAAAAdQAAAAADdQAAAAACdQAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAADfgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAACTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAcAAAAAADcAAAAAAAaAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAADTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbgAAAAABbgAAAAACbAAAAAAAbAAAAAAAbgAAAAACbgAAAAACfgAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAaAAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAADaAAAAAAAaAAAAAABaAAAAAACaAAAAAACaAAAAAACaAAAAAADaAAAAAACaAAAAAABaAAAAAABaAAAAAAAaAAAAAACaAAAAAADXQAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAcAAAAAADcAAAAAADdQAAAAAAdAAAAAAAdAAAAAAAdAAAAAADXQAAAAACXQAAAAABXQAAAAADHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAABcAAAAAACdQAAAAABdAAAAAACdAAAAAAAdAAAAAACfgAAAAAAXQAAAAADXQAAAAAAHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAAAdAAAAAABdAAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAbgAAAAADbgAAAAACfgAAAAAAdQAAAAABdQAAAAACdQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAcAAAAAACcAAAAAAAaAAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAADHwAAAAACTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA
           version: 6
         -1,1:
           ind: -1,1
-          tiles: bAAAAAAAfgAAAAAAgQAAAAAAbQAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAbgAAAAAAbAAAAAAAbAAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADaAAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABaAAAAAACaAAAAAABaAAAAAADaAAAAAADaAAAAAAAaAAAAAABaAAAAAABaAAAAAAAaAAAAAAAaAAAAAACTgAAAAAATgAAAAAAaAAAAAAATgAAAAAATgAAAAAAaAAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAACXQAAAAAAaAAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABHwAAAAABHwAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAXQAAAAAAHwAAAAAAHwAAAAACXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAJAAAAAACJAAAAAACXQAAAAABHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAHwAAAAAATgAAAAAATgAAAAAAHwAAAAACTgAAAAABTgAAAAACTgAAAAADHwAAAAAATgAAAAADTgAAAAADHwAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAACJAAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAADHwAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAAAHwAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAJAAAAAAAJAAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAAA
+          tiles: bAAAAAAAfgAAAAAAgQAAAAAAbQAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAbgAAAAACbAAAAAAAbAAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABaAAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAADaAAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAADaAAAAAABaAAAAAACaAAAAAABaAAAAAADaAAAAAABTgAAAAADTgAAAAABaAAAAAACTgAAAAACTgAAAAABaAAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABaAAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAABHwAAAAACHwAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAXQAAAAAAHwAAAAABHwAAAAACXQAAAAACfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAACJAAAAAADJAAAAAACXQAAAAABHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAABTgAAAAADTgAAAAAAHwAAAAACTgAAAAABTgAAAAADTgAAAAADHwAAAAAATgAAAAACTgAAAAABHwAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABJAAAAAACHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAADHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAHwAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAABJAAAAAACJAAAAAABfgAAAAAAXQAAAAABXQAAAAACXQAAAAAC
           version: 6
         -2,1:
           ind: -2,1
-          tiles: PAAAAAAAPAAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABPAAAAAAAPAAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAADaAAAAAACXQAAAAABKAAAAAADKAAAAAADKAAAAAADKAAAAAABKAAAAAAAKAAAAAADfgAAAAAAbgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAABXwAAAAABXwAAAAABXwAAAAAAXwAAAAADXwAAAAABXwAAAAABfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAXQAAAAADXQAAAAADaAAAAAABaAAAAAACaAAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAAAaAAAAAACaAAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACaAAAAAAAXwAAAAACXwAAAAABXwAAAAABXwAAAAAAXwAAAAADXwAAAAADaAAAAAACaAAAAAABfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAJAAAAAADKAAAAAADKAAAAAAAKAAAAAABKAAAAAADKAAAAAADKAAAAAAAXQAAAAAAaAAAAAABgQAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbgAAAAABbAAAAAAAbAAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADbgAAAAADbgAAAAACfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAADfgAAAAAAegAAAAABegAAAAAAegAAAAABfgAAAAAAgQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAADegAAAAACegAAAAAAegAAAAABegAAAAACbgAAAAADfgAAAAAAJAAAAAADJAAAAAADJAAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABfgAAAAAAegAAAAABegAAAAACegAAAAADfgAAAAAAbgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAgQAAAAAAfgAAAAAAJAAAAAABJAAAAAADJAAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAbgAAAAAAbgAAAAABfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAbQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABfgAAAAAAJAAAAAACXQAAAAABXQAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAA
+          tiles: PAAAAAAAPAAAAAAAXQAAAAAAXQAAAAABfgAAAAAAXQAAAAACaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACPAAAAAAAPAAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABKAAAAAADKAAAAAACKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAABXwAAAAADXwAAAAAAXwAAAAACXwAAAAADXwAAAAADXwAAAAABfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAaAAAAAABaAAAAAACaAAAAAADaAAAAAABaAAAAAACaAAAAAAAaAAAAAACaAAAAAABaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAABXwAAAAADXwAAAAACXwAAAAAAXwAAAAADXwAAAAAAXwAAAAACaAAAAAACaAAAAAACfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABJAAAAAABKAAAAAACKAAAAAADKAAAAAACKAAAAAACKAAAAAABKAAAAAACXQAAAAACaAAAAAADgQAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbgAAAAADbAAAAAAAbAAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADbgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABfgAAAAAAegAAAAADegAAAAABegAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAABegAAAAADegAAAAABegAAAAAAbgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACJAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAegAAAAADegAAAAABegAAAAADfgAAAAAAbgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAgQAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAbgAAAAABbgAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAbQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABfgAAAAAAJAAAAAABXQAAAAADXQAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAC
           version: 6
         -1,-3:
           ind: -1,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAABYQAAAAADXgAAAAABXQAAAAACXQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAXgAAAAABYQAAAAACXQAAAAABXgAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAACfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADgQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAABbQAAAAAAbQAAAAAAbgAAAAACbgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAbgAAAAACbgAAAAACfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAAAYQAAAAABXgAAAAABXQAAAAABXQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAXgAAAAABYQAAAAABXQAAAAADXgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACgQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAABbQAAAAAAbQAAAAAAbgAAAAABbgAAAAABgQAAAAAAfgAAAAAAfgAAAAAAbgAAAAABbgAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAC
           version: 6
         2,-3:
           ind: 2,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAJAAAAAABJAAAAAABJAAAAAAAJAAAAAADJAAAAAADJAAAAAADJAAAAAADJAAAAAABJAAAAAAAJAAAAAAAJAAAAAADJAAAAAACJAAAAAACJAAAAAABJAAAAAAAJAAAAAABJAAAAAAAJAAAAAACJAAAAAADJAAAAAAAJAAAAAACJAAAAAADJAAAAAACJAAAAAADJAAAAAACJAAAAAAAJAAAAAAAJAAAAAADJAAAAAABJAAAAAAAJAAAAAABJAAAAAADJAAAAAACJgAAAAACJgAAAAACJgAAAAACJgAAAAABJgAAAAABJgAAAAABJgAAAAABJgAAAAABJgAAAAABJgAAAAACJgAAAAACJgAAAAAAJAAAAAACJAAAAAACJAAAAAADJgAAAAADJgAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAACHwAAAAAAHwAAAAABHwAAAAABHwAAAAACJgAAAAAAJgAAAAAAJAAAAAABJAAAAAABJAAAAAACJgAAAAAAJgAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAACHwAAAAAAHwAAAAACJgAAAAACJgAAAAABJAAAAAADHwAAAAAAHwAAAAADJAAAAAABJAAAAAAAHwAAAAAAHwAAAAACJAAAAAAAJAAAAAACJAAAAAACJAAAAAABJAAAAAADHwAAAAAAHwAAAAAAJAAAAAADJAAAAAABHwAAAAAAHwAAAAABHwAAAAACJgAAAAABJAAAAAAAJAAAAAACJAAAAAACJAAAAAAAJAAAAAADJAAAAAAAJAAAAAABJAAAAAAAJAAAAAAAJAAAAAABJAAAAAAAJgAAAAADHwAAAAAD
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAACJAAAAAADJAAAAAABJAAAAAAAJAAAAAABJAAAAAACJAAAAAADJAAAAAABJAAAAAAAJAAAAAAAJAAAAAACJAAAAAAAJAAAAAACJAAAAAABJAAAAAADJAAAAAABJAAAAAABJAAAAAADJAAAAAAAJAAAAAABJAAAAAADJAAAAAAAJAAAAAAAJAAAAAADJAAAAAADJAAAAAAAJAAAAAACJAAAAAADJAAAAAAAJAAAAAACJgAAAAADJgAAAAACJgAAAAABJgAAAAABJgAAAAAAJgAAAAAAJgAAAAACJgAAAAACJgAAAAACJgAAAAACJgAAAAACJgAAAAACJAAAAAACJAAAAAABJAAAAAABJgAAAAAAJgAAAAABHwAAAAACHwAAAAABHwAAAAADHwAAAAABHwAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAABJgAAAAABJgAAAAADJAAAAAABJAAAAAADJAAAAAABJgAAAAADJgAAAAADHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAADJgAAAAACJgAAAAACJAAAAAABHwAAAAAAHwAAAAACJAAAAAABJAAAAAADHwAAAAAAHwAAAAABJAAAAAAAJAAAAAACJAAAAAACJAAAAAADJAAAAAAAHwAAAAADHwAAAAAAJAAAAAABJAAAAAABHwAAAAACHwAAAAABHwAAAAAAJgAAAAADJAAAAAAAJAAAAAACJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAADJAAAAAACJgAAAAADHwAAAAAB
           version: 6
         3,-2:
           ind: 3,-2
-          tiles: HwAAAAAAHwAAAAABfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADHwAAAAAAHwAAAAABfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADHwAAAAACHwAAAAACfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAABwAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAbQAAAAAAbQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAABwAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAABXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAACaAAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAaAAAAAAAXQAAAAACaAAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAADJAAAAAADfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAaAAAAAABMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAaAAAAAACXQAAAAABXQAAAAAAJAAAAAAAfgAAAAAAXQAAAAACTgAAAAAATgAAAAAAaAAAAAABTgAAAAACTgAAAAADaAAAAAADaAAAAAADaAAAAAABaAAAAAACaAAAAAADaAAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAABbQAAAAAAbQAAAAAAbQAAAAAAgQAAAAAAbgAAAAACbgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAAC
+          tiles: HwAAAAACHwAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADHwAAAAABHwAAAAADfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAHwAAAAADHwAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAABwAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAbQAAAAAAbQAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAABwAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAACHwAAAAAAHwAAAAADfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAaAAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAaAAAAAADXQAAAAAAaAAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAJAAAAAABfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABaAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAaAAAAAAAXQAAAAACXQAAAAACJAAAAAADfgAAAAAAXQAAAAAATgAAAAAATgAAAAACaAAAAAAATgAAAAAATgAAAAABaAAAAAABaAAAAAABaAAAAAAAaAAAAAABaAAAAAACaAAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACbQAAAAAAbQAAAAAAbQAAAAAAgQAAAAAAbgAAAAADbgAAAAACbgAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAB
           version: 6
         3,-3:
           ind: 3,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAACwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAKBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAABwAAAAAABwAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAACJAAAAAABfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAAAJAAAAAADHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAABOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAJAAAAAACJAAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAHwAAAAABHwAAAAACOAAAAAAAHwAAAAACOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAHCwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAAJAAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAAABwAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAABBwAAAAABJAAAAAACJAAAAAABfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAACJAAAAAAAHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAHwAAAAABHwAAAAADOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAJAAAAAACJAAAAAADfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAHwAAAAACHwAAAAADOAAAAAAAHwAAAAACOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAACHwAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAACHwAAAAADfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAA
           version: 6
         -2,-3:
           ind: -2,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAADfAAAAAACfgAAAAAAfAAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAgQAAAAAAfgAAAAAAFQAAAAAEfAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAFQAAAAAEgQAAAAAAfAAAAAABfAAAAAACfgAAAAAAbgAAAAACbgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAegAAAAAAJAAAAAAAfgAAAAAAegAAAAADfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADXQAAAAADKAAAAAADKAAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAACfgAAAAAAbgAAAAAAXQAAAAACKAAAAAADfgAAAAAAegAAAAABegAAAAAAegAAAAACegAAAAAAegAAAAABegAAAAADegAAAAAAegAAAAACegAAAAACegAAAAABegAAAAABfgAAAAAAbgAAAAABewAAAAACewAAAAADfgAAAAAAegAAAAADegAAAAABegAAAAACKAAAAAADKAAAAAADKAAAAAADKAAAAAACKAAAAAADKAAAAAADKAAAAAAAKAAAAAADfgAAAAAAbQAAAAAAewAAAAADewAAAAADfgAAAAAAegAAAAAAegAAAAAAegAAAAADKAAAAAABKAAAAAAAKAAAAAADKAAAAAAAKAAAAAACKAAAAAADKAAAAAAAKAAAAAAAfgAAAAAAbQAAAAAAewAAAAADewAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACKAAAAAAAKAAAAAADKAAAAAADKAAAAAACKAAAAAAAKAAAAAADKAAAAAACfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAABegAAAAADegAAAAACegAAAAABegAAAAABJAAAAAACfgAAAAAAbQAAAAAAKAAAAAAAKAAAAAACKAAAAAACKAAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABKAAAAAAAKAAAAAADXQAAAAADfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAACfAAAAAADfgAAAAAAfAAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAgQAAAAAAfgAAAAAAFQAAAAADfAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAFQAAAAAAgQAAAAAAfAAAAAAAfAAAAAABfgAAAAAAbgAAAAADbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAegAAAAABJAAAAAADfgAAAAAAegAAAAADfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACXQAAAAAAKAAAAAABKAAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAABfgAAAAAAbgAAAAADXQAAAAADKAAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAABegAAAAACegAAAAADfgAAAAAAbgAAAAACewAAAAAAewAAAAABfgAAAAAAegAAAAAAegAAAAABegAAAAAAKAAAAAAAKAAAAAABKAAAAAABKAAAAAACKAAAAAADKAAAAAABKAAAAAABKAAAAAADfgAAAAAAbQAAAAAAewAAAAABewAAAAACfgAAAAAAegAAAAADegAAAAADegAAAAADKAAAAAADKAAAAAABKAAAAAABKAAAAAAAKAAAAAABKAAAAAACKAAAAAAAKAAAAAADfgAAAAAAbQAAAAAAewAAAAADewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACKAAAAAACKAAAAAAAKAAAAAAAKAAAAAABKAAAAAAAKAAAAAAAKAAAAAABfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAADegAAAAACegAAAAABegAAAAABJAAAAAAAfgAAAAAAbQAAAAAAKAAAAAAAKAAAAAACKAAAAAAAKAAAAAABXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAKAAAAAADKAAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAC
           version: 6
         -3,-1:
           ind: -3,-1
-          tiles: HwAAAAAAfgAAAAAAewAAAAADewAAAAAAewAAAAABfgAAAAAAbAAAAAAAbgAAAAACfgAAAAAAegAAAAADegAAAAABegAAAAABegAAAAAAegAAAAADegAAAAAAegAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAbAAAAAAAbgAAAAABfgAAAAAAegAAAAAATgAAAAABTgAAAAADKAAAAAABTgAAAAABTgAAAAADKAAAAAABHwAAAAADfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACfgAAAAAAegAAAAAATgAAAAABTgAAAAACKAAAAAACTgAAAAADTgAAAAACKAAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAACegAAAAACegAAAAABegAAAAABegAAAAADfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAKAAAAAADKAAAAAACbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAZQAAAAABZQAAAAADfgAAAAAAewAAAAABewAAAAADewAAAAAAfgAAAAAAaAAAAAABKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAZQAAAAAAZQAAAAACfgAAAAAAKAAAAAABKAAAAAABKAAAAAABfgAAAAAAaAAAAAABKAAAAAABMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAZQAAAAADZQAAAAAAfgAAAAAAKAAAAAAAKAAAAAABKAAAAAAAfgAAAAAAXQAAAAABXQAAAAABMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABbgAAAAABbgAAAAADbAAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAXwAAAAAAXwAAAAABXwAAAAABXwAAAAABXwAAAAABJAAAAAABXwAAAAADXwAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXwAAAAABHwAAAAAAHwAAAAAAHwAAAAABHwAAAAABXwAAAAABHwAAAAABHwAAAAACJAAAAAAAJAAAAAABJAAAAAADJAAAAAABJAAAAAABXQAAAAADXQAAAAAAfgAAAAAAXwAAAAADHwAAAAACHwAAAAABHwAAAAABHwAAAAABXwAAAAADHwAAAAABHwAAAAADMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXwAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAABXwAAAAAAHwAAAAACHwAAAAADJAAAAAAAJAAAAAAAJAAAAAACJAAAAAABJAAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAAC
+          tiles: HwAAAAABfgAAAAAAewAAAAABewAAAAACewAAAAADfgAAAAAAbAAAAAAAbgAAAAACfgAAAAAAegAAAAACegAAAAADegAAAAADegAAAAABegAAAAADegAAAAAAegAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAbAAAAAAAbgAAAAAAfgAAAAAAegAAAAAATgAAAAAATgAAAAADKAAAAAABTgAAAAAATgAAAAACKAAAAAADHwAAAAACfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAegAAAAAATgAAAAACTgAAAAABKAAAAAADTgAAAAABTgAAAAACKAAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAADegAAAAAAegAAAAACegAAAAACegAAAAABfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAKAAAAAABKAAAAAADbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAZQAAAAADZQAAAAACfgAAAAAAewAAAAADewAAAAAAewAAAAAAfgAAAAAAaAAAAAADKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAZQAAAAABZQAAAAAAfgAAAAAAKAAAAAADKAAAAAADKAAAAAABfgAAAAAAaAAAAAAAKAAAAAABMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAZQAAAAACZQAAAAAAfgAAAAAAKAAAAAAAKAAAAAABKAAAAAABfgAAAAAAXQAAAAADXQAAAAADMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADbgAAAAACbgAAAAACbAAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXwAAAAAAXwAAAAADXwAAAAAAXwAAAAADXwAAAAACJAAAAAAAXwAAAAABXwAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXwAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAABXwAAAAAAHwAAAAADHwAAAAABJAAAAAACJAAAAAACJAAAAAABJAAAAAABJAAAAAADXQAAAAADXQAAAAABfgAAAAAAXwAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAACXwAAAAABHwAAAAAAHwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAADXQAAAAACfgAAAAAAXwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAADXwAAAAABHwAAAAAAHwAAAAAAJAAAAAADJAAAAAACJAAAAAADJAAAAAABJAAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAC
           version: 6
         -3,0:
           ind: -3,0
-          tiles: ZQAAAAACZQAAAAABZQAAAAACZQAAAAAAZQAAAAABXQAAAAADaAAAAAACaAAAAAADXQAAAAAAXQAAAAABaAAAAAACaAAAAAAAaAAAAAADaAAAAAACaAAAAAABXQAAAAADTgAAAAADTgAAAAABaAAAAAAATgAAAAADTgAAAAACaAAAAAACaAAAAAAAaAAAAAACXQAAAAACXQAAAAABXwAAAAAAaAAAAAABaAAAAAABaAAAAAADXwAAAAACaAAAAAAAZQAAAAACZQAAAAACZQAAAAADZQAAAAABZQAAAAAAXQAAAAACaAAAAAAAaAAAAAADXQAAAAADXQAAAAAAXwAAAAABaAAAAAAAaAAAAAAAaAAAAAACXwAAAAACaAAAAAABJAAAAAABJAAAAAABJAAAAAAAJAAAAAAAJAAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAABaAAAAAABaAAAAAAAaAAAAAABaAAAAAAAaAAAAAABaAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABewAAAAABewAAAAADewAAAAADewAAAAACewAAAAACJAAAAAADJAAAAAACJAAAAAADJAAAAAACJAAAAAAAXQAAAAAAXQAAAAACfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAewAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAewAAAAABHwAAAAACHwAAAAAAHwAAAAABHwAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAACfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAewAAAAADHwAAAAABHwAAAAACHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACgQAAAAAAbgAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAAgAAAAAAJAAAAAAAJAAAAAABJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAADbQAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAaAAAAAACAgAAAAAAJAAAAAAAJAAAAAABHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAaAAAAAACAgAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAABHwAAAAABfgAAAAAAgQAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACggAAAAACfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAXQAAAAAB
+          tiles: ZQAAAAAAZQAAAAACZQAAAAADZQAAAAAAZQAAAAAAXQAAAAADaAAAAAABaAAAAAADXQAAAAAAXQAAAAADaAAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAAAXQAAAAADTgAAAAAATgAAAAABaAAAAAAATgAAAAAATgAAAAACaAAAAAACaAAAAAAAaAAAAAACXQAAAAACXQAAAAAAXwAAAAACaAAAAAACaAAAAAADaAAAAAAAXwAAAAAAaAAAAAAAZQAAAAACZQAAAAACZQAAAAAAZQAAAAAAZQAAAAADXQAAAAADaAAAAAABaAAAAAABXQAAAAACXQAAAAACXwAAAAAAaAAAAAACaAAAAAACaAAAAAADXwAAAAABaAAAAAACJAAAAAACJAAAAAABJAAAAAADJAAAAAACJAAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAACaAAAAAACaAAAAAACaAAAAAADaAAAAAACaAAAAAAAaAAAAAABMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAABewAAAAADewAAAAACewAAAAAAewAAAAACewAAAAADJAAAAAADJAAAAAABJAAAAAADJAAAAAACJAAAAAAAXQAAAAADXQAAAAABfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAewAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAACfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAewAAAAADHwAAAAADHwAAAAABHwAAAAACHwAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAewAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADgQAAAAAAbgAAAAADbAAAAAAAbQAAAAAAfgAAAAAAAgAAAAAAJAAAAAABJAAAAAABJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAAAbQAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAaAAAAAABAgAAAAAAJAAAAAABJAAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAbQAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAaAAAAAABAgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAgQAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAaAAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABggAAAAAAfgAAAAAAbgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAXQAAAAAC
           version: 6
         -3,1:
           ind: -3,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADgQAAAAAAfgAAAAAAbgAAAAADgQAAAAAAgQAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbgAAAAACbgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAAAegAAAAADegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAACegAAAAAAegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAAARQAAAAAAIwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAABegAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAAAgQAAAAAAegAAAAAAegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAAAFQAAAAAFegAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAggAAAAACegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAACgQAAAAAAFQAAAAADfgAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAFQAAAAAFfgAAAAAAgQAAAAAAegAAAAAAegAAAAACegAAAAADegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAACFQAAAAADegAAAAACegAAAAADfgAAAAAAegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABgQAAAAAAfgAAAAAAbgAAAAACgQAAAAAAgQAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbgAAAAADbgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAADegAAAAABegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAACegAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAAARQAAAAAAIwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAACegAAAAAAegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAAGgQAAAAAAegAAAAACegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAABFQAAAAADegAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAABgQAAAAAAgQAAAAAAgQAAAAAAggAAAAABegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAACgQAAAAAAFQAAAAAAfgAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAFQAAAAADfgAAAAAAgQAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAACFQAAAAACegAAAAADegAAAAABfgAAAAAAegAAAAACegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -3,-2:
           ind: -3,-2
-          tiles: aAAAAAABaAAAAAAAaAAAAAABaAAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAACegAAAAAAegAAAAABXQAAAAADEgAAAAABEgAAAAACEgAAAAABEgAAAAAAEgAAAAACfgAAAAAAfgAAAAAAJAAAAAABaAAAAAACXQAAAAAAXQAAAAABfgAAAAAAXQAAAAAAegAAAAADegAAAAABXQAAAAADEgAAAAADEgAAAAABEgAAAAADEgAAAAACEgAAAAAAMwAAAAAAMwAAAAAAJAAAAAAAaAAAAAAAXQAAAAAAXQAAAAABfgAAAAAAXQAAAAADegAAAAAAegAAAAABXQAAAAADEgAAAAAAEgAAAAAAEgAAAAACEgAAAAADEgAAAAADMwAAAAAAMwAAAAAAJAAAAAADaAAAAAAAaAAAAAAAXQAAAAADaAAAAAABXQAAAAADegAAAAADegAAAAABXQAAAAACEgAAAAACEgAAAAADEgAAAAACEgAAAAAAEgAAAAACMwAAAAAAMwAAAAAAJAAAAAABaAAAAAADaAAAAAADXQAAAAADaAAAAAACXQAAAAABegAAAAACegAAAAADXQAAAAACEgAAAAACEgAAAAACEgAAAAACEgAAAAABEgAAAAADMwAAAAAAMwAAAAAAJAAAAAABaAAAAAACXQAAAAADXQAAAAAAfgAAAAAAXQAAAAABegAAAAAAegAAAAADXQAAAAABEgAAAAAAEgAAAAADEgAAAAACEgAAAAAAEgAAAAADfgAAAAAAfgAAAAAAJAAAAAADaAAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAAAKAAAAAABKAAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAADaAAAAAABaAAAAAABaAAAAAADaAAAAAACXQAAAAABXQAAAAADfgAAAAAAXQAAAAACKAAAAAACKAAAAAACKAAAAAACKAAAAAAAKAAAAAADKAAAAAABKAAAAAADKAAAAAADaAAAAAAAaAAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAbgAAAAAAbgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAbQAAAAAAbgAAAAADaAAAAAABaAAAAAADXQAAAAABXQAAAAACXQAAAAACfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAABKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAACfgAAAAAAewAAAAACewAAAAADewAAAAACfgAAAAAAgQAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAACfgAAAAAAewAAAAADewAAAAACewAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAAB
+          tiles: aAAAAAABaAAAAAACaAAAAAACaAAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAABegAAAAAAegAAAAABXQAAAAADEgAAAAABEgAAAAACEgAAAAAAEgAAAAAAEgAAAAACfgAAAAAAfgAAAAAAJAAAAAAAaAAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAACegAAAAACegAAAAABXQAAAAABEgAAAAACEgAAAAACEgAAAAACEgAAAAABEgAAAAADMwAAAAAAMwAAAAAAJAAAAAABaAAAAAACXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADegAAAAACegAAAAACXQAAAAADEgAAAAAAEgAAAAADEgAAAAABEgAAAAABEgAAAAAAMwAAAAAAMwAAAAAAJAAAAAABaAAAAAACaAAAAAABXQAAAAAAaAAAAAAAXQAAAAADegAAAAACegAAAAACXQAAAAAAEgAAAAABEgAAAAADEgAAAAACEgAAAAACEgAAAAADMwAAAAAAMwAAAAAAJAAAAAACaAAAAAADaAAAAAAAXQAAAAACaAAAAAACXQAAAAADegAAAAADegAAAAACXQAAAAAAEgAAAAAAEgAAAAAAEgAAAAABEgAAAAAAEgAAAAADMwAAAAAAMwAAAAAAJAAAAAAAaAAAAAAAXQAAAAABXQAAAAADfgAAAAAAXQAAAAAAegAAAAADegAAAAADXQAAAAADEgAAAAABEgAAAAAAEgAAAAADEgAAAAACEgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACaAAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAKAAAAAADKAAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABaAAAAAAAaAAAAAACaAAAAAADaAAAAAACXQAAAAAAXQAAAAACfgAAAAAAXQAAAAAAKAAAAAABKAAAAAACKAAAAAABKAAAAAABKAAAAAACKAAAAAAAKAAAAAABKAAAAAABaAAAAAABaAAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAbgAAAAADbgAAAAAAbgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAbQAAAAAAbgAAAAADaAAAAAACaAAAAAADXQAAAAACXQAAAAADXQAAAAABfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAADKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAABfgAAAAAAewAAAAAAewAAAAACewAAAAADfgAAAAAAgQAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAACfgAAAAAAewAAAAADewAAAAACewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAAB
           version: 6
         -3,-3:
           ind: -3,-3
-          tiles: XQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAAAaAAAAAACXQAAAAADfgAAAAAABwAAAAAABwAAAAAABwAAAAAKAAAAAAAAfQAAAAAAAAAAAAAATgAAAAABTgAAAAACaAAAAAACTgAAAAAATgAAAAADaAAAAAABaAAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAJAAAAAACJAAAAAACHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAaAAAAAACXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAABwAAAAAKBwAAAAAABwAAAAAAfgAAAAAAbQAAAAAAbgAAAAABfgAAAAAAKAAAAAABXQAAAAACTgAAAAABXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAKAAAAAAAXQAAAAABaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAewAAAAACTgAAAAACXQAAAAACXQAAAAABfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABTgAAAAACXQAAAAADfgAAAAAAfgAAAAAAbgAAAAADbQAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAbgAAAAADbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAAAKAAAAAACKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAADKAAAAAADKAAAAAABaAAAAAADXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAACKAAAAAACKAAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAAB
+          tiles: XQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAACaAAAAAABXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAEAAAAAAAAfQAAAAAAAAAAAAAATgAAAAABTgAAAAACaAAAAAAATgAAAAACTgAAAAADaAAAAAACaAAAAAADaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACfgAAAAAAJAAAAAADJAAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAaAAAAAACXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAaAAAAAABXQAAAAAAfgAAAAAABwAAAAACBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAbQAAAAAAbgAAAAABfgAAAAAAKAAAAAAAXQAAAAADTgAAAAABXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAJBwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAKAAAAAADXQAAAAACaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAewAAAAADTgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABTgAAAAACXQAAAAADfgAAAAAAfgAAAAAAbgAAAAABbQAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAbgAAAAADbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABKAAAAAACKAAAAAABKAAAAAACKAAAAAAAKAAAAAACKAAAAAADKAAAAAACKAAAAAABaAAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAADKAAAAAAAKAAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAAD
           version: 6
         -4,0:
           ind: -4,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAACXQAAAAAAXQAAAAAAZQAAAAABZQAAAAACZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAABaAAAAAACTgAAAAABTgAAAAACaAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABXQAAAAADXQAAAAACZQAAAAADZQAAAAABZQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACJAAAAAADJAAAAAAAJAAAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAADXQAAAAACMwAAAAAAMwAAAAAAMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAXQAAAAADJAAAAAABJAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAJAAAAAADJAAAAAACJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAADJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAACXQAAAAADXQAAAAAAZQAAAAABZQAAAAACZQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAABaAAAAAADTgAAAAADTgAAAAAAaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABXQAAAAADXQAAAAABZQAAAAAAZQAAAAAAZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAADJAAAAAADJAAAAAACJAAAAAAAJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACXQAAAAACXQAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAADXQAAAAAAJAAAAAADJAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAJAAAAAADJAAAAAAAJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -4,-1:
           ind: -4,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAACHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAHwAAAAADHwAAAAADHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAACXQAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAACfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAABXQAAAAABfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAADfgAAAAAAXQAAAAADXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAABXQAAAAABJAAAAAACJAAAAAADJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADXQAAAAAAXQAAAAABMwAAAAAAMwAAAAAAMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAACJAAAAAAAJAAAAAABJAAAAAACJAAAAAAD
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAADfgAAAAAAHwAAAAADHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAAAfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAAAfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAAAXQAAAAABJAAAAAADJAAAAAAAJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAABXQAAAAACMwAAAAAAMwAAAAAAMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADJAAAAAABJAAAAAACJAAAAAABJAAAAAAB
           version: 6
         -4,-2:
           ind: -4,-2
-          tiles: fgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACbgAAAAABbgAAAAABfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABJAAAAAADfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAABfgAAAAAAXQAAAAADaAAAAAAAJAAAAAABMwAAAAAAgQAAAAAAfgAAAAAAJAAAAAABHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACfgAAAAAAXQAAAAAAaAAAAAADJAAAAAAAMwAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAADHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAACfgAAAAAAXQAAAAABaAAAAAABJAAAAAABMwAAAAAAgQAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAADHwAAAAACfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAXQAAAAABaAAAAAADJAAAAAABMwAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAADHwAAAAABfgAAAAAAaAAAAAABaAAAAAACaAAAAAADaAAAAAABaAAAAAAAXQAAAAAAaAAAAAAAJAAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAABaAAAAAABXQAAAAACaAAAAAACaAAAAAADaAAAAAACbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADaAAAAAADbgAAAAABbgAAAAACbgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAADaAAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAaAAAAAABaAAAAAADaAAAAAADaAAAAAADaAAAAAACfQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAB
+          tiles: fgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADbgAAAAACbgAAAAACfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAJAAAAAABfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAADfgAAAAAAXQAAAAADaAAAAAABJAAAAAAAMwAAAAAAgQAAAAAAfgAAAAAAJAAAAAADHwAAAAADHwAAAAACHwAAAAABfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAABfgAAAAAAXQAAAAABaAAAAAACJAAAAAAAMwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAACHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAXQAAAAACaAAAAAADJAAAAAAAMwAAAAAAgQAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAAAHwAAAAABfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAACaAAAAAABJAAAAAADMwAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAABHwAAAAABfgAAAAAAaAAAAAADaAAAAAABaAAAAAADaAAAAAAAaAAAAAACXQAAAAAAaAAAAAACJAAAAAACfgAAAAAAbQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAABfgAAAAAAaAAAAAACaAAAAAACaAAAAAACaAAAAAAAaAAAAAADXQAAAAAAaAAAAAADaAAAAAADaAAAAAABbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAADXQAAAAADXQAAAAABaAAAAAADbgAAAAAAbgAAAAADbgAAAAABfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADaAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAAAaAAAAAAAaAAAAAADaAAAAAAAaAAAAAACfQAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAAD
           version: 6
         -4,-3:
           ind: -4,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAaAAAAAABaAAAAAACTgAAAAADTgAAAAAAaAAAAAADTgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAADXgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXgAAAAABXQAAAAABfgAAAAAAgQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXgAAAAABXgAAAAABXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACYQAAAAAAYQAAAAABXgAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAYQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAADaAAAAAADaAAAAAABTgAAAAABTgAAAAACaAAAAAAATgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXgAAAAABXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAACXgAAAAAAXQAAAAABfgAAAAAAgQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXgAAAAABXgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADYQAAAAAAYQAAAAACXgAAAAAAXQAAAAACfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAYQAAAAAEfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAB
           version: 6
         2,0:
           ind: 2,0
-          tiles: HwAAAAACHwAAAAAAHwAAAAABfgAAAAAAaAAAAAABaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAACaAAAAAAAXQAAAAAAdQAAAAABdQAAAAADdQAAAAABfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAJAAAAAADXQAAAAABXQAAAAACXQAAAAACaAAAAAADXQAAAAAAXQAAAAAATgAAAAABXQAAAAABdQAAAAACdQAAAAABdQAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAAAaAAAAAABTgAAAAACTgAAAAADaAAAAAAAaAAAAAACaAAAAAABTgAAAAACTgAAAAAAXQAAAAACdQAAAAACdQAAAAADaAAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAAAaAAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACdQAAAAABdQAAAAADdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAACcAAAAAADcAAAAAADcAAAAAACcAAAAAACcAAAAAADfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAcAAAAAADcAAAAAADcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAdQAAAAABdQAAAAADcAAAAAAAcAAAAAADcAAAAAADcAAAAAADcAAAAAAAdQAAAAABXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAdQAAAAADdQAAAAADTgAAAAADcAAAAAACdQAAAAABcAAAAAABTgAAAAACdQAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACcAAAAAACcAAAAAABcAAAAAACcAAAAAADcAAAAAACdQAAAAABXQAAAAABXQAAAAACXQAAAAABfgAAAAAAgQAAAAAAgQAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAcAAAAAADcAAAAAAAcAAAAAACJAAAAAAAcAAAAAAAcAAAAAADcAAAAAADfgAAAAAAXQAAAAACegAAAAABegAAAAADegAAAAAAegAAAAADfgAAAAAAbAAAAAAAfgAAAAAAcAAAAAAAcAAAAAADcAAAAAACcAAAAAAAcAAAAAABcAAAAAACJAAAAAABXQAAAAABXQAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAcAAAAAACcAAAAAABcAAAAAABcAAAAAADcAAAAAABcAAAAAAAcAAAAAABfgAAAAAAXQAAAAAAegAAAAADegAAAAADegAAAAAAegAAAAADfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABcAAAAAADfgAAAAAAXQAAAAADegAAAAABegAAAAACegAAAAAAegAAAAACfgAAAAAAbgAAAAADgQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAcAAAAAADcAAAAAACcAAAAAAD
+          tiles: HwAAAAADHwAAAAABHwAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAACaAAAAAABXQAAAAACdQAAAAACdQAAAAADdQAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAJAAAAAADXQAAAAACXQAAAAABXQAAAAACaAAAAAACXQAAAAAAXQAAAAAATgAAAAAAXQAAAAACdQAAAAADdQAAAAAAdQAAAAABfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAABTgAAAAABTgAAAAADaAAAAAADaAAAAAACaAAAAAADTgAAAAADTgAAAAAAXQAAAAAAdQAAAAAAdQAAAAACaAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADaAAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAADdQAAAAAAdQAAAAABdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACcAAAAAAAcAAAAAADcAAAAAACcAAAAAABcAAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAABfgAAAAAAcAAAAAABcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAbgAAAAADfgAAAAAAXQAAAAABfgAAAAAAdQAAAAAAdQAAAAABcAAAAAACcAAAAAADcAAAAAABcAAAAAACcAAAAAAAdQAAAAABXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAbgAAAAADfgAAAAAAXQAAAAABfgAAAAAAdQAAAAAAdQAAAAAATgAAAAACcAAAAAADdQAAAAADcAAAAAADTgAAAAADdQAAAAACXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAACcAAAAAACcAAAAAABcAAAAAABcAAAAAABdQAAAAABXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAgQAAAAAAgQAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAcAAAAAADcAAAAAACcAAAAAACJAAAAAAAcAAAAAACcAAAAAADcAAAAAACfgAAAAAAXQAAAAABegAAAAADegAAAAACegAAAAABegAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAcAAAAAADcAAAAAACcAAAAAACcAAAAAABcAAAAAAAcAAAAAACJAAAAAABXQAAAAABXQAAAAABegAAAAAAegAAAAACegAAAAABegAAAAACfgAAAAAAbAAAAAAAfgAAAAAAcAAAAAACcAAAAAACcAAAAAAAcAAAAAADcAAAAAABcAAAAAABcAAAAAAAfgAAAAAAXQAAAAAAegAAAAAAegAAAAADegAAAAAAegAAAAADfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABcAAAAAADfgAAAAAAXQAAAAABegAAAAADegAAAAADegAAAAACegAAAAABfgAAAAAAbgAAAAADgQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAcAAAAAACcAAAAAACcAAAAAAA
           version: 6
         -5,-2:
           ind: -5,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAABDgAAAAACgQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAADDgAAAAABDgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAACDgAAAAADgQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAACDgAAAAACDgAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,2:
           ind: 0,2
-          tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAADTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAXQAAAAACfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAADfgAAAAAAdAAAAAABdAAAAAACdQAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABfgAAAAAAHwAAAAADHwAAAAADHwAAAAABfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAADHwAAAAADHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAACHwAAAAACHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAADHwAAAAABHwAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACXQAAAAABfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAbgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACfgAAAAAAdAAAAAADdAAAAAABdQAAAAABfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAABfgAAAAAAHwAAAAACHwAAAAADHwAAAAABfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAACHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAACHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,2:
           ind: -1,2
-          tiles: HwAAAAACHwAAAAACewAAAAABewAAAAAAewAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAABJAAAAAADJAAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAABfgAAAAAAHwAAAAAAewAAAAAAewAAAAADewAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAADHwAAAAACHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAADewAAAAADewAAAAADewAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAABHwAAAAACHwAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbgAAAAACfgAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADHwAAAAACXQAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAXQAAAAADHwAAAAACXQAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdAAAAAACdAAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAAAgQAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAAC
+          tiles: HwAAAAACHwAAAAAAewAAAAACewAAAAACewAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABJAAAAAABJAAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAHwAAAAAAewAAAAADewAAAAAAewAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAACHwAAAAADHwAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAHwAAAAACewAAAAAAewAAAAACewAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAABHwAAAAACHwAAAAABfgAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAHwAAAAACXQAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAXQAAAAABHwAAAAAAXQAAAAABfgAAAAAAHwAAAAABfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAAAdAAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAABgQAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAD
           version: 6
         -2,2:
           ind: -2,2
-          tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAbgAAAAABgQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADXQAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAACHwAAAAABfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAABAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAbgAAAAABgQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAADHwAAAAACXQAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAADAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,3:
           ind: -1,3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAJAAAAAAAXQAAAAAAXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABHwAAAAABHwAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABJAAAAAABXQAAAAACXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABHwAAAAABHwAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,3:
           ind: 0,3
-          tiles: XQAAAAADHwAAAAABHwAAAAABJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAAAHwAAAAACXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XQAAAAACHwAAAAABHwAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAABHwAAAAADXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         2,1:
           ind: 2,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAcAAAAAACcAAAAAADcAAAAAABfgAAAAAAJAAAAAABHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbgAAAAAAfgAAAAAAHwAAAAADTgAAAAABTgAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACHwAAAAACTgAAAAAATgAAAAABHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAaAAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAcAAAAAAAcAAAAAACcAAAAAADfgAAAAAAJAAAAAAAHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbgAAAAABfgAAAAAAHwAAAAABTgAAAAABTgAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABTgAAAAABTgAAAAAAHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAADaAAAAAADHwAAAAADHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         3,0:
           ind: 3,0
-          tiles: fgAAAAAAdQAAAAABdQAAAAABdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAABfgAAAAAAdQAAAAADdQAAAAADdQAAAAADcAAAAAAAdQAAAAADcAAAAAABfgAAAAAAcAAAAAADcAAAAAAAdQAAAAADdQAAAAACdQAAAAACfgAAAAAAcAAAAAACdQAAAAACdQAAAAACdQAAAAABdQAAAAAAdQAAAAADcAAAAAAAdQAAAAABcAAAAAACcAAAAAADcAAAAAAAcAAAAAACdQAAAAABdQAAAAAAdQAAAAABdQAAAAABdQAAAAADdQAAAAACcAAAAAABcAAAAAAAcAAAAAACdQAAAAACcAAAAAAAdQAAAAADcAAAAAABcAAAAAABcAAAAAADcAAAAAAAdQAAAAABdQAAAAADdQAAAAACfgAAAAAAcAAAAAABdQAAAAADdQAAAAACdQAAAAAAdQAAAAAAdQAAAAADcAAAAAADdQAAAAACcAAAAAADfgAAAAAAcAAAAAADcAAAAAABdQAAAAADdQAAAAACdQAAAAAAfgAAAAAAcAAAAAABcAAAAAADfgAAAAAAdQAAAAABdQAAAAACdQAAAAADcAAAAAAAdQAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAAAcAAAAAAAfgAAAAAAcAAAAAADcAAAAAABcAAAAAABcAAAAAAAfgAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAcAAAAAAAdQAAAAABcAAAAAADcAAAAAADcAAAAAABdQAAAAACdQAAAAABdQAAAAABfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdQAAAAACdQAAAAABcAAAAAADfgAAAAAAcAAAAAAAdQAAAAAAdQAAAAAAdQAAAAAAfgAAAAAAbgAAAAACbgAAAAABbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAADdQAAAAADcAAAAAAAdQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAADfgAAAAAAcAAAAAADdQAAAAAAcAAAAAADfgAAAAAAJAAAAAABHwAAAAABHwAAAAADHwAAAAABHwAAAAABegAAAAABegAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAcAAAAAADdQAAAAADcAAAAAABcAAAAAADcAAAAAADHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAABcAAAAAACfgAAAAAAcAAAAAACHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAcAAAAAACcAAAAAACdQAAAAACcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAdQAAAAAAdQAAAAACdQAAAAACdQAAAAADcAAAAAADcAAAAAACcAAAAAAAdQAAAAADcAAAAAADcAAAAAABcAAAAAAAcAAAAAACcAAAAAACfgAAAAAAbQAAAAAAfgAAAAAAdQAAAAADdQAAAAABdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACdQAAAAACdQAAAAABdQAAAAADcAAAAAABfgAAAAAAbQAAAAAA
+          tiles: fgAAAAAAdQAAAAADdQAAAAAAdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAAAfgAAAAAAdQAAAAABdQAAAAACdQAAAAACcAAAAAACdQAAAAACcAAAAAABfgAAAAAAcAAAAAACcAAAAAACdQAAAAABdQAAAAADdQAAAAADfgAAAAAAcAAAAAABdQAAAAACdQAAAAADdQAAAAACdQAAAAADdQAAAAABcAAAAAABdQAAAAAAcAAAAAAAcAAAAAADcAAAAAAAcAAAAAABdQAAAAADdQAAAAACdQAAAAABdQAAAAADdQAAAAACdQAAAAACcAAAAAAAcAAAAAADcAAAAAAAdQAAAAADcAAAAAABdQAAAAADcAAAAAACcAAAAAAAcAAAAAACcAAAAAAAdQAAAAACdQAAAAADdQAAAAAAfgAAAAAAcAAAAAACdQAAAAADdQAAAAACdQAAAAABdQAAAAACdQAAAAACcAAAAAAAdQAAAAACcAAAAAADfgAAAAAAcAAAAAAAcAAAAAABdQAAAAAAdQAAAAAAdQAAAAAAfgAAAAAAcAAAAAAAcAAAAAABfgAAAAAAdQAAAAACdQAAAAADdQAAAAAAcAAAAAACdQAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAACcAAAAAADfgAAAAAAcAAAAAADcAAAAAADcAAAAAAAcAAAAAACfgAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAcAAAAAACdQAAAAADcAAAAAACcAAAAAADcAAAAAADdQAAAAABdQAAAAACdQAAAAAAfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAADdQAAAAAAcAAAAAACfgAAAAAAcAAAAAADdQAAAAABdQAAAAAAdQAAAAABfgAAAAAAbgAAAAADbgAAAAADbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAdQAAAAABcAAAAAAAdQAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAAAfgAAAAAAcAAAAAACdQAAAAACcAAAAAAAfgAAAAAAJAAAAAACHwAAAAABHwAAAAADHwAAAAABHwAAAAABegAAAAACegAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAcAAAAAACdQAAAAAAcAAAAAADcAAAAAAAcAAAAAACHwAAAAACHwAAAAACHwAAAAACfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAABcAAAAAAAfgAAAAAAcAAAAAACHwAAAAABHwAAAAADHwAAAAABfgAAAAAAegAAAAADegAAAAABfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAcAAAAAADcAAAAAACdQAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAdQAAAAACdQAAAAADdQAAAAADdQAAAAADcAAAAAABcAAAAAABcAAAAAACdQAAAAAAcAAAAAACcAAAAAABcAAAAAAAcAAAAAADcAAAAAABfgAAAAAAbQAAAAAAfgAAAAAAdQAAAAADdQAAAAACdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADdQAAAAAAdQAAAAACdQAAAAADcAAAAAACfgAAAAAAbQAAAAAA
           version: 6
         3,1:
           ind: 3,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAAAdQAAAAADdQAAAAACcAAAAAACfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAcAAAAAACcAAAAAABcAAAAAAAcAAAAAAAcAAAAAADfgAAAAAAgQAAAAAAbgAAAAABbgAAAAADgQAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAMwAAAAAAegAAAAADegAAAAACegAAAAAAegAAAAABfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAACgAAAAAAfgAAAAAAbgAAAAAAHwAAAAAAfgAAAAAAXgAAAAAAZAAAAAAAXQAAAAAAXQAAAAABfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABMAAAAAAAfgAAAAAAZAAAAAAAXQAAAAADXgAAAAAAZAAAAAAAfgAAAAAAbgAAAAABbgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAegAAAAACegAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAABfgAAAAAAegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAADdQAAAAADdQAAAAACcAAAAAADfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAcAAAAAABcAAAAAADcAAAAAABcAAAAAADcAAAAAACfgAAAAAAgQAAAAAAbgAAAAABbgAAAAADgQAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAMwAAAAAAegAAAAAAegAAAAACegAAAAABegAAAAADfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAACgAAAAAAfgAAAAAAbgAAAAACHwAAAAACfgAAAAAAXgAAAAABZAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADMAAAAAAAfgAAAAAAZAAAAAAAXQAAAAACXgAAAAAAZAAAAAAAfgAAAAAAbgAAAAABbgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAACegAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAABegAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAACegAAAAAAfgAAAAAAegAAAAAAegAAAAABfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -4,-4:
           ind: -4,-4
-          tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAABJAAAAAAAJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAACHwAAAAABHwAAAAABHwAAAAAAJAAAAAADJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAADJAAAAAADJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAADHwAAAAADJAAAAAAAJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAABHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAACHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAABHwAAAAABHwAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAABfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAATgAAAAADXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAACfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAA
+          tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAADHwAAAAABHwAAAAACHwAAAAAAJAAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAJAAAAAABJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAABJAAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADJAAAAAADJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAABHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAACHwAAAAAAHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAADJAAAAAADJAAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAATgAAAAACXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABTgAAAAADXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAA
           version: 6
         -3,-4:
           ind: -3,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAACHwAAAAABHwAAAAABHwAAAAACHwAAAAACJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAABJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAAAJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAABJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAADJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAADJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAACHwAAAAABHwAAAAACHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAJAAAAAACJAAAAAAAJAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAACfgAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAABfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAACfgAAAAAABwAAAAAKBwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAABJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAADJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAADJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAADJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAABHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAJAAAAAADJAAAAAACJAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAACfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAABfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAADfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAADfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -4,-5:
           ind: -4,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAABHwAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAADHwAAAAABHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -3,-5:
           ind: -3,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAADJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAA
           version: 6
         3,-1:
           ind: 3,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAACfgAAAAAAXQAAAAACHwAAAAADHwAAAAACHwAAAAACHwAAAAADHwAAAAACHwAAAAACfgAAAAAAbgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAABHwAAAAACHwAAAAABHwAAAAACHwAAAAACHwAAAAABHwAAAAABfgAAAAAAbgAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAACHwAAAAADHwAAAAABfgAAAAAAbgAAAAADfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAXQAAAAACJAAAAAADJAAAAAADJAAAAAAAJAAAAAAAJAAAAAABJAAAAAAAfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAAAJAAAAAABfgAAAAAAgQAAAAAAbgAAAAABbgAAAAACbgAAAAACbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAACdQAAAAADdQAAAAABcAAAAAACfgAAAAAAdQAAAAADdQAAAAADfgAAAAAAcAAAAAADcAAAAAACcAAAAAACcAAAAAACcAAAAAADbQAAAAAAfgAAAAAAcAAAAAADcAAAAAADdQAAAAAAcAAAAAABcAAAAAADcAAAAAACdQAAAAADdQAAAAABfgAAAAAAcAAAAAADcAAAAAABcAAAAAAAcAAAAAACcAAAAAACbQAAAAAAfgAAAAAAcAAAAAAAcAAAAAABdQAAAAAAcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAADdQAAAAADdQAAAAACdQAAAAADdQAAAAACfgAAAAAAcAAAAAACdQAAAAABdQAAAAACdQAAAAACcAAAAAADcAAAAAAAcAAAAAABcAAAAAABcAAAAAABcAAAAAACdQAAAAABdQAAAAADdQAAAAACdQAAAAABdQAAAAAAfgAAAAAAcAAAAAACcAAAAAAAdQAAAAACcAAAAAACcAAAAAACcAAAAAADcAAAAAABcAAAAAAAcAAAAAADcAAAAAADdQAAAAABdQAAAAADdQAAAAACdQAAAAABdQAAAAACfgAAAAAAcAAAAAAAcAAAAAABdQAAAAACcAAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAADdQAAAAADdQAAAAABcAAAAAAAfgAAAAAAdQAAAAACdQAAAAAAfgAAAAAAggAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAbAAAAAAAcAAAAAABdQAAAAABdQAAAAACdQAAAAABcAAAAAADcAAAAAABdQAAAAACdQAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAADfgAAAAAAXQAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAbgAAAAADfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACHwAAAAABHwAAAAAAHwAAAAABHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAbgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADJAAAAAABJAAAAAAAJAAAAAACJAAAAAABJAAAAAABJAAAAAAAfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABJAAAAAADJAAAAAABJAAAAAADJAAAAAACfgAAAAAAgQAAAAAAbgAAAAAAbgAAAAACbgAAAAACbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAAAdQAAAAADdQAAAAADcAAAAAAAfgAAAAAAdQAAAAACdQAAAAAAfgAAAAAAcAAAAAACcAAAAAABcAAAAAACcAAAAAABcAAAAAACbQAAAAAAfgAAAAAAcAAAAAABcAAAAAAAdQAAAAACcAAAAAABcAAAAAAAcAAAAAADdQAAAAACdQAAAAADfgAAAAAAcAAAAAADcAAAAAABcAAAAAADcAAAAAADcAAAAAABbQAAAAAAfgAAAAAAcAAAAAABcAAAAAADdQAAAAAAcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAADdQAAAAAAdQAAAAACdQAAAAADdQAAAAADfgAAAAAAcAAAAAADdQAAAAAAdQAAAAADdQAAAAAAcAAAAAACcAAAAAAAdQAAAAAAcAAAAAABcAAAAAACcAAAAAAAdQAAAAADdQAAAAADdQAAAAAAdQAAAAADdQAAAAACfgAAAAAAcAAAAAACcAAAAAACdQAAAAABcAAAAAAAcAAAAAABcAAAAAACdQAAAAACcAAAAAACcAAAAAADcAAAAAADdQAAAAABdQAAAAAAdQAAAAABdQAAAAABdQAAAAADfgAAAAAAcAAAAAACcAAAAAAAdQAAAAADcAAAAAACcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAAAdQAAAAAAdQAAAAABcAAAAAABfgAAAAAAdQAAAAABdQAAAAADfgAAAAAAggAAAAACgQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAbAAAAAAAcAAAAAABdQAAAAABdQAAAAADdQAAAAACcAAAAAAAcAAAAAADdQAAAAADdQAAAAAAfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         4,0:
           ind: 4,0
-          tiles: fgAAAAAAbgAAAAADfgAAAAAAbAAAAAAAbAAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbgAAAAABfgAAAAAAbAAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbgAAAAABfgAAAAAAgQAAAAAAbQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbgAAAAACfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAbgAAAAACfgAAAAAAbAAAAAAAbAAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbgAAAAADfgAAAAAAbAAAAAAAbQAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbgAAAAABfgAAAAAAgQAAAAAAbQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbgAAAAABfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         4,-1:
           ind: 4,-1
-          tiles: XQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAADfgAAAAAAaAAAAAADaAAAAAADaAAAAAAAaAAAAAABaAAAAAABfgAAAAAAXQAAAAADbQAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAADaAAAAAACaAAAAAACfgAAAAAAXQAAAAACbQAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABaAAAAAABaAAAAAABaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAaAAAAAABaAAAAAADaAAAAAACaAAAAAAAaAAAAAACfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAAAXQAAAAADXQAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABbQAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAgQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAgQAAAAAAgQAAAAAAbgAAAAADbgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAgQAAAAAAfgAAAAAAbAAAAAAAbgAAAAACfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAACfgAAAAAAaAAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAADfgAAAAAAXQAAAAACbQAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAfgAAAAAATgAAAAADXQAAAAACfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAaAAAAAAAaAAAAAAAfgAAAAAAXQAAAAADbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAADaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAACaAAAAAAAaAAAAAADfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAADXQAAAAAAXQAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAbgAAAAADgQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAgQAAAAAAgQAAAAAAbgAAAAACbgAAAAACfgAAAAAAbAAAAAAAbAAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAACfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAgQAAAAAAfgAAAAAAbAAAAAAAbgAAAAABfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbgAAAAABgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         4,1:
           ind: 4,1
@@ -282,27 +282,27 @@ entities:
           version: 6
         4,-2:
           ind: 4,-2
-          tiles: fgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAJAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACJAAAAAAAJAAAAAABJAAAAAABXQAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAHwAAAAADHwAAAAADJAAAAAABHwAAAAABXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAbgAAAAACfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAABXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAADfgAAAAAAegAAAAADegAAAAADegAAAAABegAAAAABXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAaAAAAAAAXQAAAAAAegAAAAACegAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAABXQAAAAAAXQAAAAADJAAAAAAAfgAAAAAAaAAAAAABXQAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAABegAAAAABfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAaAAAAAADXQAAAAABJAAAAAABegAAAAADfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAbgAAAAAAbgAAAAADbgAAAAACbAAAAAAATgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADbQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAbQAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAATgAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADbQAAAAAAXQAAAAACXQAAAAADXQAAAAABfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAACbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADJAAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABJAAAAAADJAAAAAADJAAAAAABXQAAAAABXQAAAAACXQAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAJAAAAAACHwAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAbgAAAAADfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAACXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAADegAAAAACXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAaAAAAAADXQAAAAACegAAAAAAegAAAAADfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAADegAAAAADXQAAAAADXQAAAAADJAAAAAACfgAAAAAAaAAAAAACXQAAAAABegAAAAABegAAAAADfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAACegAAAAADfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAaAAAAAABXQAAAAAAJAAAAAACegAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAbgAAAAADbgAAAAABbgAAAAACbAAAAAAATgAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAACbQAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAAAbQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAACbQAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         5,-1:
           ind: 5,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbgAAAAADbgAAAAADfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbgAAAAADbgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         5,-2:
           ind: 5,-2
-          tiles: bQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAbgAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAABegAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAgQAAAAAAgQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAABXQAAAAAAaAAAAAADaAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAbgAAAAACfgAAAAAAJAAAAAADJAAAAAADXQAAAAAAXQAAAAABJAAAAAABJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAbgAAAAACfgAAAAAAJAAAAAACJAAAAAAAXQAAAAABXQAAAAABJAAAAAABJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA
+          tiles: bQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAbgAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAbgAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAbgAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAACegAAAAACfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAABegAAAAADfgAAAAAAbQAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAgQAAAAAAgQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAABXQAAAAABaAAAAAABaAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAbgAAAAACfgAAAAAAJAAAAAACJAAAAAAAXQAAAAABXQAAAAADJAAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAbgAAAAABfgAAAAAAJAAAAAADJAAAAAABXQAAAAADXQAAAAABJAAAAAADJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAbgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         4,-3:
           ind: 4,-3
-          tiles: CwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbgAAAAACbgAAAAADbgAAAAABbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: CwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbgAAAAACbgAAAAADbgAAAAABbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         1,-4:
           ind: 1,-4
-          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAADJAAAAAADfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAIfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAKBwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAADAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAABHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAEfwAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAHwAAAAABHwAAAAACEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAAfwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAADJAAAAAABfgAAAAAAfgAAAAAABwAAAAAKBwAAAAAABwAAAAACfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAEBwAAAAAABwAAAAAMBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAABBwAAAAAJBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAACHwAAAAABHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAIfwAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAHwAAAAAAHwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAAfwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAEBwAAAAAABwAAAAAABwAAAAADfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         0,-4:
           ind: 0,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAJAAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAJAAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAJAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAJAAAAAAC
           version: 6
         -5,-3:
           ind: -5,-3
@@ -310,7 +310,7 @@ entities:
           version: 6
         -3,2:
           ind: -3,2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-4:
           ind: -1,-4
@@ -322,11 +322,11 @@ entities:
           version: 6
         5,-3:
           ind: 5,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAFWwAAAAAAWwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,2:
           ind: 1,2
-          tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -2,-4:
           ind: -2,-4
@@ -334,15 +334,15 @@ entities:
           version: 6
         2,-4:
           ind: 2,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAGBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAEBwAAAAACBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAIBwAAAAAABwAAAAAHfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAACBwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAADfwAAAAAABwAAAAAABwAAAAAIBwAAAAAIBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         3,-4:
           ind: 3,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAALBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAKBwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAACfwAAAAAABwAAAAALCwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAGfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAHBwAAAAAIBwAAAAAABwAAAAADBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAKBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAIBwAAAAAABwAAAAAJBwAAAAABBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAABwAAAAAEBwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAKBwAAAAAABwAAAAAMBwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAADAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAACBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAADBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAACBwAAAAAHBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAJBwAAAAAKBwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAABBwAAAAAFBwAAAAAMBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAABwAAAAAEBwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA
           version: 6
         4,-4:
           ind: 4,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAABfgAAAAAABwAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAABfgAAAAAABwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAABwAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAACBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAAAfgAAAAAABwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -396,10 +396,10 @@ entities:
           decals:
             1891: 69,-28
             1892: 70,-28
-            2137: 7.759592,-44.793304
-            2138: 8.236585,-44.781075
-            6190: -44.266167,24.17379
-            6191: -43.71579,24.16156
+            6186: -44.266167,24.17379
+            6187: -43.71579,24.16156
+            6886: 7.80612,-46.838108
+            6887: 8.233204,-46.827694
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -414,15 +414,15 @@ entities:
             1956: 61,-20
             1980: 22,-38
             1981: 22,-37
-            6188: -45.159,22.681658
-            6189: -45.17123,23.256496
+            6184: -45.159,22.681658
+            6185: -45.17123,23.256496
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            3005: -25,37
+            3001: -25,37
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -433,29 +433,29 @@ entities:
             1812: 68.96644,-11.160069
             1813: 69.96644,-11.15081
             1814: 67.97107,-11.15544
-            6186: -43.71579,21.837746
-            6187: -44.32732,21.837746
-            6714: -33,-12
+            6182: -43.71579,21.837746
+            6183: -44.32732,21.837746
+            6708: -33,-12
         - node:
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
             1274: 25,12
-            6184: -42.87188,22.669428
-            6185: -42.85965,23.219805
+            6180: -42.87188,22.669428
+            6181: -42.85965,23.219805
         - node:
             color: '#FFFFFFFF'
             id: Basalt1
           decals:
             309: 26,-21
-            2255: 26,1
+            2251: 26,1
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Basalt1
           decals:
-            3051: 80.98914,-5.89228
+            3047: 80.98914,-5.89228
         - node:
             color: '#FFFFFFFF'
             id: Basalt2
@@ -466,7 +466,7 @@ entities:
             color: '#FFFFFFFF'
             id: Basalt2
           decals:
-            3053: 79.36655,-6.805498
+            3049: 79.36655,-6.805498
         - node:
             color: '#FFFFFFFF'
             id: Basalt3
@@ -478,7 +478,7 @@ entities:
             color: '#FFFFFFFF'
             id: Basalt3
           decals:
-            3050: 80.410225,-6.9767265
+            3046: 80.410225,-6.9767265
         - node:
             color: '#FFFFFFFF'
             id: Basalt4
@@ -494,7 +494,7 @@ entities:
             314: 25,-23
             940: -48,-28
             1939: 54,-21
-            2256: 25,1
+            2252: 25,1
         - node:
             color: '#FFFFFFFF'
             id: Basalt6
@@ -513,7 +513,7 @@ entities:
             color: '#FFFFFFFF'
             id: Basalt7
           decals:
-            3052: 80.88314,-7.8817906
+            3048: 80.88314,-7.8817906
         - node:
             color: '#FFFFFFFF'
             id: Basalt8
@@ -531,31 +531,31 @@ entities:
             color: '#FFFFFFFF'
             id: Basalt9
           decals:
-            3054: 79.17086,-7.824714
+            3050: 79.17086,-7.824714
         - node:
             color: '#D4D4D428'
             id: Bot
           decals:
-            2210: -36,-58
-            2211: -36,-59
-            2212: -36,-60
-            2213: -36,-61
-            2214: -36,-62
-            2215: -36,-63
-            2216: -36,-64
-            2217: -60,-58
-            2218: -60,-59
-            2219: -60,-60
-            2220: -60,-61
-            2221: -60,-62
-            2222: -60,-63
-            2223: -60,-64
+            2206: -36,-58
+            2207: -36,-59
+            2208: -36,-60
+            2209: -36,-61
+            2210: -36,-62
+            2211: -36,-63
+            2212: -36,-64
+            2213: -60,-58
+            2214: -60,-59
+            2215: -60,-60
+            2216: -60,-61
+            2217: -60,-62
+            2218: -60,-63
+            2219: -60,-64
         - node:
             color: '#DE3A3A41'
             id: Bot
           decals:
-            6639: -38,-45
-            6640: -38,-45
+            6633: -38,-45
+            6634: -38,-45
         - node:
             color: '#EFB34196'
             id: Bot
@@ -628,8 +628,8 @@ entities:
             color: '#FFFFFF4A'
             id: Bot
           decals:
-            6763: 18,-56
-            6764: 19,-56
+            6757: 18,-56
+            6758: 19,-56
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -639,8 +639,8 @@ entities:
             1788: 63,-24
             1789: 65,-25
             1790: 65,-24
-            2178: -10,-41
-            2179: -10,-40
+            2174: -10,-41
+            2175: -10,-40
         - node:
             color: '#FFFFFFFF'
             id: Bot
@@ -668,8 +668,6 @@ entities:
             886: -52,-1
             1084: 33,-3
             1085: 34,-3
-            1086: 33,-2
-            1087: 34,-2
             1111: 39,-28
             1112: -26,-32
             1113: 49,-22
@@ -742,106 +740,109 @@ entities:
             2022: 28,-47
             2077: 12,-46
             2078: 13,-46
-            2123: -2,-35
-            2124: -1,-35
-            2125: 3,-38
-            2126: 3,-37
-            2146: 9,-46
-            2147: 9,-47
-            2148: 7,-47
-            2149: 7,-46
-            2150: 10,-41
-            2156: 12,-38
-            2175: -6,-34
-            2176: -5,-34
-            2177: -4,-34
-            2227: 41,-10
-            2228: -23,12
-            2844: 66,-23
-            2876: -27,30
-            2889: 57,15
-            3177: 75,-13
-            3178: 75,-15
-            3183: 75,-19
-            3184: 75,-17
-            6422: 48,-10
-            6423: 51,5
-            6424: 53,10
-            6567: -36,-65
-            6568: -60,-65
-            6702: -34,-11
-            6703: -34,-10
-            6704: -32,-11
-            6705: -32,-10
-            6724: 61,-21
-            6731: -24,-42
-            6741: 3,48
-            6761: 62,-7
-            6762: 62,-8
-            6848: 54,-33
-            6857: 22,-59
-            6858: 15,-59
+            2119: -2,-35
+            2120: -1,-35
+            2121: 3,-38
+            2122: 3,-37
+            2146: 10,-41
+            2152: 12,-38
+            2171: -6,-34
+            2172: -5,-34
+            2173: -4,-34
+            2223: 41,-10
+            2224: -23,12
+            2840: 66,-23
+            2872: -27,30
+            2885: 57,15
+            3173: 75,-13
+            3174: 75,-15
+            3179: 75,-19
+            3180: 75,-17
+            6417: 48,-10
+            6418: 51,5
+            6419: 53,10
+            6561: -36,-65
+            6562: -60,-65
+            6696: -34,-11
+            6697: -34,-10
+            6698: -32,-11
+            6699: -32,-10
+            6718: 61,-21
+            6725: -24,-42
+            6735: 3,48
+            6755: 62,-7
+            6756: 62,-8
+            6842: 54,-33
+            6846: 22,-59
+            6847: 15,-59
+            6850: -19,-38
+            6876: 7,-48
+            6877: 7,-49
+            6878: 9,-48
+            6879: 9,-49
+            6888: 7,-45
+            6889: 9,-45
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            2973: -25,34
-            2974: -25,35
-            2975: -30,35
-            2976: -30,34
-            3002: -23,38
-            3003: -10,38
-            3004: -9,38
-            3055: 78,-8
-            3056: 79,-8
+            2969: -25,34
+            2970: -25,35
+            2971: -30,35
+            2972: -30,34
+            2998: -23,38
+            2999: -10,38
+            3000: -9,38
+            3051: 78,-8
+            3052: 79,-8
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            6585: 91,-19
-            6586: 91,-18
-            6587: 92,-18
-            6588: 92,-19
-            6589: 87,-19
-            6590: 88,-19
-            6591: 88,-18
-            6592: 87,-18
+            6579: 91,-19
+            6580: 91,-18
+            6581: 92,-18
+            6582: 92,-19
+            6583: 87,-19
+            6584: 88,-19
+            6585: 88,-18
+            6586: 87,-18
         - node:
             color: '#52B4E996'
             id: BotGreyscale
           decals:
-            6327: 55,8
-            6328: 55,8
-            6329: 56,8
-            6330: 56,8
-            6344: 57,1
-            6345: 57,1
-            6346: 56,1
-            6347: 56,1
-            6348: 55,4
-            6349: 55,4
-            6350: 56,4
-            6351: 56,4
-            6352: 57,4
-            6353: 57,4
+            6322: 55,8
+            6323: 55,8
+            6324: 56,8
+            6325: 56,8
+            6339: 57,1
+            6340: 57,1
+            6341: 56,1
+            6342: 56,1
+            6343: 55,4
+            6344: 55,4
+            6345: 56,4
+            6346: 56,4
+            6347: 57,4
+            6348: 57,4
         - node:
             cleanable: True
             color: '#D4D4D428'
             id: BotGreyscale
           decals:
-            3025: 76,-28
-            3026: 80,-28
-            3027: 78,-30
-            3028: 78,-26
+            3021: 76,-28
+            3022: 80,-28
+            3023: 78,-30
+            3024: 78,-26
         - node:
             cleanable: True
             color: '#EFB341FF'
             id: BotLeft
           decals:
-            6124: 6,-14
-            6126: 6,-14
+            6120: 6,-14
+            6122: 6,-14
         - node:
             color: '#FFFFFFFF'
             id: BotLeft
@@ -851,40 +852,40 @@ entities:
             1961: 23,-39
             1962: 24,-39
             1963: 25,-39
-            2154: 12,-39
-            6547: -3,33
+            2150: 12,-39
+            6541: -3,33
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BotLeft
+          decals:
+            6117: 6,-14
+        - node:
+            angle: -6.283185307179586 rad
+            color: '#EFB34196'
+            id: BotLeftGreyscale
+          decals:
+            6621: -1,-20
+            6622: -1,-21
+        - node:
+            cleanable: True
+            color: '#EFB341FF'
+            id: BotLeftGreyscale
           decals:
             6121: 6,-14
-        - node:
-            angle: -6.283185307179586 rad
-            color: '#EFB34196'
-            id: BotLeftGreyscale
-          decals:
-            6627: -1,-20
-            6628: -1,-21
-        - node:
-            cleanable: True
-            color: '#EFB341FF'
-            id: BotLeftGreyscale
-          decals:
-            6125: 6,-14
         - node:
             angle: -6.283185307179586 rad
             color: '#EFB34196'
             id: BotRight
           decals:
-            6629: -2,-21
-            6630: -2,-20
+            6623: -2,-21
+            6624: -2,-20
         - node:
             cleanable: True
             color: '#EFB341FF'
             id: BotRight
           decals:
-            6127: 6,-15
+            6123: 6,-15
         - node:
             color: '#FFFFFFFF'
             id: BotRight
@@ -894,20 +895,20 @@ entities:
             1964: 23,-36
             1965: 24,-36
             1966: 25,-36
-            2155: 12,-40
-            6548: -3,34
+            2151: 12,-40
+            6542: -3,34
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BotRight
           decals:
-            6122: 6,-15
+            6118: 6,-15
         - node:
             cleanable: True
             color: '#EFB341FF'
             id: BotRightGreyscale
           decals:
-            6123: 6,-15
+            6119: 6,-15
         - node:
             color: '#FFFFFFFF'
             id: Box
@@ -918,7 +919,7 @@ entities:
             1119: -56,-24
             1994: 19,-37
             1995: 19,-36
-            6612: 92,-20
+            6606: 92,-20
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNe
@@ -927,7 +928,8 @@ entities:
             1067: 28,-29
             1432: 58,-34
             1884: 69,-29
-            2103: 22,-53
+            2101: 22,-53
+            6875: 9,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNw
@@ -937,7 +939,8 @@ entities:
             1065: 24,-29
             1429: 56,-34
             1883: 70,-29
-            2106: 15,-53
+            2104: 15,-53
+            6874: 7,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSe
@@ -948,7 +951,8 @@ entities:
             1430: 58,-36
             1886: 69,-30
             2079: 17,-53
-            2105: 22,-60
+            2103: 22,-60
+            6873: 9,-49
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSw
@@ -959,7 +963,8 @@ entities:
             1431: 56,-36
             1885: 70,-30
             2080: 20,-53
-            2104: 15,-60
+            2102: 15,-60
+            6872: 7,-49
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNe
@@ -971,10 +976,10 @@ entities:
             1808: 70,-11
             1863: 74,-17
             1866: 74,-14
-            2097: 15,-60
-            2102: 22,-53
-            2109: 21,-53
-            2110: 22,-54
+            2095: 15,-60
+            2100: 22,-53
+            2107: 21,-53
+            2108: 22,-54
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNw
@@ -985,10 +990,10 @@ entities:
             1153: -1,21
             1423: 58,-36
             1807: 68,-11
-            2098: 22,-60
-            2101: 15,-53
-            2107: 16,-53
-            2108: 15,-54
+            2096: 22,-60
+            2099: 15,-53
+            2105: 16,-53
+            2106: 15,-54
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSe
@@ -998,9 +1003,9 @@ entities:
             1422: 56,-34
             1864: 74,-15
             1865: 74,-19
-            2096: 15,-53
-            2099: 22,-60
-            2112: 21,-60
+            2094: 15,-53
+            2097: 22,-60
+            2109: 21,-60
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSw
@@ -1008,9 +1013,9 @@ entities:
             45: -12,-14
             478: -25,-1
             1421: 58,-34
-            2095: 22,-53
-            2100: 15,-60
-            2114: 16,-60
+            2093: 22,-53
+            2098: 15,-60
+            2110: 16,-60
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineE
@@ -1107,15 +1112,13 @@ entities:
             2003: 27,-44
             2004: 27,-43
             2005: 27,-42
-            2091: 15,-58
-            2092: 15,-57
-            2093: 15,-55
-            2094: 15,-54
-            2119: 16,-60
-            2139: 9,-47
-            2140: 9,-46
-            6425: 53,12
-            6426: 53,11
+            2089: 15,-58
+            2090: 15,-57
+            2091: 15,-55
+            2092: 15,-54
+            2115: 16,-60
+            6420: 53,12
+            6421: 53,11
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
@@ -1204,20 +1207,22 @@ entities:
             2015: 29,-43
             2083: 16,-60
             2084: 21,-60
-            2115: 15,-57
-            2116: 22,-57
-            2131: 7,-46
-            2132: 9,-46
-            2133: 8,-46
-            6111: -14,-23
-            6112: -15,-23
-            6113: -16,-23
-            6600: 87,-20
-            6601: 88,-20
-            6602: 89,-20
-            6603: 90,-20
-            6604: 91,-20
-            6605: 92,-20
+            2111: 15,-57
+            2112: 22,-57
+            6107: -14,-23
+            6108: -15,-23
+            6109: -16,-23
+            6594: 87,-20
+            6595: 88,-20
+            6596: 89,-20
+            6597: 90,-20
+            6598: 91,-20
+            6599: 92,-20
+            6861: 33,-2
+            6862: 34,-2
+            6869: 7,-48
+            6870: 8,-48
+            6871: 9,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
@@ -1296,47 +1301,47 @@ entities:
             2017: 29,-46
             2081: 16,-53
             2082: 21,-53
-            2117: 22,-55
-            2118: 15,-55
-            2143: 8,-47
-            2144: 7,-47
-            2145: 9,-47
-            2161: 10,-40
-            2162: 11,-40
-            2226: -42,-54
-            6108: -14,-25
-            6109: -15,-25
-            6110: -16,-25
-            6193: -3,43
-            6194: -2,43
-            6195: -1,43
-            6226: 45,14
-            6227: 47,14
-            6228: 46,14
-            6399: 49,-11
-            6400: 52,-11
-            6564: -29,-17
-            6606: 87,-21
-            6607: 89,-21
-            6608: 88,-21
-            6609: 90,-21
-            6610: 91,-21
-            6611: 92,-21
+            2113: 22,-55
+            2114: 15,-55
+            2157: 10,-40
+            2158: 11,-40
+            2222: -42,-54
+            6104: -14,-25
+            6105: -15,-25
+            6106: -16,-25
+            6189: -3,43
+            6190: -2,43
+            6191: -1,43
+            6222: 45,14
+            6223: 47,14
+            6224: 46,14
+            6394: 49,-11
+            6395: 52,-11
+            6558: -29,-17
+            6600: 87,-21
+            6601: 89,-21
+            6602: 88,-21
+            6603: 90,-21
+            6604: 91,-21
+            6605: 92,-21
+            6866: 7,-49
+            6867: 8,-49
+            6868: 9,-49
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
           decals:
-            2977: -30,36
-            2978: -29,36
-            2979: -28,36
-            2980: -27,36
-            2981: -26,36
-            3001: -30,36
-            3021: 76,-25
-            3022: 77,-25
-            3023: 78,-25
-            3024: 79,-25
+            2973: -30,36
+            2974: -29,36
+            2975: -28,36
+            2976: -27,36
+            2977: -26,36
+            2997: -30,36
+            3017: 76,-25
+            3018: 77,-25
+            3019: 78,-25
+            3020: 79,-25
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
@@ -1424,13 +1429,11 @@ entities:
             1426: 56,-35
             1881: 70,-30
             1882: 70,-29
-            2086: 22,-58
-            2087: 22,-57
-            2088: 22,-55
-            2089: 22,-54
-            2120: 21,-60
-            2141: 7,-47
-            2142: 7,-46
+            2085: 22,-58
+            2086: 22,-57
+            2087: 22,-55
+            2088: 22,-54
+            2116: 21,-60
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerNe
@@ -1443,14 +1446,14 @@ entities:
           decals:
             703: -39,-34
             1950: 57,-21
-            6709: -33,-12
+            6703: -33,-12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNw
           decals:
             702: -30,-34
             1949: 54,-21
-            6708: -33,-12
+            6702: -33,-12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerSe
@@ -1530,20 +1533,20 @@ entities:
             1165: -11,28
             1877: 69,-28
             1878: 70,-28
-            2121: 0,-37
-            2122: 1,-37
-            2127: 2,-37
-            2873: -27,27
-            2874: -26,27
-            2875: -25,27
-            6706: -34,-12
-            6707: -32,-12
+            2117: 0,-37
+            2118: 1,-37
+            2123: 2,-37
+            2869: -27,27
+            2870: -26,27
+            2871: -25,27
+            6700: -34,-12
+            6701: -32,-12
         - node:
             cleanable: True
             color: '#FFFFFF35'
             id: BrickTileSteelLineS
           decals:
-            6129: 83,-35
+            6125: 83,-35
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineS
@@ -1574,17 +1577,17 @@ entities:
             1414: 42,5
             1415: 43,5
             1478: 41,5
-            3060: 51,22
-            3061: 50,22
-            3062: 52,22
-            6562: -34,-17
-            6563: -33,-17
+            3056: 51,22
+            3057: 50,22
+            3058: 52,22
+            6556: -34,-17
+            6557: -33,-17
         - node:
             cleanable: True
             color: '#FFFFFF35'
             id: BrickTileSteelLineW
           decals:
-            6128: 81,-34
+            6124: 81,-34
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineW
@@ -1632,18 +1635,18 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNe
           decals:
-            6696: 52,-26
+            6690: 52,-26
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteCornerNe
           decals:
-            2850: -4,14
+            2846: -4,14
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteCornerNe
           decals:
-            2986: -25,38
+            2982: -25,38
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerNw
@@ -1660,19 +1663,19 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNw
           decals:
-            6695: 51,-26
+            6689: 51,-26
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteCornerNw
           decals:
-            2206: -54,9
-            2849: -2,14
+            2202: -54,9
+            2845: -2,14
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteCornerNw
           decals:
-            2985: -30,38
+            2981: -30,38
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerSe
@@ -1691,7 +1694,7 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSe
           decals:
-            6694: 52,-27
+            6688: 52,-27
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerSw
@@ -1707,12 +1710,12 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSw
           decals:
-            6697: 51,-27
+            6691: 51,-27
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteEndE
           decals:
-            2872: 63,9
+            2868: 63,9
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerNe
@@ -1726,8 +1729,8 @@ entities:
           decals:
             1480: 41,5
             1758: 57,-7
-            6373: 48,-1
-            6390: 49,-7
+            6368: 48,-1
+            6385: 49,-7
         - node:
             color: '#A4610696'
             id: BrickTileWhiteInnerNe
@@ -1753,8 +1756,8 @@ entities:
             id: BrickTileWhiteInnerNw
           decals:
             1479: 45,5
-            6372: 52,-1
-            6389: 51,-7
+            6367: 52,-1
+            6384: 51,-7
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteInnerNw
@@ -1770,9 +1773,9 @@ entities:
             id: BrickTileWhiteInnerSe
           decals:
             1482: 45,4
-            6371: 48,-8
-            6388: 49,-2
-            6392: 50,-8
+            6366: 48,-8
+            6383: 49,-2
+            6387: 50,-8
         - node:
             color: '#A4610696'
             id: BrickTileWhiteInnerSe
@@ -1797,9 +1800,9 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteInnerSw
           decals:
-            6370: 52,-8
-            6387: 51,-2
-            6391: 50,-8
+            6365: 52,-8
+            6382: 51,-2
+            6386: 50,-8
         - node:
             color: '#A4610696'
             id: BrickTileWhiteInnerSw
@@ -1830,9 +1833,9 @@ entities:
             color: '#52B4E93E'
             id: BrickTileWhiteLineE
           decals:
-            6852: 51,6
-            6853: 51,6
-            6854: 51,6
+            6843: 51,6
+            6844: 51,6
+            6845: 51,6
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineE
@@ -1840,42 +1843,42 @@ entities:
             1755: 57,-6
             1756: 57,-5
             1757: 57,-4
-            6275: 42,9
-            6276: 42,7
-            6282: 47,9
-            6283: 47,8
-            6284: 47,7
-            6300: 51,1
-            6301: 51,2
-            6302: 51,3
-            6303: 51,4
-            6305: 51,7
-            6306: 51,8
-            6307: 51,9
-            6308: 51,10
-            6309: 51,11
-            6310: 51,12
-            6311: 51,13
-            6312: 51,14
-            6313: 51,15
-            6318: 56,10
-            6319: 56,11
-            6320: 56,12
-            6324: 56,6
-            6325: 56,7
-            6326: 56,8
-            6362: 52,-1
-            6363: 52,-2
-            6364: 52,-3
-            6365: 52,-4
-            6366: 52,-5
-            6367: 52,-6
-            6368: 52,-7
-            6369: 52,-8
-            6383: 49,-6
-            6384: 49,-5
-            6385: 49,-4
-            6386: 49,-3
+            6271: 42,9
+            6272: 42,7
+            6278: 47,9
+            6279: 47,8
+            6280: 47,7
+            6296: 51,1
+            6297: 51,2
+            6298: 51,3
+            6299: 51,4
+            6300: 51,7
+            6301: 51,8
+            6302: 51,9
+            6303: 51,10
+            6304: 51,11
+            6305: 51,12
+            6306: 51,13
+            6307: 51,14
+            6308: 51,15
+            6313: 56,10
+            6314: 56,11
+            6315: 56,12
+            6319: 56,6
+            6320: 56,7
+            6321: 56,8
+            6357: 52,-1
+            6358: 52,-2
+            6359: 52,-3
+            6360: 52,-4
+            6361: 52,-5
+            6362: 52,-6
+            6363: 52,-7
+            6364: 52,-8
+            6378: 49,-6
+            6379: 49,-5
+            6380: 49,-4
+            6381: 49,-3
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineE
@@ -1935,9 +1938,9 @@ entities:
             1137: -1,24
             1144: -1,25
             1325: -18,28
-            6631: -37,-44
-            6632: -37,-45
-            6645: -37,-46
+            6625: -37,-44
+            6626: -37,-45
+            6639: -37,-46
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineE
@@ -1948,20 +1951,20 @@ entities:
             1459: 41,12
             1469: 47,13
             1470: 47,11
-            2183: -4,-37
-            2184: -4,-35
-            2887: -39,-38
+            2179: -4,-37
+            2180: -4,-35
+            2883: -39,-38
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteLineE
           decals:
-            2984: -25,37
-            2991: -32,38
-            2992: -32,37
-            2993: -32,36
-            2994: -32,35
-            2995: -32,34
+            2980: -25,37
+            2987: -32,38
+            2988: -32,37
+            2989: -32,36
+            2990: -32,35
+            2991: -32,34
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineE
@@ -2006,16 +2009,16 @@ entities:
             1752: 59,-7
             1753: 60,-7
             1754: 61,-7
-            6335: 53,3
-            6336: 54,3
-            6337: 55,3
-            6338: 57,3
-            6374: 51,-1
-            6375: 50,-1
-            6376: 49,-1
-            6396: 49,-10
-            6397: 50,-10
-            6398: 51,-10
+            6330: 53,3
+            6331: 54,3
+            6332: 55,3
+            6333: 57,3
+            6369: 51,-1
+            6370: 50,-1
+            6371: 49,-1
+            6391: 49,-10
+            6392: 50,-10
+            6393: 51,-10
         - node:
             color: '#79150096'
             id: BrickTileWhiteLineN
@@ -2053,8 +2056,8 @@ entities:
             1845: 75,-13
             1846: 77,-17
             1847: 75,-17
-            3179: 76,-13
-            3182: 76,-17
+            3175: 76,-13
+            3178: 76,-17
         - node:
             color: '#D4D4D496'
             id: BrickTileWhiteLineN
@@ -2088,28 +2091,28 @@ entities:
             1453: 43,11
             1454: 46,11
             1455: 45,11
-            2180: 0,-35
-            2181: 1,-35
-            2207: -53,9
-            2885: -62,-21
-            2886: -61,-21
+            2176: 0,-35
+            2177: 1,-35
+            2203: -53,9
+            2881: -62,-21
+            2882: -61,-21
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteLineN
           decals:
-            2987: -29,38
-            2988: -28,38
-            2989: -27,38
-            2990: -26,38
+            2983: -29,38
+            2984: -28,38
+            2985: -27,38
+            2986: -26,38
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineN
           decals:
-            2237: 13,25
-            2238: 14,25
-            2239: 15,25
-            6174: 14,22
+            2233: 13,25
+            2234: 14,25
+            2235: 15,25
+            6170: 14,22
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineS
@@ -2123,8 +2126,8 @@ entities:
             1975: 19,-39
             1976: 20,-39
             1977: 21,-39
-            6675: 52,-37
-            6676: 51,-37
+            6669: 52,-37
+            6670: 51,-37
         - node:
             color: '#474F52A7'
             id: BrickTileWhiteLineS
@@ -2146,17 +2149,17 @@ entities:
             1720: 60,0
             1721: 59,0
             2012: 24,-46
-            6339: 57,2
-            6340: 56,2
-            6341: 55,2
-            6342: 54,2
-            6343: 53,2
-            6377: 49,-8
-            6378: 51,-8
-            6393: 48,-11
-            6394: 51,-11
-            6395: 53,-11
-            6401: 50,-11
+            6334: 57,2
+            6335: 56,2
+            6336: 55,2
+            6337: 54,2
+            6338: 53,2
+            6372: 49,-8
+            6373: 51,-8
+            6388: 48,-11
+            6389: 51,-11
+            6390: 53,-11
+            6396: 50,-11
         - node:
             color: '#79150096'
             id: BrickTileWhiteLineS
@@ -2207,8 +2210,8 @@ entities:
             1850: 75,-15
             1851: 77,-15
             2013: 25,-43
-            3180: 76,-15
-            3181: 76,-19
+            3176: 76,-15
+            3177: 76,-19
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineS
@@ -2242,11 +2245,11 @@ entities:
             1457: 45,13
             1458: 46,13
             2011: 25,-46
-            2153: 9,-41
-            2861: 61,-31
-            2862: 62,-31
-            2863: 63,-31
-            6202: 42,13
+            2149: 9,-41
+            2857: 61,-31
+            2858: 62,-31
+            2859: 63,-31
+            6198: 42,13
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineS
@@ -2269,41 +2272,41 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteLineW
           decals:
-            6277: 46,7
-            6278: 46,9
-            6279: 41,9
-            6280: 41,8
-            6281: 41,7
-            6285: 49,1
-            6286: 49,2
-            6287: 49,3
-            6288: 49,4
-            6289: 49,5
-            6290: 49,6
-            6291: 49,7
-            6292: 49,8
-            6293: 49,9
-            6294: 49,10
-            6295: 49,11
-            6296: 49,12
-            6297: 49,13
-            6298: 49,14
-            6299: 49,15
-            6321: 53,6
-            6322: 53,7
-            6323: 53,8
-            6354: 48,-8
-            6355: 48,-7
-            6356: 48,-6
-            6357: 48,-5
-            6358: 48,-4
-            6359: 48,-3
-            6360: 48,-2
-            6361: 48,-1
-            6379: 51,-6
-            6380: 51,-5
-            6381: 51,-4
-            6382: 51,-3
+            6273: 46,7
+            6274: 46,9
+            6275: 41,9
+            6276: 41,8
+            6277: 41,7
+            6281: 49,1
+            6282: 49,2
+            6283: 49,3
+            6284: 49,4
+            6285: 49,5
+            6286: 49,6
+            6287: 49,7
+            6288: 49,8
+            6289: 49,9
+            6290: 49,10
+            6291: 49,11
+            6292: 49,12
+            6293: 49,13
+            6294: 49,14
+            6295: 49,15
+            6316: 53,6
+            6317: 53,7
+            6318: 53,8
+            6349: 48,-8
+            6350: 48,-7
+            6351: 48,-6
+            6352: 48,-5
+            6353: 48,-4
+            6354: 48,-3
+            6355: 48,-2
+            6356: 48,-1
+            6374: 51,-6
+            6375: 51,-5
+            6376: 51,-4
+            6377: 51,-3
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineW
@@ -2366,10 +2369,10 @@ entities:
             color: '#EFB34131'
             id: BrickTileWhiteLineW
           decals:
-            6822: 14,39
-            6823: 14,40
-            6824: 14,41
-            6825: 14,42
+            6816: 14,39
+            6817: 14,40
+            6818: 14,41
+            6819: 14,42
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineW
@@ -2386,29 +2389,29 @@ entities:
             1471: 41,11
             1472: 41,12
             1473: 41,13
-            2151: 8,-40
-            2152: 8,-39
-            2182: -2,-36
-            2185: -6,-37
-            2186: -6,-36
-            2187: -6,-35
-            2196: 39,-15
-            2197: 39,-17
-            2198: 39,-16
-            2879: -22,34
-            2880: -22,35
+            2147: 8,-40
+            2148: 8,-39
+            2178: -2,-36
+            2181: -6,-37
+            2182: -6,-36
+            2183: -6,-35
+            2192: 39,-15
+            2193: 39,-17
+            2194: 39,-16
+            2875: -22,34
+            2876: -22,35
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteLineW
           decals:
-            2982: -30,36
-            2983: -30,37
-            2996: -34,34
-            2997: -34,35
-            2998: -34,36
-            2999: -34,37
-            3000: -34,38
+            2978: -30,36
+            2979: -30,37
+            2992: -34,34
+            2993: -34,35
+            2994: -34,36
+            2995: -34,37
+            2996: -34,38
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineW
@@ -2446,7 +2449,7 @@ entities:
             866: -48,-2
             1107: 42,-30
             1485: -49,-49
-            2251: 24,1
+            2247: 24,1
         - node:
             color: '#FFFFFFFF'
             id: BushCTwo
@@ -2461,7 +2464,7 @@ entities:
             color: '#FFFFFFFF'
             id: BushCTwo
           decals:
-            3031: 81,-8
+            3027: 81,-8
         - node:
             color: '#FFFFFFFF'
             id: BushDTwo
@@ -2480,7 +2483,7 @@ entities:
             color: '#FFFFFFFF'
             id: Busha1
           decals:
-            3032: 82,-6
+            3028: 82,-6
         - node:
             color: '#FFFFFFFF'
             id: Busha2
@@ -2509,7 +2512,7 @@ entities:
             color: '#FFFFFFFF'
             id: Bushb1
           decals:
-            3029: 81,-7
+            3025: 81,-7
         - node:
             color: '#FFFFFFFF'
             id: Bushb2
@@ -2540,21 +2543,21 @@ entities:
             color: '#FFFFFFFF'
             id: Bushc1
           decals:
-            3030: 82,-7
+            3026: 82,-7
         - node:
             color: '#FFFFFFFF'
             id: Bushc2
           decals:
             528: -28,6
             1487: -47,-49
-            2253: 25,1
+            2249: 25,1
         - node:
             color: '#FFFFFFFF'
             id: Bushc3
           decals:
             35: -5,-12
             1484: -51,-49
-            2252: 26,1
+            2248: 26,1
         - node:
             color: '#FFFFFFFF'
             id: Bushd2
@@ -2591,7 +2594,7 @@ entities:
             color: '#FFFFFFFF'
             id: Bushi1
           decals:
-            3035: 80,-7
+            3031: 80,-7
         - node:
             color: '#FFFFFFFF'
             id: Bushi2
@@ -2602,7 +2605,7 @@ entities:
             914: -51,-9
             1935: 54,-22
             1954: 53.45864,-23.10261
-            2254: 24,1
+            2250: 24,1
         - node:
             color: '#FFFFFFFF'
             id: Bushi3
@@ -2615,7 +2618,7 @@ entities:
             color: '#FFFFFFFF'
             id: Bushi3
           decals:
-            3033: 82,-8
+            3029: 82,-8
         - node:
             color: '#FFFFFFFF'
             id: Bushi4
@@ -2632,7 +2635,7 @@ entities:
             color: '#FFFFFFFF'
             id: Bushi4
           decals:
-            3034: 81,-6
+            3030: 81,-6
         - node:
             color: '#FFFFFFFF'
             id: Bushj3
@@ -2672,8 +2675,8 @@ entities:
             1466: 44,12
             1467: 45,12
             1468: 46,12
-            6205: 46,15
-            6206: 46,14
+            6201: 46,15
+            6202: 46,14
         - node:
             color: '#334E6DC8'
             id: CheckerNWSE
@@ -2686,14 +2689,14 @@ entities:
             color: '#474F528F'
             id: CheckerNWSE
           decals:
-            2229: -17,11
-            2230: -16,11
-            2231: -16,12
-            2232: -17,12
-            2233: -17,13
-            2234: -16,13
-            2235: -16,14
-            2236: -17,14
+            2225: -17,11
+            2226: -16,11
+            2227: -16,12
+            2228: -17,12
+            2229: -17,13
+            2230: -16,13
+            2231: -16,14
+            2232: -17,14
         - node:
             color: '#52B4E996'
             id: CheckerNWSE
@@ -2713,21 +2716,21 @@ entities:
             color: '#DE3A3A41'
             id: CheckerNWSE
           decals:
-            6633: -36,-46
-            6634: -36,-45
-            6635: -36,-44
-            6636: -35,-44
-            6637: -35,-45
-            6638: -35,-46
+            6627: -36,-46
+            6628: -36,-45
+            6629: -36,-44
+            6630: -35,-44
+            6631: -35,-45
+            6632: -35,-46
         - node:
             color: '#EFB34131'
             id: CheckerNWSE
           decals:
-            6773: 13,40
-            6774: 13,39
-            6775: 13,41
-            6776: 13,42
-            6821: 15,40
+            6767: 13,40
+            6768: 13,39
+            6769: 13,41
+            6770: 13,42
+            6815: 15,40
         - node:
             color: '#EFB34196'
             id: CheckerNWSE
@@ -2738,65 +2741,65 @@ entities:
             149: -2,-27
             150: -3,-27
             151: -3,-28
-            2191: 37,-15
-            2192: 37,-16
-            2193: 37,-17
-            2194: 38,-16
-            2195: 38,-15
-            2199: 38,-17
-            2200: 38,6
-            2201: 38,7
-            2202: -54,10
-            2203: -53,10
-            2204: -55,10
-            2205: -55,9
-            2845: -4,15
-            2846: -3,15
-            2847: -2,15
-            2848: -3,14
-            2851: -38,-54
-            2852: -38,-53
-            2853: -37,-53
-            2854: -37,-54
-            2855: 61,-32
-            2856: 62,-32
-            2857: 63,-32
-            2858: 63,-33
-            2859: 62,-33
-            2860: 61,-33
-            2864: 63,10
-            2865: 64,10
-            2866: 65,10
-            2867: 65,9
-            2868: 65,8
-            2869: 64,8
-            2870: 63,8
-            2871: 64,9
-            2877: -23,34
-            2878: -23,35
-            2881: 14,-39
-            2882: 15,-39
-            2883: -61,-20
-            2884: -62,-20
-            2888: -38,-38
-            6686: 51,-30
-            6687: 51,-29
-            6688: 52,-29
-            6689: 52,-30
+            2187: 37,-15
+            2188: 37,-16
+            2189: 37,-17
+            2190: 38,-16
+            2191: 38,-15
+            2195: 38,-17
+            2196: 38,6
+            2197: 38,7
+            2198: -54,10
+            2199: -53,10
+            2200: -55,10
+            2201: -55,9
+            2841: -4,15
+            2842: -3,15
+            2843: -2,15
+            2844: -3,14
+            2847: -38,-54
+            2848: -38,-53
+            2849: -37,-53
+            2850: -37,-54
+            2851: 61,-32
+            2852: 62,-32
+            2853: 63,-32
+            2854: 63,-33
+            2855: 62,-33
+            2856: 61,-33
+            2860: 63,10
+            2861: 64,10
+            2862: 65,10
+            2863: 65,9
+            2864: 65,8
+            2865: 64,8
+            2866: 63,8
+            2867: 64,9
+            2873: -23,34
+            2874: -23,35
+            2877: 14,-39
+            2878: 15,-39
+            2879: -61,-20
+            2880: -62,-20
+            2884: -38,-38
+            6680: 51,-30
+            6681: 51,-29
+            6682: 52,-29
+            6683: 52,-30
         - node:
             color: '#D4D4D496'
             id: Delivery
           decals:
-            6569: 0,30
-            6570: 0,31
+            6563: 0,30
+            6564: 0,31
         - node:
             color: '#DE3A3A41'
             id: Delivery
           decals:
-            6641: -38,-46
-            6642: -38,-46
-            6643: -38,-44
-            6644: -38,-44
+            6635: -38,-46
+            6636: -38,-46
+            6637: -38,-44
+            6638: -38,-44
         - node:
             color: '#DE3A3A96'
             id: Delivery
@@ -2811,17 +2814,17 @@ entities:
             color: '#EFB34131'
             id: Delivery
           decals:
-            6817: 15,41
-            6818: 15,41
-            6819: 15,41
-            6820: 15,41
+            6811: 15,41
+            6812: 15,41
+            6813: 15,41
+            6814: 15,41
         - node:
             color: '#EFB34196'
             id: Delivery
           decals:
             60: -7,-20
-            6217: 47,16
-            6218: 47,16
+            6213: 47,16
+            6214: 47,16
         - node:
             color: '#EFB341FF'
             id: Delivery
@@ -2878,136 +2881,136 @@ entities:
             1993: 26,-38
             1996: 31,-37
             1997: 31,-38
-            2163: 8,-41
-            3073: 3,20
-            3074: -9,19
-            3075: -9,20
-            3076: -9,21
-            3077: -17,21
-            3078: -17,20
-            3079: -17,19
-            3080: 3,21
-            3081: 3,19
-            3082: 17,19
-            3083: 17,20
-            3084: 17,21
-            3085: 19,17
-            3086: 21,17
-            3087: 20,17
-            3088: 21,6
-            3089: 20,6
-            3090: 19,6
-            3091: 29,2
-            3092: 29,4
-            3093: 29,3
-            3094: 39,2
-            3095: 39,3
-            3096: 39,4
-            3097: 43,0
-            3098: 42,0
-            3099: 41,0
-            3100: 43,-14
-            3101: 42,-14
-            3102: 41,-14
-            3103: 46,-21
-            3104: 46,-19
-            3105: 46,-20
-            3106: 38,-19
-            3107: 38,-21
-            3108: 38,-20
-            3109: 30,-21
-            3110: 30,-20
-            3111: 30,-19
-            3112: 30,-20
-            3113: 21,-28
-            3114: 20,-28
-            3115: 19,-28
-            3116: 18,-32
-            3117: 18,-33
-            3118: 18,-34
-            3119: 10,-34
-            3120: 10,-33
-            3121: 10,-32
-            3122: 4,-32
-            3123: 4,-31
-            3124: 4,-30
-            3125: -9,-32
-            3126: -9,-31
-            3127: -9,-30
-            3128: -20,-32
-            3129: -20,-30
-            3130: -20,-31
-            3131: -24,-22
-            3132: -25,-22
-            3133: -26,-22
-            3134: -42,-29
-            3135: -42,-28
-            3136: -27,-29
-            3137: -27,-28
-            3138: -26,-12
-            3139: -25,-12
-            3140: -24,-12
-            3141: -23,-6
-            3142: -24,-6
-            3143: -25,-6
-            3144: -25,10
-            3145: -26,10
-            3146: -27,10
-            3147: -42,0
-            3148: -42,1
-            3149: -42,2
-            3150: -53,-5
-            3151: -54,-5
-            3152: -55,-5
-            3153: -55,-19
-            3154: -54,-19
-            3155: -53,-19
-            3156: -49,-34
-            3157: -47,-34
-            3158: -48,-34
-            3159: -47,-45
-            3160: -48,-45
-            3161: -49,-45
-            3162: -41,-49
-            3163: -42,-49
-            3164: -40,-49
-            3165: -54,-49
-            3166: -55,-49
-            3167: -56,-49
-            3168: -56,-55
-            3169: -55,-55
-            3170: -54,-55
-            3171: -42,-55
-            3172: -41,-55
-            3173: -40,-55
-            6571: 60,-24
-            6572: 60,-23
-            6671: 32,21
+            2159: 8,-41
+            3069: 3,20
+            3070: -9,19
+            3071: -9,20
+            3072: -9,21
+            3073: -17,21
+            3074: -17,20
+            3075: -17,19
+            3076: 3,21
+            3077: 3,19
+            3078: 17,19
+            3079: 17,20
+            3080: 17,21
+            3081: 19,17
+            3082: 21,17
+            3083: 20,17
+            3084: 21,6
+            3085: 20,6
+            3086: 19,6
+            3087: 29,2
+            3088: 29,4
+            3089: 29,3
+            3090: 39,2
+            3091: 39,3
+            3092: 39,4
+            3093: 43,0
+            3094: 42,0
+            3095: 41,0
+            3096: 43,-14
+            3097: 42,-14
+            3098: 41,-14
+            3099: 46,-21
+            3100: 46,-19
+            3101: 46,-20
+            3102: 38,-19
+            3103: 38,-21
+            3104: 38,-20
+            3105: 30,-21
+            3106: 30,-20
+            3107: 30,-19
+            3108: 30,-20
+            3109: 21,-28
+            3110: 20,-28
+            3111: 19,-28
+            3112: 18,-32
+            3113: 18,-33
+            3114: 18,-34
+            3115: 10,-34
+            3116: 10,-33
+            3117: 10,-32
+            3118: 4,-32
+            3119: 4,-31
+            3120: 4,-30
+            3121: -9,-32
+            3122: -9,-31
+            3123: -9,-30
+            3124: -20,-32
+            3125: -20,-30
+            3126: -20,-31
+            3127: -24,-22
+            3128: -25,-22
+            3129: -26,-22
+            3130: -42,-29
+            3131: -42,-28
+            3132: -27,-29
+            3133: -27,-28
+            3134: -26,-12
+            3135: -25,-12
+            3136: -24,-12
+            3137: -23,-6
+            3138: -24,-6
+            3139: -25,-6
+            3140: -25,10
+            3141: -26,10
+            3142: -27,10
+            3143: -42,0
+            3144: -42,1
+            3145: -42,2
+            3146: -53,-5
+            3147: -54,-5
+            3148: -55,-5
+            3149: -55,-19
+            3150: -54,-19
+            3151: -53,-19
+            3152: -49,-34
+            3153: -47,-34
+            3154: -48,-34
+            3155: -47,-45
+            3156: -48,-45
+            3157: -49,-45
+            3158: -41,-49
+            3159: -42,-49
+            3160: -40,-49
+            3161: -54,-49
+            3162: -55,-49
+            3163: -56,-49
+            3164: -56,-55
+            3165: -55,-55
+            3166: -54,-55
+            3167: -42,-55
+            3168: -41,-55
+            3169: -40,-55
+            6565: 60,-24
+            6566: 60,-23
+            6665: 32,21
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Delivery
           decals:
-            3006: 24,5
-            3007: 25,5
-            3008: 26,5
-            3009: 14,1
-            3010: 14,-12
-            3011: 0,14
-            3012: -6,14
+            3002: 24,5
+            3003: 25,5
+            3004: 26,5
+            3005: 14,1
+            3006: 14,-12
+            3007: 0,14
+            3008: -6,14
         - node:
             color: '#52B4E996'
             id: DeliveryGreyscale
           decals:
             1759: 59,-5
             1760: 61,-5
-            6331: 48,2
-            6332: 48,2
-            6333: 48,1
-            6334: 48,1
-            6565: 50,-5
-            6566: 50,-5
+            6326: 48,2
+            6327: 48,2
+            6328: 48,1
+            6329: 48,1
+            6559: 50,-5
+            6560: 50,-5
         - node:
             color: '#DE3A3A96'
             id: DeliveryGreyscale
@@ -3018,3398 +3021,3396 @@ entities:
             color: '#FFFFFFFF'
             id: DeliveryGreyscale
           decals:
-            2240: 9,23
-            2241: 9,24
+            2236: 9,23
+            2237: 9,24
         - node:
             cleanable: True
             color: '#835432FF'
             id: Dirt
           decals:
-            2891: -37,28
-            2892: -36,27
-            2893: -37,27
-            2894: -37,25
-            2895: -37,24
-            2896: -36,25
-            2897: -36,24
-            2898: -36,25
-            2899: -38,28
-            2900: -39,29
-            2901: -40,28
-            2902: -38,28
-            2903: -37,27
-            2904: -37,28
-            2905: -37,27
-            2906: -36,25
-            2907: -36,24
-            2908: -34,24
-            2909: -34,23
-            2910: -34,22
-            2911: -36,22
-            2912: -37,22
-            2913: -36,24
-            2914: -37,24
-            2915: -36,23
-            2916: -37,25
-            2917: -36,25
-            2918: -37,26
-            2919: -38,27
-            2920: -38,28
-            2921: -39,27
-            2922: -39,26
-            2923: -39,26
+            2887: -37,28
+            2888: -36,27
+            2889: -37,27
+            2890: -37,25
+            2891: -37,24
+            2892: -36,25
+            2893: -36,24
+            2894: -36,25
+            2895: -38,28
+            2896: -39,29
+            2897: -40,28
+            2898: -38,28
+            2899: -37,27
+            2900: -37,28
+            2901: -37,27
+            2902: -36,25
+            2903: -36,24
+            2904: -34,24
+            2905: -34,23
+            2906: -34,22
+            2907: -36,22
+            2908: -37,22
+            2909: -36,24
+            2910: -37,24
+            2911: -36,23
+            2912: -37,25
+            2913: -36,25
+            2914: -37,26
+            2915: -38,27
+            2916: -38,28
+            2917: -39,27
+            2918: -39,26
+            2919: -39,26
         - node:
             cleanable: True
             color: '#A4610696'
             id: Dirt
           decals:
-            5462: -34,-26
-            5463: -37,-25
-            5464: -39,-28
-            5465: -40,-28
-            5466: -40,-31
-            5467: -39,-33
-            5468: -37,-33
-            5469: -32,-33
-            5470: -29,-33
-            5471: -29,-31
-            5472: -30,-28
-            5473: -29,-27
-            5474: -25,-30
-            5475: -25,-27
-            5476: -25,-26
-            5477: -25,-23
-            5478: -24,-21
-            5479: -25,-18
-            5480: -29,-20
-            5481: -29,-19
-            5482: -33,-19
-            5483: -33,-20
-            5484: -31,-14
-            5485: -29,-15
-            5486: -33,-16
-            5487: -29,-13
-            5488: -29,-11
-            5489: -38,-11
-            5490: -37,-15
-            5491: -36,-16
-            5492: -40,-10
-            5493: -38,-17
-            5494: -47,-8
-            5495: -45,0
-            5496: -47,0
-            5497: -44,2
-            5498: -48,-2
-            5499: -47,-1
-            5500: -49,3
-            5501: -50,-1
-            5502: -45,1
-            5503: -53,4
-            5504: -48,5
-            5505: -50,6
-            5506: -47,1
-            5507: -38,-1
-            5508: -36,1
-            5509: -35,-1
-            5510: -32,-1
-            5511: -33,0
-            5512: -33,-3
-            5513: -24,-2
-            5514: -28,3
-            5515: -26,3
-            5516: -26,8
-            5517: -27,13
-            5518: -26,14
-            5519: -26,18
-            5520: -33,13
-            5521: -32,15
-            5522: -32,14
-            5523: -22,13
-            5524: -20,12
-            5525: -22,13
-            5526: -24,19
-            5527: -20,20
-            5528: -18,19
-            5529: -16,20
-            5530: -13,19
-            5531: -15,24
-            5532: -14,24
-            5533: -13,27
-            5534: -14,28
-            5535: -13,27
-            5536: -5,28
-            5537: -20,28
-            5538: -18,25
-            5539: -13,31
-            5540: -15,32
-            5541: -14,34
-            5542: -17,32
-            5543: -8,32
-            5544: -8,32
-            5545: -6,33
-            5546: -6,27
-            5547: -3,28
-            5548: -1,30
-            5549: -2,33
-            5550: -2,33
-            5551: -2,36
-            5552: -2,43
-            5553: -7,42
-            5554: -5,45
-            5555: -3,47
-            5556: 0,45
-            5557: -2,47
-            5558: -1,47
-            5559: -2,51
-            5560: 1,51
-            5561: -1,52
-            5562: 1,52
-            5563: 2,45
-            5564: 2,47
-            5565: 2,42
-            5566: 1,40
-            5567: 6,41
-            5568: 8,39
-            5569: 6,41
-            5570: 5,31
-            5571: 3,31
-            5572: 5,30
-            5573: 4,30
-            5574: 3,26
-            5575: 2,27
-            5576: 4,25
-            5577: 3,23
-            5578: 2,24
-            5579: 1,23
-            5580: -2,24
-            5581: 1,21
-            5582: -1,19
-            5583: 4,20
-            5584: 9,20
-            5585: 9,20
-            5586: 15,19
-            5587: 11,24
-            5588: 14,23
-            5589: 14,25
-            5590: 15,24
-            5591: 14,29
-            5592: 14,31
-            5593: 17,25
-            5594: 17,23
-            5595: 16,20
-            5596: 20,20
-            5597: 20,18
-            5598: 20,15
-            5599: 21,15
-            5600: 20,12
-            5601: 22,12
-            5602: 20,11
-            5603: 27,12
-            5604: 27,11
-            5605: 26,14
-            5606: 25,19
-            5607: 30,19
-            5608: 31,16
-            5609: 31,12
-            5610: 35,14
-            5611: 35,14
-            5612: 35,14
-            5613: 32,8
-            5614: 34,9
-            5615: 32,7
-            5616: 26,7
-            5617: 24,7
-            5618: 24,3
-            5619: 24,2
-            5620: 23,2
-            5621: 20,6
-            5622: 20,9
-            5623: 23,3
-            5624: 32,3
-            5625: 34,2
-            5626: 32,-2
-            5627: 32,-2
-            5628: 32,-4
-            5629: 37,-4
-            5630: 36,3
-            5631: 42,2
-            5632: 38,-2
-            5633: 42,-5
-            5634: 42,-2
-            5635: 42,-4
-            5636: 43,6
-            5637: 44,12
-            5638: 43,11
-            5639: 46,12
-            5640: 44,12
-            5641: 52,12
-            5642: 50,14
-            5643: 50,7
-            5644: 53,14
-            5645: 59,15
-            5646: 60,17
-            5647: 55,7
-            5648: 54,7
-            5649: 50,7
-            5650: 49,0
-            5651: 45,-1
-            5652: 46,-5
-            5653: 46,-8
-            5654: 50,-4
-            5655: 50,-7
-            5656: 55,-5
-            5657: 53,-5
-            5658: 58,-6
-            5659: 61,-5
-            5660: 59,-7
-            5661: 59,-7
-            5662: 60,-6
-            5663: 59,-14
-            5664: 60,-14
-            5665: 59,-14
-            5666: 59,-18
-            5667: 59,-20
-            5668: 60,-18
-            5669: 60,-17
-            5670: 64,-13
-            5671: 64,-17
-            5672: 65,-19
-            5673: 64,-19
-            5674: 64,-25
-            5675: 65,-24
-            5676: 63,-26
-            5677: 63,-24
-            5678: 62,-26
-            5679: 64,-26
-            5680: 70,-28
-            5681: 71,-26
-            5682: 69,-27
-            5683: 69,-23
-            5684: 70,-24
-            5685: 69,-22
-            5686: 66,-18
-            5687: 70,-18
-            5688: 71,-17
-            5689: 69,-13
-            5690: 71,-14
-            5691: 69,-12
-            5692: 70,-14
-            5693: 76,-17
-            5694: 77,-18
-            5695: 74,-15
-            5696: 76,-14
-            5697: 74,-14
-            5698: 68,-8
-            5699: 70,-10
-            5700: 76,-6
-            5701: 48,-25
-            5702: 48,-26
-            5703: 48,-27
-            5704: 48,-30
-            5705: 48,-31
-            5706: 47,-31
-            5707: 49,-34
-            5708: 47,-36
-            5709: 46,-36
-            5710: 44,-37
-            5711: 42,-35
-            5712: 42,-36
-            5713: 38,-36
-            5714: 38,-35
-            5715: 37,-37
-            5716: 32,-35
-            5717: 32,-36
-            5718: 32,-33
-            5719: 33,-31
-            5720: 32,-31
-            5721: 33,-27
-            5722: 32,-25
-            5723: 33,-24
-            5724: 35,-26
-            5725: 37,-26
-            5726: 41,-25
-            5727: 40,-26
-            5728: 41,-29
-            5729: 40,-29
-            5730: 40,-31
-            5731: 43,-29
-            5732: 44,-31
-            5733: 45,-30
-            5734: 27,-34
-            5735: 25,-34
-            5736: 24,-32
-            5737: 26,-29
-            5738: 23,-29
-            5739: 23,-31
-            5740: 25,-38
-            5741: 24,-37
-            5742: 22,-38
-            5743: 21,-37
-            5744: 21,-38
-            5745: 29,-39
-            5746: 28,-41
-            5747: 29,-44
-            5748: 28,-42
-            5749: 28,-45
-            5750: 26,-45
-            5751: 27,-44
-            5752: 24,-43
-            5753: 25,-46
-            5754: 27,-45
-            5755: 25,-46
-            5756: 32,-30
-            5757: 33,-28
-            5758: 36,-26
-            5759: 35,-26
-            5760: 36,-23
-            5761: 36,-30
-            5762: 42,-28
-            5763: 43,-29
-            5764: 52,-31
-            5765: 52,-35
-            5766: 55,-29
-            5767: 55,-30
-            5768: 57,-30
-            5769: 55,-34
-            5770: 55,-34
-            5771: 55,-36
-            5772: 57,-34
-            5773: 20,-45
-            5774: 17,-44
-            5775: 18,-45
-            5776: 19,-46
-            5777: 18,-48
-            5778: 19,-49
-            5779: 18,-50
-            5780: 20,-53
-            5781: 18,-54
-            5782: 17,-54
-            5783: 16,-54
-            5784: 16,-58
-            5785: 16,-59
-            5786: 19,-58
-            5787: 21,-58
-            5788: 21,-59
-            5789: 13,-47
-            5790: 14,-47
-            5791: 13,-48
-            5792: 13,-45
-            5793: 12,-45
-            5794: 9,-45
-            5795: 8,-45
-            5796: 10,-39
-            5797: 11,-39
-            5798: 0,-37
-            5799: 0,-36
-            5800: 1,-36
-            5801: 2,-38
-            5802: 0,-36
-            5803: -1,-37
-            5804: -2,-36
-            5805: -5,-36
-            5806: -4,-36
-            5807: -6,-36
-            5808: -7,-32
-            5809: -8,-32
-            5810: -7,-30
-            5811: -11,-31
-            5812: -12,-32
-            5813: -15,-32
-            5814: -16,-32
-            5815: -13,-30
-            5816: -16,-30
-            5817: -17,-30
-            5818: -22,-30
-            5819: -23,-30
-            5820: -24,-30
-            5821: -24,-29
-            5822: -24,-28
-            5823: -22,-32
-            5824: -24,-32
-            5825: -25,-32
-            5826: -26,-30
-            5827: -26,-28
-            5828: -26,-26
-            5829: -26,-24
-            5830: -24,-24
-            5831: -24,-22
-            5832: -24,-19
-            5833: -26,-21
-            5834: -26,-18
-            5835: -26,-17
-            5836: -24,-14
-            5837: -25,-15
-            5838: -27,-15
-            5839: -30,-15
-            5840: -30,-15
-            5841: -34,-15
-            5842: -35,-14
-            5843: -37,-15
-            5844: -38,-14
-            5845: -35,-15
-            5846: -34,-14
-            5847: -37,-10
-            5848: -38,-10
-            5849: -36,-9
-            5850: -29,-10
-            5851: -29,-11
-            5852: -33,-20
-            5853: -34,-20
-            5854: -33,-18
-            5855: -32,-20
-            5856: -34,-19
-            5857: -33,-18
-            5858: -29,-19
-            5859: -30,-21
-            5860: -29,-19
-            5861: -30,-20
-            5862: -37,-18
-            5863: -40,-18
-            5864: -39,-20
-            5865: -37,-19
-            5866: -39,-19
-            5867: -32,-26
-            5868: -35,-25
-            5869: -39,-26
-            5870: -39,-26
-            5871: -39,-27
-            5872: -40,-28
-            5873: -38,-30
-            5874: -39,-32
-            5875: -39,-33
-            5876: -37,-33
-            5877: -34,-33
-            5878: -31,-33
-            5879: -34,-34
-            5880: -30,-33
-            5881: -30,-31
-            5882: -31,-28
-            5883: -29,-27
-            5884: -29,-30
-            5885: -43,-30
-            5886: -44,-28
-            5887: -45,-31
-            5888: -46,-27
-            5889: -45,-25
-            5890: -45,-25
-            5891: -47,-25
-            5892: -49,-25
-            5893: -51,-26
-            5894: -50,-29
-            5895: -51,-30
-            5896: -51,-30
-            5897: -50,-32
-            5898: -47,-32
-            5899: -48,-33
-            5900: -44,-31
-            5901: -44,-29
-            5902: -55,-25
-            5903: -56,-25
-            5904: -55,-29
-            5905: -56,-29
-            5906: -55,-29
-            5907: -60,-27
-            5908: -60,-29
-            5909: -62,-27
-            5910: -61,-21
-            5911: -61,-21
-            5912: -54,-21
-            5913: -54,-21
-            5914: -55,-16
-            5915: -53,-14
-            5916: -54,-13
-            5917: -53,-10
-            5918: -54,-7
-            5919: -53,-5
-            5920: -55,-2
-            5921: -54,0
-            5922: -53,1
-            5923: -53,-4
-            5924: -54,-3
-            5925: -54,-4
-            5926: -54,-9
-            5927: -46,-4
-            5928: -47,-4
-            5929: -48,-3
-            5930: -50,0
-            5931: -45,1
-            5932: -47,1
-            5933: -44,1
-            5934: -47,1
-            5935: -46,7
-            5936: -49,7
-            5937: -49,11
-            5938: -46,11
-            5939: -49,10
-            5940: -48,13
-            5941: -45,11
-            5942: -54,10
-            5943: -54,9
-            5944: -53,10
-            5945: -39,1
-            5946: -37,0
-            5947: -39,-1
-            5948: -34,-1
-            5949: -37,-1
-            5950: -36,0
-            5951: -35,2
-            5952: -31,2
-            5953: -31,2
-            5954: -33,1
-            5955: -28,0
-            5956: -30,-1
-            5957: -27,-1
-            5958: -33,-4
-            5959: -27,-5
-            5960: -24,-3
-            5961: -24,1
-            5962: -22,3
-            5963: -23,-2
-            5964: -22,-3
-            5965: -17,-3
-            5966: -19,-3
-            5967: -17,-3
-            5968: -18,-4
-            5969: -14,-4
-            5970: -18,-4
-            5971: -17,-4
-            5972: -17,-4
-            5973: -19,-4
-            5974: -19,-2
-            5975: -19,-2
-            5976: -20,-3
-            5977: -20,-5
-            5978: -16,0
-            5979: -16,1
-            5980: -16,3
-            5981: -15,0
-            5982: -15,6
-            5983: -17,5
-            5984: -15,7
-            5985: -21,5
-            5986: -21,6
-            5987: -20,7
+            5458: -34,-26
+            5459: -37,-25
+            5460: -39,-28
+            5461: -40,-28
+            5462: -40,-31
+            5463: -39,-33
+            5464: -37,-33
+            5465: -32,-33
+            5466: -29,-33
+            5467: -29,-31
+            5468: -30,-28
+            5469: -29,-27
+            5470: -25,-30
+            5471: -25,-27
+            5472: -25,-26
+            5473: -25,-23
+            5474: -24,-21
+            5475: -25,-18
+            5476: -29,-20
+            5477: -29,-19
+            5478: -33,-19
+            5479: -33,-20
+            5480: -31,-14
+            5481: -29,-15
+            5482: -33,-16
+            5483: -29,-13
+            5484: -29,-11
+            5485: -38,-11
+            5486: -37,-15
+            5487: -36,-16
+            5488: -40,-10
+            5489: -38,-17
+            5490: -47,-8
+            5491: -45,0
+            5492: -47,0
+            5493: -44,2
+            5494: -48,-2
+            5495: -47,-1
+            5496: -49,3
+            5497: -50,-1
+            5498: -45,1
+            5499: -53,4
+            5500: -48,5
+            5501: -50,6
+            5502: -47,1
+            5503: -38,-1
+            5504: -36,1
+            5505: -35,-1
+            5506: -32,-1
+            5507: -33,0
+            5508: -33,-3
+            5509: -24,-2
+            5510: -28,3
+            5511: -26,3
+            5512: -26,8
+            5513: -27,13
+            5514: -26,14
+            5515: -26,18
+            5516: -33,13
+            5517: -32,15
+            5518: -32,14
+            5519: -22,13
+            5520: -20,12
+            5521: -22,13
+            5522: -24,19
+            5523: -20,20
+            5524: -18,19
+            5525: -16,20
+            5526: -13,19
+            5527: -15,24
+            5528: -14,24
+            5529: -13,27
+            5530: -14,28
+            5531: -13,27
+            5532: -5,28
+            5533: -20,28
+            5534: -18,25
+            5535: -13,31
+            5536: -15,32
+            5537: -14,34
+            5538: -17,32
+            5539: -8,32
+            5540: -8,32
+            5541: -6,33
+            5542: -6,27
+            5543: -3,28
+            5544: -1,30
+            5545: -2,33
+            5546: -2,33
+            5547: -2,36
+            5548: -2,43
+            5549: -7,42
+            5550: -5,45
+            5551: -3,47
+            5552: 0,45
+            5553: -2,47
+            5554: -1,47
+            5555: -2,51
+            5556: 1,51
+            5557: -1,52
+            5558: 1,52
+            5559: 2,45
+            5560: 2,47
+            5561: 2,42
+            5562: 1,40
+            5563: 6,41
+            5564: 8,39
+            5565: 6,41
+            5566: 5,31
+            5567: 3,31
+            5568: 5,30
+            5569: 4,30
+            5570: 3,26
+            5571: 2,27
+            5572: 4,25
+            5573: 3,23
+            5574: 2,24
+            5575: 1,23
+            5576: -2,24
+            5577: 1,21
+            5578: -1,19
+            5579: 4,20
+            5580: 9,20
+            5581: 9,20
+            5582: 15,19
+            5583: 11,24
+            5584: 14,23
+            5585: 14,25
+            5586: 15,24
+            5587: 14,29
+            5588: 14,31
+            5589: 17,25
+            5590: 17,23
+            5591: 16,20
+            5592: 20,20
+            5593: 20,18
+            5594: 20,15
+            5595: 21,15
+            5596: 20,12
+            5597: 22,12
+            5598: 20,11
+            5599: 27,12
+            5600: 27,11
+            5601: 26,14
+            5602: 25,19
+            5603: 30,19
+            5604: 31,16
+            5605: 31,12
+            5606: 35,14
+            5607: 35,14
+            5608: 35,14
+            5609: 32,8
+            5610: 34,9
+            5611: 32,7
+            5612: 26,7
+            5613: 24,7
+            5614: 24,3
+            5615: 24,2
+            5616: 23,2
+            5617: 20,6
+            5618: 20,9
+            5619: 23,3
+            5620: 32,3
+            5621: 34,2
+            5622: 32,-2
+            5623: 32,-2
+            5624: 32,-4
+            5625: 37,-4
+            5626: 36,3
+            5627: 42,2
+            5628: 38,-2
+            5629: 42,-5
+            5630: 42,-2
+            5631: 42,-4
+            5632: 43,6
+            5633: 44,12
+            5634: 43,11
+            5635: 46,12
+            5636: 44,12
+            5637: 52,12
+            5638: 50,14
+            5639: 50,7
+            5640: 53,14
+            5641: 59,15
+            5642: 60,17
+            5643: 55,7
+            5644: 54,7
+            5645: 50,7
+            5646: 49,0
+            5647: 45,-1
+            5648: 46,-5
+            5649: 46,-8
+            5650: 50,-4
+            5651: 50,-7
+            5652: 55,-5
+            5653: 53,-5
+            5654: 58,-6
+            5655: 61,-5
+            5656: 59,-7
+            5657: 59,-7
+            5658: 60,-6
+            5659: 59,-14
+            5660: 60,-14
+            5661: 59,-14
+            5662: 59,-18
+            5663: 59,-20
+            5664: 60,-18
+            5665: 60,-17
+            5666: 64,-13
+            5667: 64,-17
+            5668: 65,-19
+            5669: 64,-19
+            5670: 64,-25
+            5671: 65,-24
+            5672: 63,-26
+            5673: 63,-24
+            5674: 62,-26
+            5675: 64,-26
+            5676: 70,-28
+            5677: 71,-26
+            5678: 69,-27
+            5679: 69,-23
+            5680: 70,-24
+            5681: 69,-22
+            5682: 66,-18
+            5683: 70,-18
+            5684: 71,-17
+            5685: 69,-13
+            5686: 71,-14
+            5687: 69,-12
+            5688: 70,-14
+            5689: 76,-17
+            5690: 77,-18
+            5691: 74,-15
+            5692: 76,-14
+            5693: 74,-14
+            5694: 68,-8
+            5695: 70,-10
+            5696: 76,-6
+            5697: 48,-25
+            5698: 48,-26
+            5699: 48,-27
+            5700: 48,-30
+            5701: 48,-31
+            5702: 47,-31
+            5703: 49,-34
+            5704: 47,-36
+            5705: 46,-36
+            5706: 44,-37
+            5707: 42,-35
+            5708: 42,-36
+            5709: 38,-36
+            5710: 38,-35
+            5711: 37,-37
+            5712: 32,-35
+            5713: 32,-36
+            5714: 32,-33
+            5715: 33,-31
+            5716: 32,-31
+            5717: 33,-27
+            5718: 32,-25
+            5719: 33,-24
+            5720: 35,-26
+            5721: 37,-26
+            5722: 41,-25
+            5723: 40,-26
+            5724: 41,-29
+            5725: 40,-29
+            5726: 40,-31
+            5727: 43,-29
+            5728: 44,-31
+            5729: 45,-30
+            5730: 27,-34
+            5731: 25,-34
+            5732: 24,-32
+            5733: 26,-29
+            5734: 23,-29
+            5735: 23,-31
+            5736: 25,-38
+            5737: 24,-37
+            5738: 22,-38
+            5739: 21,-37
+            5740: 21,-38
+            5741: 29,-39
+            5742: 28,-41
+            5743: 29,-44
+            5744: 28,-42
+            5745: 28,-45
+            5746: 26,-45
+            5747: 27,-44
+            5748: 24,-43
+            5749: 25,-46
+            5750: 27,-45
+            5751: 25,-46
+            5752: 32,-30
+            5753: 33,-28
+            5754: 36,-26
+            5755: 35,-26
+            5756: 36,-23
+            5757: 36,-30
+            5758: 42,-28
+            5759: 43,-29
+            5760: 52,-31
+            5761: 52,-35
+            5762: 55,-29
+            5763: 55,-30
+            5764: 57,-30
+            5765: 55,-34
+            5766: 55,-34
+            5767: 55,-36
+            5768: 57,-34
+            5769: 20,-45
+            5770: 17,-44
+            5771: 18,-45
+            5772: 19,-46
+            5773: 18,-48
+            5774: 19,-49
+            5775: 18,-50
+            5776: 20,-53
+            5777: 18,-54
+            5778: 17,-54
+            5779: 16,-54
+            5780: 16,-58
+            5781: 16,-59
+            5782: 19,-58
+            5783: 21,-58
+            5784: 21,-59
+            5785: 13,-47
+            5786: 14,-47
+            5787: 13,-48
+            5788: 13,-45
+            5789: 12,-45
+            5792: 10,-39
+            5793: 11,-39
+            5794: 0,-37
+            5795: 0,-36
+            5796: 1,-36
+            5797: 2,-38
+            5798: 0,-36
+            5799: -1,-37
+            5800: -2,-36
+            5801: -5,-36
+            5802: -4,-36
+            5803: -6,-36
+            5804: -7,-32
+            5805: -8,-32
+            5806: -7,-30
+            5807: -11,-31
+            5808: -12,-32
+            5809: -15,-32
+            5810: -16,-32
+            5811: -13,-30
+            5812: -16,-30
+            5813: -17,-30
+            5814: -22,-30
+            5815: -23,-30
+            5816: -24,-30
+            5817: -24,-29
+            5818: -24,-28
+            5819: -22,-32
+            5820: -24,-32
+            5821: -25,-32
+            5822: -26,-30
+            5823: -26,-28
+            5824: -26,-26
+            5825: -26,-24
+            5826: -24,-24
+            5827: -24,-22
+            5828: -24,-19
+            5829: -26,-21
+            5830: -26,-18
+            5831: -26,-17
+            5832: -24,-14
+            5833: -25,-15
+            5834: -27,-15
+            5835: -30,-15
+            5836: -30,-15
+            5837: -34,-15
+            5838: -35,-14
+            5839: -37,-15
+            5840: -38,-14
+            5841: -35,-15
+            5842: -34,-14
+            5843: -37,-10
+            5844: -38,-10
+            5845: -36,-9
+            5846: -29,-10
+            5847: -29,-11
+            5848: -33,-20
+            5849: -34,-20
+            5850: -33,-18
+            5851: -32,-20
+            5852: -34,-19
+            5853: -33,-18
+            5854: -29,-19
+            5855: -30,-21
+            5856: -29,-19
+            5857: -30,-20
+            5858: -37,-18
+            5859: -40,-18
+            5860: -39,-20
+            5861: -37,-19
+            5862: -39,-19
+            5863: -32,-26
+            5864: -35,-25
+            5865: -39,-26
+            5866: -39,-26
+            5867: -39,-27
+            5868: -40,-28
+            5869: -38,-30
+            5870: -39,-32
+            5871: -39,-33
+            5872: -37,-33
+            5873: -34,-33
+            5874: -31,-33
+            5875: -34,-34
+            5876: -30,-33
+            5877: -30,-31
+            5878: -31,-28
+            5879: -29,-27
+            5880: -29,-30
+            5881: -43,-30
+            5882: -44,-28
+            5883: -45,-31
+            5884: -46,-27
+            5885: -45,-25
+            5886: -45,-25
+            5887: -47,-25
+            5888: -49,-25
+            5889: -51,-26
+            5890: -50,-29
+            5891: -51,-30
+            5892: -51,-30
+            5893: -50,-32
+            5894: -47,-32
+            5895: -48,-33
+            5896: -44,-31
+            5897: -44,-29
+            5898: -55,-25
+            5899: -56,-25
+            5900: -55,-29
+            5901: -56,-29
+            5902: -55,-29
+            5903: -60,-27
+            5904: -60,-29
+            5905: -62,-27
+            5906: -61,-21
+            5907: -61,-21
+            5908: -54,-21
+            5909: -54,-21
+            5910: -55,-16
+            5911: -53,-14
+            5912: -54,-13
+            5913: -53,-10
+            5914: -54,-7
+            5915: -53,-5
+            5916: -55,-2
+            5917: -54,0
+            5918: -53,1
+            5919: -53,-4
+            5920: -54,-3
+            5921: -54,-4
+            5922: -54,-9
+            5923: -46,-4
+            5924: -47,-4
+            5925: -48,-3
+            5926: -50,0
+            5927: -45,1
+            5928: -47,1
+            5929: -44,1
+            5930: -47,1
+            5931: -46,7
+            5932: -49,7
+            5933: -49,11
+            5934: -46,11
+            5935: -49,10
+            5936: -48,13
+            5937: -45,11
+            5938: -54,10
+            5939: -54,9
+            5940: -53,10
+            5941: -39,1
+            5942: -37,0
+            5943: -39,-1
+            5944: -34,-1
+            5945: -37,-1
+            5946: -36,0
+            5947: -35,2
+            5948: -31,2
+            5949: -31,2
+            5950: -33,1
+            5951: -28,0
+            5952: -30,-1
+            5953: -27,-1
+            5954: -33,-4
+            5955: -27,-5
+            5956: -24,-3
+            5957: -24,1
+            5958: -22,3
+            5959: -23,-2
+            5960: -22,-3
+            5961: -17,-3
+            5962: -19,-3
+            5963: -17,-3
+            5964: -18,-4
+            5965: -14,-4
+            5966: -18,-4
+            5967: -17,-4
+            5968: -17,-4
+            5969: -19,-4
+            5970: -19,-2
+            5971: -19,-2
+            5972: -20,-3
+            5973: -20,-5
+            5974: -16,0
+            5975: -16,1
+            5976: -16,3
+            5977: -15,0
+            5978: -15,6
+            5979: -17,5
+            5980: -15,7
+            5981: -21,5
+            5982: -21,6
+            5983: -20,7
+            5984: -22,8
+            5985: -24,9
+            5986: -21,9
+            5987: -23,8
             5988: -22,8
-            5989: -24,9
-            5990: -21,9
-            5991: -23,8
-            5992: -22,8
-            5993: -23,8
-            5994: -21,13
-            5995: -22,11
-            5996: -20,13
-            5997: -22,14
-            5998: -26,12
-            5999: -26,16
-            6000: -26,17
-            6001: -26,20
-            6002: -19,20
-            6003: -25,20
-            6004: -22,19
-            6005: -24,26
-            6006: -25,26
-            6007: -26,26
+            5989: -23,8
+            5990: -21,13
+            5991: -22,11
+            5992: -20,13
+            5993: -22,14
+            5994: -26,12
+            5995: -26,16
+            5996: -26,17
+            5997: -26,20
+            5998: -19,20
+            5999: -25,20
+            6000: -22,19
+            6001: -24,26
+            6002: -25,26
+            6003: -26,26
+            6004: -25,29
+            6005: -26,29
+            6006: -26,26
+            6007: -26,27
             6008: -25,29
-            6009: -26,29
-            6010: -26,26
-            6011: -26,27
-            6012: -25,29
-            6013: -29,26
-            6014: -29,26
-            6015: -19,26
-            6016: -21,26
-            6017: -19,28
-            6018: -18,26
-            6019: -14,28
-            6020: -14,26
-            6021: -13,28
-            6022: -11,23
-            6023: -7,32
-            6024: -9,32
-            6025: -14,32
-            6026: -15,33
-            6027: -18,32
-            6028: -3,28
-            6029: -4,27
-            6030: -1,29
-            6031: -2,23
-            6032: -1,19
-            6033: -3,14
-            6034: -3,14
-            6035: -2,15
-            6036: -4,15
-            6037: -3,15
-            6038: 2,-14
-            6039: 2,-16
-            6040: -1,-17
-            6041: -2,-14
-            6042: -7,-17
-            6043: -6,-16
-            6044: -7,-19
-            6045: -7,-19
-            6046: -7,-23
-            6047: -1,-24
-            6048: 4,-20
-            6049: 6,-23
-            6050: 6,-20
-            6051: 7,-22
-            6052: 7,-20
-            6053: 11,-18
-            6054: 13,-18
-            6055: 13,-22
-            6056: 13,-22
-            6057: 12,-22
-            6058: 15,-26
-            6059: 12,-26
-            6060: 12,-29
-            6061: 7,-30
-            6062: 8,-32
-            6063: 7,-32
-            6064: 10,-34
-            6065: 13,-33
-            6066: 16,-32
-            6067: 21,-37
-            6068: 20,-38
-            6069: 24,-38
-            6070: 25,-37
-            6071: 28,-34
-            6072: 25,-34
-            6073: 27,-29
-            6074: 24,-29
-            6075: 33,-34
-            6076: 32,-37
-            6077: 35,-37
-            6078: 38,-36
-            6079: 40,-36
-            6080: 39,-30
-            6081: 44,-25
-            6082: 43,-25
-            6083: 42,-20
-            6084: 42,-18
-            6085: 41,-16
-            6086: 38,-16
-            6087: 37,-17
-            6088: 37,-15
-            6089: 37,-17
-            6090: 37,-16
-            6091: 37,-16
-            6092: 37,-16
-            6093: 38,-4
-            6094: 33,-3
-            6095: 33,-3
-            6096: 33,-2
-            6097: 38,7
-            6098: 36,13
-            6099: 37,13
-            6100: 35,13
-            6101: 34,13
-            6102: 34,14
-            6103: 36,13
-            6104: 36,13
-            6105: 34,14
-            6106: 35,18
-            6107: 36,18
+            6009: -29,26
+            6010: -29,26
+            6011: -19,26
+            6012: -21,26
+            6013: -19,28
+            6014: -18,26
+            6015: -14,28
+            6016: -14,26
+            6017: -13,28
+            6018: -11,23
+            6019: -7,32
+            6020: -9,32
+            6021: -14,32
+            6022: -15,33
+            6023: -18,32
+            6024: -3,28
+            6025: -4,27
+            6026: -1,29
+            6027: -2,23
+            6028: -1,19
+            6029: -3,14
+            6030: -3,14
+            6031: -2,15
+            6032: -4,15
+            6033: -3,15
+            6034: 2,-14
+            6035: 2,-16
+            6036: -1,-17
+            6037: -2,-14
+            6038: -7,-17
+            6039: -6,-16
+            6040: -7,-19
+            6041: -7,-19
+            6042: -7,-23
+            6043: -1,-24
+            6044: 4,-20
+            6045: 6,-23
+            6046: 6,-20
+            6047: 7,-22
+            6048: 7,-20
+            6049: 11,-18
+            6050: 13,-18
+            6051: 13,-22
+            6052: 13,-22
+            6053: 12,-22
+            6054: 15,-26
+            6055: 12,-26
+            6056: 12,-29
+            6057: 7,-30
+            6058: 8,-32
+            6059: 7,-32
+            6060: 10,-34
+            6061: 13,-33
+            6062: 16,-32
+            6063: 21,-37
+            6064: 20,-38
+            6065: 24,-38
+            6066: 25,-37
+            6067: 28,-34
+            6068: 25,-34
+            6069: 27,-29
+            6070: 24,-29
+            6071: 33,-34
+            6072: 32,-37
+            6073: 35,-37
+            6074: 38,-36
+            6075: 40,-36
+            6076: 39,-30
+            6077: 44,-25
+            6078: 43,-25
+            6079: 42,-20
+            6080: 42,-18
+            6081: 41,-16
+            6082: 38,-16
+            6083: 37,-17
+            6084: 37,-15
+            6085: 37,-17
+            6086: 37,-16
+            6087: 37,-16
+            6088: 37,-16
+            6089: 38,-4
+            6090: 33,-3
+            6091: 33,-3
+            6093: 38,7
+            6094: 36,13
+            6095: 37,13
+            6096: 35,13
+            6097: 34,13
+            6098: 34,14
+            6099: 36,13
+            6100: 36,13
+            6101: 34,14
+            6102: 35,18
+            6103: 36,18
         - node:
             cleanable: True
             color: '#D4D4D447'
             id: Dirt
           decals:
-            6746: 37,-3
-            6747: 37,-2
-            6748: 37,-2
-            6749: 38,-3
-            6750: 39,-2
-            6751: 39,-2
-            6752: 38,-3
-            6753: 38,-2
-            6754: 36,-3
-            6755: 36,-3
-            6756: 36,-2
-            6757: 36,-2
-            6758: 39,-3
-            6759: 37,-3
-            6760: 37,-3
+            6740: 37,-3
+            6741: 37,-2
+            6742: 37,-2
+            6743: 38,-3
+            6744: 39,-2
+            6745: 39,-2
+            6746: 38,-3
+            6747: 38,-2
+            6748: 36,-3
+            6749: 36,-3
+            6750: 36,-2
+            6751: 36,-2
+            6752: 39,-3
+            6753: 37,-3
+            6754: 37,-3
         - node:
             cleanable: True
             color: '#FFFFFF47'
             id: Dirt
           decals:
-            6650: 15,-30
-            6651: 15,-30
-            6652: 16,-27
-            6653: 16,-27
+            6644: 15,-30
+            6645: 15,-30
+            6646: 16,-27
+            6647: 16,-27
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Dirt
           decals:
-            6119: 51,20
-            6120: 50,21
-            6157: 81,-34
-            6158: 83,-35
-            6159: 81,-34
-            6160: 81,-34
-            6161: 83,-35
-            6162: 81,-35
-            6163: 82,-35
-            6164: 82,-35
-            6165: 80,-35
-            6166: 83,-36
-            6171: 82,-34
-            6727: -25,-42
+            6115: 51,20
+            6116: 50,21
+            6153: 81,-34
+            6154: 83,-35
+            6155: 81,-34
+            6156: 81,-34
+            6157: 83,-35
+            6158: 81,-35
+            6159: 82,-35
+            6160: 82,-35
+            6161: 80,-35
+            6162: 83,-36
+            6167: 82,-34
+            6721: -25,-42
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Dirt
           decals:
-            3017: -44,16
-            3018: -43,17
-            3019: -41,14
+            3013: -44,16
+            3014: -43,17
+            3015: -41,14
         - node:
             cleanable: True
             color: '#1D1D21FF'
             id: DirtHeavy
           decals:
-            2942: -39,26
-            2943: -40,29
-            2944: -38,28
-            2945: -36,29
-            2946: -35,27
-            2947: -35,26
-            2948: -35,26
-            2949: -37,26
-            2950: -37,26
-            2951: -37,25
-            2952: -39,26
-            2953: -34,25
-            2954: -34,25
-            2955: -36,24
+            2938: -39,26
+            2939: -40,29
+            2940: -38,28
+            2941: -36,29
+            2942: -35,27
+            2943: -35,26
+            2944: -35,26
+            2945: -37,26
+            2946: -37,26
+            2947: -37,25
+            2948: -39,26
+            2949: -34,25
+            2950: -34,25
+            2951: -36,24
         - node:
             cleanable: True
             color: '#835432FF'
             id: DirtHeavy
           decals:
-            2934: -36,26
-            2935: -35,27
-            2936: -37,26
-            2937: -37,27
-            2938: -37,25
-            2939: -39,26
-            2940: -38,27
-            2941: -38,28
+            2930: -36,26
+            2931: -35,27
+            2932: -37,26
+            2933: -37,27
+            2934: -37,25
+            2935: -39,26
+            2936: -38,27
+            2937: -38,28
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            6615: 89,-20
-            6616: 87,-21
-            6617: 92,-21
+            6609: 89,-20
+            6610: 87,-21
+            6611: 92,-21
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            2962: -8,-40
-            2963: -7,-39
-            2964: -5,-40
-            2965: -6,-42
-            2966: -4,-39
-            2967: -6,-40
-            2968: -6,-40
-            2969: -7,-40
-            2970: -7,-39
-            2971: -7,-39
-            2972: -8,-39
-            3654: -60,-66
-            3655: -59,-65
-            3656: -59,-63
-            3657: -59,-61
-            3658: -59,-59
-            3659: -59,-57
-            3660: -60,-57
-            3661: -57,-57
-            3662: -58,-58
-            3663: -56,-57
-            3664: -56,-58
-            3665: -56,-60
-            3666: -56,-62
-            3667: -56,-64
-            3668: -56,-66
-            3669: -58,-66
-            3670: -55,-56
-            3671: -54,-54
-            3672: -54,-52
-            3673: -54,-50
-            3674: -56,-53
-            3675: -56,-52
-            3676: -56,-47
-            3677: -53,-48
-            3678: -52,-46
-            3679: -54,-46
-            3680: -51,-46
-            3681: -50,-48
-            3682: -47,-48
-            3683: -45,-48
-            3684: -43,-46
-            3685: -45,-46
-            3686: -43,-48
-            3687: -42,-48
-            3688: -40,-48
-            3689: -40,-50
-            3690: -40,-52
-            3691: -40,-54
-            3692: -42,-51
-            3693: -42,-53
-            3694: -42,-54
-            3695: -41,-56
-            3696: -39,-57
-            3697: -40,-58
-            3698: -37,-57
-            3699: -37,-58
-            3700: -37,-61
-            3701: -37,-64
-            3702: -37,-65
-            3703: -36,-65
-            3704: -36,-66
-            3705: -39,-66
-            3706: -40,-65
-            3707: -40,-63
-            3708: -40,-60
-            3709: -47,-44
-            3710: -47,-42
-            3711: -47,-39
-            3712: -47,-35
-            3713: -47,-33
-            3714: -49,-33
-            3715: -49,-37
-            3716: -49,-39
-            3717: -49,-41
-            3718: -49,-44
-            3719: -49,-44
-            3720: -49,-43
-            3721: -44,-32
-            3722: -44,-30
-            3723: -43,-31
-            3724: -43,-27
-            3725: -44,-26
-            3726: -43,-26
-            3727: -44,-25
-            3728: -52,-32
-            3729: -52,-30
-            3730: -52,-29
-            3731: -52,-25
-            3732: -52,-22
-            3733: -54,-22
-            3734: -55,-22
-            3735: -52,-20
-            3736: -50,-20
-            3737: -47,-20
-            3738: -46,-20
-            3739: -45,-20
-            3740: -44,-20
-            3741: -44,-22
-            3742: -51,-18
-            3743: -51,-17
-            3744: -49,-17
-            3745: -48,-15
-            3746: -48,-13
-            3747: -50,-13
-            3748: -51,-14
-            3749: -51,-15
-            3750: -44,-15
-            3751: -46,-15
-            3752: -46,-14
-            3753: -54,-24
-            3754: -56,-24
-            3755: -54,-30
-            3756: -56,-29
-            3757: -57,-28
-            3758: -54,-28
-            3759: -61,-29
-            3760: -59,-29
-            3761: -59,-27
-            3762: -59,-25
-            3763: -61,-25
-            3764: -55,-17
-            3765: -55,-15
-            3766: -55,-13
-            3767: -55,-10
-            3768: -53,-17
-            3769: -53,-14
-            3770: -53,-12
-            3771: -53,-11
-            3772: -53,-9
-            3773: -53,-7
-            3774: -53,-6
-            3775: -53,-4
-            3776: -55,-3
-            3777: -55,-7
-            3778: -55,-8
-            3779: -53,0
-            3780: -53,-2
-            3781: -51,-4
-            3782: -49,-4
-            3783: -50,-5
-            3784: -48,-5
-            3793: -53,2
-            3794: -53,4
-            3795: -53,6
-            3796: -53,7
-            3797: -55,7
-            3798: -55,5
-            3799: -55,-1
-            3800: -51,6
-            3801: -50,7
-            3802: -47,7
-            3803: -48,6
-            3804: -46,6
-            3805: -45,7
-            3806: -47,9
-            3807: -45,9
-            3808: -44,9
-            3809: -50,9
-            3810: -50,9
-            3811: -51,11
-            3812: -51,13
-            3813: -50,13
-            3814: -48,13
-            3815: -46,13
-            3816: -48,12
-            3817: -43,11
-            3818: -44,12
-            3819: -43,13
-            3820: -43,12
-            3821: -54,10
-            3822: -53,9
-            3823: -54,9
-            3846: -43,1
-            3847: -40,2
-            3848: -39,1
-            3849: -39,1
-            3850: -40,-1
-            3851: -38,-1
-            3852: -40,-2
-            3853: -39,-2
-            3854: -40,-4
-            3855: -39,-5
-            3856: -38,-5
-            3857: -37,-5
-            3858: -36,-5
-            3859: -38,-4
-            3860: -36,-3
-            3861: -36,-2
-            3862: -36,-4
-            3863: -34,-3
-            3864: -32,-4
-            3865: -34,-1
-            3866: -32,0
-            3867: -35,0
-            3868: -39,3
-            3869: -40,4
-            3870: -38,4
-            3871: -33,1
-            3872: -31,2
-            3873: -31,-1
-            3874: -29,0
-            3875: -32,-2
-            3876: -31,-3
-            3877: -33,-4
-            3878: -32,-5
-            3879: -31,-4
-            3880: -30,-3
-            3881: -28,-3
-            3882: -28,-4
-            3883: -26,-5
-            3884: -27,-2
-            3885: -27,-3
-            3886: -29,0
-            3887: -27,0
-            3888: -27,2
-            3889: -28,3
-            3890: -27,3
-            3891: -27,1
-            3892: -26,-1
-            3893: -32,-1
-            3894: -28,4
-            3895: -26,5
-            3896: -26,6
-            3897: -26,3
-            3898: -26,3
-            3899: -24,2
-            3900: -23,1
-            3901: -25,0
-            3902: -23,-2
-            3903: -25,-3
-            3904: -23,-3
-            3905: -25,-4
-            3906: -23,-5
-            3907: -25,-5
-            3908: -24,-1
-            3909: -25,-1
-            3910: -23,3
-            3911: -15,-1
-            3912: -16,-1
-            3913: -15,0
-            3914: -16,1
-            3915: -16,3
-            3916: -15,3
-            3917: -15,2
-            3918: -15,1
-            3919: -15,1
-            3920: -27,6
-            3921: -27,7
-            3922: -27,9
-            3923: -20,5
-            3924: -21,5
-            3929: -17,5
-            3930: -16,5
-            3931: -16,5
-            3932: -22,11
-            3933: -21,11
-            3934: -22,13
-            3935: -20,14
-            3936: -22,13
-            3937: -22,15
-            3938: -20,14
-            3939: -20,13
-            3940: -20,12
-            3941: -19,11
-            3942: -22,14
-            3943: -23,14
-            3944: -17,11
-            3945: -17,11
-            3946: -17,12
-            3947: -16,11
+            2958: -8,-40
+            2959: -7,-39
+            2960: -5,-40
+            2961: -6,-42
+            2962: -4,-39
+            2963: -6,-40
+            2964: -6,-40
+            2965: -7,-40
+            2966: -7,-39
+            2967: -7,-39
+            2968: -8,-39
+            3650: -60,-66
+            3651: -59,-65
+            3652: -59,-63
+            3653: -59,-61
+            3654: -59,-59
+            3655: -59,-57
+            3656: -60,-57
+            3657: -57,-57
+            3658: -58,-58
+            3659: -56,-57
+            3660: -56,-58
+            3661: -56,-60
+            3662: -56,-62
+            3663: -56,-64
+            3664: -56,-66
+            3665: -58,-66
+            3666: -55,-56
+            3667: -54,-54
+            3668: -54,-52
+            3669: -54,-50
+            3670: -56,-53
+            3671: -56,-52
+            3672: -56,-47
+            3673: -53,-48
+            3674: -52,-46
+            3675: -54,-46
+            3676: -51,-46
+            3677: -50,-48
+            3678: -47,-48
+            3679: -45,-48
+            3680: -43,-46
+            3681: -45,-46
+            3682: -43,-48
+            3683: -42,-48
+            3684: -40,-48
+            3685: -40,-50
+            3686: -40,-52
+            3687: -40,-54
+            3688: -42,-51
+            3689: -42,-53
+            3690: -42,-54
+            3691: -41,-56
+            3692: -39,-57
+            3693: -40,-58
+            3694: -37,-57
+            3695: -37,-58
+            3696: -37,-61
+            3697: -37,-64
+            3698: -37,-65
+            3699: -36,-65
+            3700: -36,-66
+            3701: -39,-66
+            3702: -40,-65
+            3703: -40,-63
+            3704: -40,-60
+            3705: -47,-44
+            3706: -47,-42
+            3707: -47,-39
+            3708: -47,-35
+            3709: -47,-33
+            3710: -49,-33
+            3711: -49,-37
+            3712: -49,-39
+            3713: -49,-41
+            3714: -49,-44
+            3715: -49,-44
+            3716: -49,-43
+            3717: -44,-32
+            3718: -44,-30
+            3719: -43,-31
+            3720: -43,-27
+            3721: -44,-26
+            3722: -43,-26
+            3723: -44,-25
+            3724: -52,-32
+            3725: -52,-30
+            3726: -52,-29
+            3727: -52,-25
+            3728: -52,-22
+            3729: -54,-22
+            3730: -55,-22
+            3731: -52,-20
+            3732: -50,-20
+            3733: -47,-20
+            3734: -46,-20
+            3735: -45,-20
+            3736: -44,-20
+            3737: -44,-22
+            3738: -51,-18
+            3739: -51,-17
+            3740: -49,-17
+            3741: -48,-15
+            3742: -48,-13
+            3743: -50,-13
+            3744: -51,-14
+            3745: -51,-15
+            3746: -44,-15
+            3747: -46,-15
+            3748: -46,-14
+            3749: -54,-24
+            3750: -56,-24
+            3751: -54,-30
+            3752: -56,-29
+            3753: -57,-28
+            3754: -54,-28
+            3755: -61,-29
+            3756: -59,-29
+            3757: -59,-27
+            3758: -59,-25
+            3759: -61,-25
+            3760: -55,-17
+            3761: -55,-15
+            3762: -55,-13
+            3763: -55,-10
+            3764: -53,-17
+            3765: -53,-14
+            3766: -53,-12
+            3767: -53,-11
+            3768: -53,-9
+            3769: -53,-7
+            3770: -53,-6
+            3771: -53,-4
+            3772: -55,-3
+            3773: -55,-7
+            3774: -55,-8
+            3775: -53,0
+            3776: -53,-2
+            3777: -51,-4
+            3778: -49,-4
+            3779: -50,-5
+            3780: -48,-5
+            3789: -53,2
+            3790: -53,4
+            3791: -53,6
+            3792: -53,7
+            3793: -55,7
+            3794: -55,5
+            3795: -55,-1
+            3796: -51,6
+            3797: -50,7
+            3798: -47,7
+            3799: -48,6
+            3800: -46,6
+            3801: -45,7
+            3802: -47,9
+            3803: -45,9
+            3804: -44,9
+            3805: -50,9
+            3806: -50,9
+            3807: -51,11
+            3808: -51,13
+            3809: -50,13
+            3810: -48,13
+            3811: -46,13
+            3812: -48,12
+            3813: -43,11
+            3814: -44,12
+            3815: -43,13
+            3816: -43,12
+            3817: -54,10
+            3818: -53,9
+            3819: -54,9
+            3842: -43,1
+            3843: -40,2
+            3844: -39,1
+            3845: -39,1
+            3846: -40,-1
+            3847: -38,-1
+            3848: -40,-2
+            3849: -39,-2
+            3850: -40,-4
+            3851: -39,-5
+            3852: -38,-5
+            3853: -37,-5
+            3854: -36,-5
+            3855: -38,-4
+            3856: -36,-3
+            3857: -36,-2
+            3858: -36,-4
+            3859: -34,-3
+            3860: -32,-4
+            3861: -34,-1
+            3862: -32,0
+            3863: -35,0
+            3864: -39,3
+            3865: -40,4
+            3866: -38,4
+            3867: -33,1
+            3868: -31,2
+            3869: -31,-1
+            3870: -29,0
+            3871: -32,-2
+            3872: -31,-3
+            3873: -33,-4
+            3874: -32,-5
+            3875: -31,-4
+            3876: -30,-3
+            3877: -28,-3
+            3878: -28,-4
+            3879: -26,-5
+            3880: -27,-2
+            3881: -27,-3
+            3882: -29,0
+            3883: -27,0
+            3884: -27,2
+            3885: -28,3
+            3886: -27,3
+            3887: -27,1
+            3888: -26,-1
+            3889: -32,-1
+            3890: -28,4
+            3891: -26,5
+            3892: -26,6
+            3893: -26,3
+            3894: -26,3
+            3895: -24,2
+            3896: -23,1
+            3897: -25,0
+            3898: -23,-2
+            3899: -25,-3
+            3900: -23,-3
+            3901: -25,-4
+            3902: -23,-5
+            3903: -25,-5
+            3904: -24,-1
+            3905: -25,-1
+            3906: -23,3
+            3907: -15,-1
+            3908: -16,-1
+            3909: -15,0
+            3910: -16,1
+            3911: -16,3
+            3912: -15,3
+            3913: -15,2
+            3914: -15,1
+            3915: -15,1
+            3916: -27,6
+            3917: -27,7
+            3918: -27,9
+            3919: -20,5
+            3920: -21,5
+            3925: -17,5
+            3926: -16,5
+            3927: -16,5
+            3928: -22,11
+            3929: -21,11
+            3930: -22,13
+            3931: -20,14
+            3932: -22,13
+            3933: -22,15
+            3934: -20,14
+            3935: -20,13
+            3936: -20,12
+            3937: -19,11
+            3938: -22,14
+            3939: -23,14
+            3940: -17,11
+            3941: -17,11
+            3942: -17,12
+            3943: -16,11
+            3944: -16,12
+            3945: -17,13
+            3946: -16,14
+            3947: -17,14
             3948: -16,12
-            3949: -17,13
-            3950: -16,14
-            3951: -17,14
-            3952: -16,12
-            3953: -17,12
-            3954: -17,11
-            3957: -34,12
-            3958: -35,12
-            3959: -34,14
-            3960: -35,15
-            3961: -34,16
-            3962: -34,17
+            3949: -17,12
+            3950: -17,11
+            3953: -34,12
+            3954: -35,12
+            3955: -34,14
+            3956: -35,15
+            3957: -34,16
+            3958: -34,17
+            3959: -33,16
+            3960: -32,15
+            3961: -31,17
+            3962: -32,17
             3963: -33,16
-            3964: -32,15
-            3965: -31,17
-            3966: -32,17
-            3967: -33,16
-            3968: -34,15
-            3969: -34,15
-            3970: -37,14
-            3971: -38,14
-            3972: -39,14
-            3973: -39,12
-            3974: -39,11
-            3975: -38,11
-            3976: -38,11
-            3977: -27,11
-            3978: -27,13
-            3979: -27,16
-            3980: -27,17
-            3981: -27,19
-            3982: -27,20
-            3983: -27,21
-            3984: -25,18
-            3985: -25,16
-            3986: -25,14
-            3987: -25,12
-            3988: -25,11
-            3989: -24,18
-            3990: -22,18
-            3991: -23,17
-            3992: -21,17
-            3993: -20,18
-            3994: -19,17
-            3995: -20,20
-            3996: -22,20
-            3997: -24,20
-            3998: -20,21
-            3999: -17,19
-            4000: -16,19
-            4001: -14,19
-            4002: -17,21
-            4003: -15,21
-            4004: -13,21
-            4005: -11,21
-            4006: -13,19
-            4007: -10,19
-            4008: -8,19
-            4009: -6,19
-            4010: -9,21
-            4011: -7,21
-            4012: -5,21
-            4013: -3,21
+            3964: -34,15
+            3965: -34,15
+            3966: -37,14
+            3967: -38,14
+            3968: -39,14
+            3969: -39,12
+            3970: -39,11
+            3971: -38,11
+            3972: -38,11
+            3973: -27,11
+            3974: -27,13
+            3975: -27,16
+            3976: -27,17
+            3977: -27,19
+            3978: -27,20
+            3979: -27,21
+            3980: -25,18
+            3981: -25,16
+            3982: -25,14
+            3983: -25,12
+            3984: -25,11
+            3985: -24,18
+            3986: -22,18
+            3987: -23,17
+            3988: -21,17
+            3989: -20,18
+            3990: -19,17
+            3991: -20,20
+            3992: -22,20
+            3993: -24,20
+            3994: -20,21
+            3995: -17,19
+            3996: -16,19
+            3997: -14,19
+            3998: -17,21
+            3999: -15,21
+            4000: -13,21
+            4001: -11,21
+            4002: -13,19
+            4003: -10,19
+            4004: -8,19
+            4005: -6,19
+            4006: -9,21
+            4007: -7,21
+            4008: -5,21
+            4009: -3,21
+            4010: 0,21
+            4011: -5,19
+            4012: -2,19
+            4013: 0,19
             4014: 0,21
-            4015: -5,19
-            4016: -2,19
-            4017: 0,19
-            4018: 0,21
-            4019: 2,21
-            4020: 5,21
-            4021: 6,21
-            4022: 2,19
-            4023: 4,19
-            4024: 7,19
-            4025: 10,19
-            4026: 8,21
-            4027: 10,21
-            4028: 11,21
-            4029: 13,21
-            4030: 12,19
-            4031: 14,19
-            4032: 15,19
-            4033: 17,19
-            4034: 15,23
-            4035: 14,23
-            4036: 13,24
-            4037: 15,25
-            4038: 15,24
-            4039: 11,23
-            4040: 10,23
-            4041: 11,24
-            4042: 17,23
-            4043: 17,25
-            4044: 17,25
-            4045: 16,23
-            4046: 18,19
-            4047: 19,19
-            4048: 19,21
-            4049: 17,21
-            4050: 16,21
-            4051: 21,20
-            4052: 21,18
-            4053: 21,17
-            4054: 19,18
-            4055: 19,15
-            4056: 19,12
-            4057: 19,11
-            4058: 21,16
-            4059: 21,13
-            4060: 21,12
-            4061: 21,10
-            4062: 21,8
-            4063: 21,7
-            4064: 19,9
-            4065: 19,7
-            4066: 19,6
-            4067: 23,10
-            4068: 24,10
-            4069: 26,10
-            4070: 27,10
-            4071: 28,7
-            4072: 27,8
-            4073: 27,6
-            4074: 28,6
-            4075: 30,6
-            4076: 30,8
-            4077: 30,9
-            4078: 30,10
-            4079: 33,10
-            4080: 34,10
-            4081: 31,12
-            4082: 31,13
-            4083: 30,14
-            4084: 31,17
-            4085: 30,17
-            4086: 31,19
-            4087: 31,20
-            4088: 31,22
-            4089: 30,22
-            4090: 28,22
-            4091: 29,23
-            4092: 26,22
-            4093: 24,22
-            4094: 23,22
-            4095: 23,23
-            4096: 23,20
-            4097: 23,18
-            4098: 25,18
-            4099: 25,17
-            4100: 26,18
-            4101: 27,17
-            4102: 26,19
-            4103: 27,20
-            4104: 29,18
-            4105: 27,18
-            4106: 30,17
-            4107: 33,22
-            4108: 35,22
-            4109: 33,19
-            4110: 33,18
-            4111: 35,18
-            4112: 36,17
-            4113: 34,17
-            4114: 35,17
-            4115: 33,13
-            4116: 33,15
-            4117: 33,15
-            4118: 32,13
-            4119: 26,7
-            4120: 23,2
-            4121: 26,2
-            4122: 20,2
-            4123: 21,2
-            4124: 19,4
-            4130: 31,2
-            4131: 33,2
-            4132: 33,4
-            4133: 32,4
-            4134: 35,4
-            4135: 37,4
-            4136: 37,2
-            4137: 40,2
-            4138: 41,2
-            4139: 41,1
-            4140: 38,2
-            4141: 39,-4
-            4142: 37,-4
-            4143: 39,-5
-            4144: 33,-1
-            4145: 31,-1
-            4146: 31,0
-            4147: 33,0
-            4148: 32,1
-            4149: 38,7
-            4150: 46,11
-            4151: 47,13
-            4152: 44,11
-            4153: 44,13
-            4154: 42,12
-            4155: 42,11
-            4156: 44,12
-            4157: 54,14
-            4158: 58,14
-            4159: 59,14
-            4160: 60,14
-            4161: 58,16
-            4162: 55,10
-            4163: 55,12
-            4164: 54,12
-            4165: 54,6
-            4166: 59,3
-            4167: 60,4
-            4168: 59,0
-            4169: 55,-5
-            4170: 56,-4
-            4171: 57,-5
-            4172: 58,-7
-            4173: 59,-8
-            4174: 60,-7
-            4175: 41,-1
-            4176: 41,-3
-            4177: 41,-5
-            4178: 41,-7
-            4179: 41,-10
-            4180: 41,-11
-            4181: 43,-12
-            4182: 43,-14
-            4183: 43,-16
-            4184: 43,-17
-            4185: 41,-15
-            4186: 41,-16
-            4187: 41,-17
-            4188: 41,-19
-            4189: 40,-19
-            4190: 40,-21
-            4191: 42,-21
-            4192: 43,-21
-            4193: 45,-21
-            4198: 45,-19
-            4199: 47,-19
-            4200: 48,-19
-            4201: 51,-19
-            4202: 47,-21
-            4203: 49,-21
-            4204: 47,-22
-            4205: 51,-21
-            4206: 52,-21
-            4207: 52,-23
-            4208: 53,-24
-            4209: 56,-24
-            4210: 57,-24
-            4211: 58,-24
-            4212: 58,-23
-            4213: 59,-21
-            4214: 60,-21
-            4215: 61,-20
-            4216: 59,-19
-            4217: 61,-19
-            4218: 60,-17
-            4219: 60,-17
-            4220: 58,-18
-            4221: 58,-19
-            4222: 56,-19
-            4223: 55,-19
-            4224: 53,-19
-            4225: 60,-15
-            4226: 58,-15
-            4227: 59,-14
-            4228: 57,-13
-            4229: 57,-12
-            4230: 60,-13
-            4231: 60,-12
-            4232: 60,-14
-            4233: 61,-13
-            4234: 63,-13
-            4235: 64,-12
-            4236: 65,-14
-            4237: 63,-14
-            4238: 63,-16
-            4239: 65,-16
-            4240: 65,-18
-            4241: 65,-20
-            4242: 63,-18
-            4243: 63,-20
-            4244: 63,-21
-            4245: 65,-21
-            4246: 62,-23
-            4247: 61,-24
-            4248: 64,-24
-            4249: 63,-25
-            4250: 64,-26
-            4251: 65,-27
-            4252: 66,-26
-            4253: 65,-24
-            4254: 65,-23
-            4255: 65,-23
-            4259: 68,-21
-            4260: 69,-21
-            4261: 69,-23
-            4262: 69,-24
-            4264: 69,-27
-            4265: 70,-26
-            4266: 70,-26
-            4267: 71,-27
-            4268: 71,-28
-            4269: 70,-28
-            4270: 68,-28
-            4271: 69,-29
-            4272: 70,-30
-            4273: 69,-30
-            4274: 70,-29
-            4275: 70,-29
-            4276: 70,-29
-            4277: 71,-30
-            4278: 71,-17
-            4279: 68,-17
-            4280: 67,-19
-            4281: 70,-17
-            4282: 70,-19
-            4283: 71,-18
-            4284: 68,-18
-            4285: 69,-19
-            4305: 69,-9
-            4306: 68,-9
-            4307: 67,-9
-            4308: 70,-10
-            4309: 77,-18
-            4310: 75,-18
-            4311: 76,-19
-            4312: 77,-18
-            4313: 76,-17
-            4314: 76,-15
-            4315: 75,-15
-            4316: 76,-13
-            4317: 77,-14
-            4318: 74,-14
-            4319: 74,-16
-            4320: 73,-14
-            4321: 74,-17
-            4322: 74,-18
-            4323: 72,-17
-            4324: 73,-19
-            4325: 73,-17
-            4326: 74,-16
-            4327: 73,-15
-            4328: 74,-16
-            4329: 74,-15
-            4330: 76,-18
-            4331: 79,-14
-            4332: 80,-13
-            4333: 81,-14
-            4334: 79,-14
-            4335: 80,-15
-            4336: 81,-13
-            4337: 80,-19
-            4338: 79,-18
-            4339: 80,-18
-            4340: 80,-19
-            4341: 79,-19
-            4342: 80,-19
-            4343: 81,-19
-            4344: 80,-17
-            4345: 80,-18
-            4346: 79,-19
-            4347: 50,-13
-            4348: 51,-14
-            4349: 50,-13
-            4350: 51,-13
-            4351: 50,-14
-            4352: 50,-14
-            4353: 48,-13
-            4354: 48,-14
-            4355: 48,-13
+            4015: 2,21
+            4016: 5,21
+            4017: 6,21
+            4018: 2,19
+            4019: 4,19
+            4020: 7,19
+            4021: 10,19
+            4022: 8,21
+            4023: 10,21
+            4024: 11,21
+            4025: 13,21
+            4026: 12,19
+            4027: 14,19
+            4028: 15,19
+            4029: 17,19
+            4030: 15,23
+            4031: 14,23
+            4032: 13,24
+            4033: 15,25
+            4034: 15,24
+            4035: 11,23
+            4036: 10,23
+            4037: 11,24
+            4038: 17,23
+            4039: 17,25
+            4040: 17,25
+            4041: 16,23
+            4042: 18,19
+            4043: 19,19
+            4044: 19,21
+            4045: 17,21
+            4046: 16,21
+            4047: 21,20
+            4048: 21,18
+            4049: 21,17
+            4050: 19,18
+            4051: 19,15
+            4052: 19,12
+            4053: 19,11
+            4054: 21,16
+            4055: 21,13
+            4056: 21,12
+            4057: 21,10
+            4058: 21,8
+            4059: 21,7
+            4060: 19,9
+            4061: 19,7
+            4062: 19,6
+            4063: 23,10
+            4064: 24,10
+            4065: 26,10
+            4066: 27,10
+            4067: 28,7
+            4068: 27,8
+            4069: 27,6
+            4070: 28,6
+            4071: 30,6
+            4072: 30,8
+            4073: 30,9
+            4074: 30,10
+            4075: 33,10
+            4076: 34,10
+            4077: 31,12
+            4078: 31,13
+            4079: 30,14
+            4080: 31,17
+            4081: 30,17
+            4082: 31,19
+            4083: 31,20
+            4084: 31,22
+            4085: 30,22
+            4086: 28,22
+            4087: 29,23
+            4088: 26,22
+            4089: 24,22
+            4090: 23,22
+            4091: 23,23
+            4092: 23,20
+            4093: 23,18
+            4094: 25,18
+            4095: 25,17
+            4096: 26,18
+            4097: 27,17
+            4098: 26,19
+            4099: 27,20
+            4100: 29,18
+            4101: 27,18
+            4102: 30,17
+            4103: 33,22
+            4104: 35,22
+            4105: 33,19
+            4106: 33,18
+            4107: 35,18
+            4108: 36,17
+            4109: 34,17
+            4110: 35,17
+            4111: 33,13
+            4112: 33,15
+            4113: 33,15
+            4114: 32,13
+            4115: 26,7
+            4116: 23,2
+            4117: 26,2
+            4118: 20,2
+            4119: 21,2
+            4120: 19,4
+            4126: 31,2
+            4127: 33,2
+            4128: 33,4
+            4129: 32,4
+            4130: 35,4
+            4131: 37,4
+            4132: 37,2
+            4133: 40,2
+            4134: 41,2
+            4135: 41,1
+            4136: 38,2
+            4137: 39,-4
+            4138: 37,-4
+            4139: 39,-5
+            4140: 33,-1
+            4141: 31,-1
+            4142: 31,0
+            4143: 33,0
+            4144: 32,1
+            4145: 38,7
+            4146: 46,11
+            4147: 47,13
+            4148: 44,11
+            4149: 44,13
+            4150: 42,12
+            4151: 42,11
+            4152: 44,12
+            4153: 54,14
+            4154: 58,14
+            4155: 59,14
+            4156: 60,14
+            4157: 58,16
+            4158: 55,10
+            4159: 55,12
+            4160: 54,12
+            4161: 54,6
+            4162: 59,3
+            4163: 60,4
+            4164: 59,0
+            4165: 55,-5
+            4166: 56,-4
+            4167: 57,-5
+            4168: 58,-7
+            4169: 59,-8
+            4170: 60,-7
+            4171: 41,-1
+            4172: 41,-3
+            4173: 41,-5
+            4174: 41,-7
+            4175: 41,-10
+            4176: 41,-11
+            4177: 43,-12
+            4178: 43,-14
+            4179: 43,-16
+            4180: 43,-17
+            4181: 41,-15
+            4182: 41,-16
+            4183: 41,-17
+            4184: 41,-19
+            4185: 40,-19
+            4186: 40,-21
+            4187: 42,-21
+            4188: 43,-21
+            4189: 45,-21
+            4194: 45,-19
+            4195: 47,-19
+            4196: 48,-19
+            4197: 51,-19
+            4198: 47,-21
+            4199: 49,-21
+            4200: 47,-22
+            4201: 51,-21
+            4202: 52,-21
+            4203: 52,-23
+            4204: 53,-24
+            4205: 56,-24
+            4206: 57,-24
+            4207: 58,-24
+            4208: 58,-23
+            4209: 59,-21
+            4210: 60,-21
+            4211: 61,-20
+            4212: 59,-19
+            4213: 61,-19
+            4214: 60,-17
+            4215: 60,-17
+            4216: 58,-18
+            4217: 58,-19
+            4218: 56,-19
+            4219: 55,-19
+            4220: 53,-19
+            4221: 60,-15
+            4222: 58,-15
+            4223: 59,-14
+            4224: 57,-13
+            4225: 57,-12
+            4226: 60,-13
+            4227: 60,-12
+            4228: 60,-14
+            4229: 61,-13
+            4230: 63,-13
+            4231: 64,-12
+            4232: 65,-14
+            4233: 63,-14
+            4234: 63,-16
+            4235: 65,-16
+            4236: 65,-18
+            4237: 65,-20
+            4238: 63,-18
+            4239: 63,-20
+            4240: 63,-21
+            4241: 65,-21
+            4242: 62,-23
+            4243: 61,-24
+            4244: 64,-24
+            4245: 63,-25
+            4246: 64,-26
+            4247: 65,-27
+            4248: 66,-26
+            4249: 65,-24
+            4250: 65,-23
+            4251: 65,-23
+            4255: 68,-21
+            4256: 69,-21
+            4257: 69,-23
+            4258: 69,-24
+            4260: 69,-27
+            4261: 70,-26
+            4262: 70,-26
+            4263: 71,-27
+            4264: 71,-28
+            4265: 70,-28
+            4266: 68,-28
+            4267: 69,-29
+            4268: 70,-30
+            4269: 69,-30
+            4270: 70,-29
+            4271: 70,-29
+            4272: 70,-29
+            4273: 71,-30
+            4274: 71,-17
+            4275: 68,-17
+            4276: 67,-19
+            4277: 70,-17
+            4278: 70,-19
+            4279: 71,-18
+            4280: 68,-18
+            4281: 69,-19
+            4301: 69,-9
+            4302: 68,-9
+            4303: 67,-9
+            4304: 70,-10
+            4305: 77,-18
+            4306: 75,-18
+            4307: 76,-19
+            4308: 77,-18
+            4309: 76,-17
+            4310: 76,-15
+            4311: 75,-15
+            4312: 76,-13
+            4313: 77,-14
+            4314: 74,-14
+            4315: 74,-16
+            4316: 73,-14
+            4317: 74,-17
+            4318: 74,-18
+            4319: 72,-17
+            4320: 73,-19
+            4321: 73,-17
+            4322: 74,-16
+            4323: 73,-15
+            4324: 74,-16
+            4325: 74,-15
+            4326: 76,-18
+            4327: 79,-14
+            4328: 80,-13
+            4329: 81,-14
+            4330: 79,-14
+            4331: 80,-15
+            4332: 81,-13
+            4333: 80,-19
+            4334: 79,-18
+            4335: 80,-18
+            4336: 80,-19
+            4337: 79,-19
+            4338: 80,-19
+            4339: 81,-19
+            4340: 80,-17
+            4341: 80,-18
+            4342: 79,-19
+            4343: 50,-13
+            4344: 51,-14
+            4345: 50,-13
+            4346: 51,-13
+            4347: 50,-14
+            4348: 50,-14
+            4349: 48,-13
+            4350: 48,-14
+            4351: 48,-13
+            4352: 53,-13
+            4353: 53,-14
+            4354: 53,-12
+            4355: 53,-14
             4356: 53,-13
             4357: 53,-14
-            4358: 53,-12
-            4359: 53,-14
-            4360: 53,-13
-            4361: 53,-14
-            4362: 50,-15
-            4363: 51,-15
-            4364: 50,-14
-            4365: 51,-13
-            4366: 50,-12
-            4367: 50,-12
-            4368: 48,-12
-            4369: 50,-12
-            4370: 51,-13
-            4371: 47,-24
-            4372: 49,-25
-            4373: 48,-26
-            4374: 47,-25
-            4375: 49,-25
-            4376: 48,-23
-            4377: 47,-28
-            4378: 49,-29
-            4379: 47,-30
-            4380: 48,-32
-            4381: 49,-31
-            4382: 48,-33
-            4383: 47,-33
-            4384: 49,-33
-            4385: 48,-34
-            4386: 47,-34
-            4387: 43,-36
+            4358: 50,-15
+            4359: 51,-15
+            4360: 50,-14
+            4361: 51,-13
+            4362: 50,-12
+            4363: 50,-12
+            4364: 48,-12
+            4365: 50,-12
+            4366: 51,-13
+            4367: 47,-24
+            4368: 49,-25
+            4369: 48,-26
+            4370: 47,-25
+            4371: 49,-25
+            4372: 48,-23
+            4373: 47,-28
+            4374: 49,-29
+            4375: 47,-30
+            4376: 48,-32
+            4377: 49,-31
+            4378: 48,-33
+            4379: 47,-33
+            4380: 49,-33
+            4381: 48,-34
+            4382: 47,-34
+            4383: 43,-36
+            4384: 40,-36
+            4385: 37,-35
+            4386: 36,-35
+            4387: 37,-36
             4388: 40,-36
-            4389: 37,-35
-            4390: 36,-35
-            4391: 37,-36
-            4392: 40,-36
-            4393: 43,-35
-            4394: 43,-35
-            4395: 41,-35
-            4396: 43,-35
-            4397: 43,-34
-            4423: 33,-34
-            4424: 31,-34
-            4425: 33,-32
-            4426: 32,-32
-            4427: 32,-31
-            4428: 32,-30
-            4429: 33,-28
-            4430: 31,-29
-            4431: 33,-31
-            4432: 33,-31
-            4433: 35,-30
-            4434: 36,-30
-            4435: 36,-29
+            4389: 43,-35
+            4390: 43,-35
+            4391: 41,-35
+            4392: 43,-35
+            4393: 43,-34
+            4419: 33,-34
+            4420: 31,-34
+            4421: 33,-32
+            4422: 32,-32
+            4423: 32,-31
+            4424: 32,-30
+            4425: 33,-28
+            4426: 31,-29
+            4427: 33,-31
+            4428: 33,-31
+            4429: 35,-30
+            4430: 36,-30
+            4431: 36,-29
+            4432: 33,-25
+            4433: 31,-25
+            4434: 33,-25
+            4435: 31,-25
             4436: 33,-25
-            4437: 31,-25
-            4438: 33,-25
-            4439: 31,-25
-            4440: 33,-25
-            4441: 32,-26
-            4442: 31,-25
-            4443: 32,-24
-            4444: 32,-25
-            4445: 31,-24
-            4446: 40,-25
-            4447: 39,-24
-            4448: 40,-26
-            4449: 42,-25
-            4450: 42,-25
-            4451: 44,-24
-            4452: 42,-25
-            4453: 44,-25
-            4454: 45,-25
-            4455: 42,-26
-            4456: 43,-25
-            4457: 43,-25
-            4458: 41,-25
-            4459: 40,-25
-            4460: 40,-25
-            4461: 40,-24
-            4462: 35,-23
-            4463: 37,-23
-            4464: 36,-23
-            4465: 35,-23
-            4466: 38,-21
-            4467: 35,-21
-            4468: 33,-21
-            4469: 33,-22
-            4470: 32,-22
-            4471: 32,-21
-            4472: 37,-19
-            4473: 34,-19
-            4474: 32,-19
-            4475: 31,-19
-            4476: 28,-19
-            4477: 27,-19
-            4478: 27,-20
-            4479: 27,-21
-            4480: 30,-21
-            4481: 29,-21
-            4482: 29,-23
-            4483: 29,-24
-            4484: 29,-25
-            4485: 29,-26
-            4486: 27,-22
-            4487: 27,-24
-            4488: 27,-25
-            4489: 26,-25
-            4490: 25,-25
-            4491: 29,-27
-            4492: 27,-27
-            4493: 25,-27
-            4494: 24,-27
-            4495: 21,-27
-            4496: 21,-25
-            4497: 20,-25
-            4498: 19,-25
-            4499: 19,-26
-            4500: 19,-28
-            4501: 19,-28
-            4502: 19,-30
-            4503: 19,-31
-            4504: 19,-32
-            4505: 21,-30
-            4506: 21,-33
-            4507: 21,-34
-            4508: 21,-34
-            4509: 19,-34
-            4510: 20,-36
-            4511: 20,-37
-            4512: 19,-37
-            4513: 20,-39
-            4514: 21,-38
-            4515: 22,-39
-            4516: 21,-37
-            4517: 24,-37
-            4518: 23,-38
-            4519: 25,-37
-            4520: 25,-38
-            4521: 24,-38
-            4522: 25,-38
-            4523: 17,-34
-            4524: 17,-35
-            4525: 16,-34
-            4526: 14,-34
-            4527: 17,-32
-            4528: 15,-32
-            4529: 13,-32
-            4530: 11,-32
-            4531: 10,-32
-            4532: 12,-34
-            4533: 9,-34
-            4534: 8,-34
-            4535: 7,-34
-            4536: 7,-32
-            4537: 7,-32
-            4538: 6,-32
-            4539: 9,-30
-            4540: 8,-29
-            4541: 7,-29
-            4542: 7,-29
-            4543: 6,-28
-            4544: 8,-27
-            4545: 9,-27
-            4546: 7,-28
-            4547: 6,-27
-            4548: 5,-29
-            4549: 7,-30
-            4550: 9,-30
-            4551: 3,-30
-            4552: 1,-30
-            4553: 3,-32
-            4554: 2,-32
-            4555: 2,-33
-            4556: 0,-33
-            4557: -1,-33
-            4558: -1,-32
-            4559: 0,-30
-            4560: -3,-30
-            4561: -4,-30
-            4562: -6,-30
-            4563: -7,-30
-            4564: -9,-30
-            4565: -6,-32
-            4566: -5,-32
-            4567: -3,-32
-            4568: -8,-32
-            4569: -8,-33
-            4570: -9,-32
-            4571: -10,-32
-            4572: -11,-32
-            4573: -13,-32
-            4574: -10,-30
-            4575: -11,-30
-            4576: -13,-30
-            4577: -15,-30
-            4578: -16,-30
-            4579: -12,-29
-            4580: -12,-30
-            4581: -16,-32
-            4582: -17,-33
-            4583: -17,-32
-            4584: -19,-32
-            4585: -18,-30
-            4586: -20,-30
-            4587: -22,-30
-            4588: -23,-30
-            4589: -23,-29
-            4590: -22,-32
-            4591: -24,-32
-            4592: -24,-32
-            4593: -26,-30
-            4594: -26,-29
-            4595: -26,-27
-            4596: -26,-25
-            4597: -24,-27
-            4598: -24,-26
-            4599: -24,-25
-            4600: -24,-24
-            4601: -26,-23
-            4602: -26,-22
-            4603: -26,-20
-            4604: -24,-21
-            4605: -24,-19
-            4606: -24,-18
-            4607: -24,-16
-            4608: -26,-17
-            4609: -26,-16
-            4610: -26,-14
-            4611: -26,-13
-            4612: -26,-12
-            4613: -26,-10
-            4614: -26,-9
-            4615: -25,-9
-            4616: -24,-11
-            4617: -23,-11
-            4618: -23,-10
-            4619: -23,-9
-            4620: -24,-5
-            4621: -24,-4
-            4622: -24,-2
-            4623: -19,-11
-            4624: -19,-10
-            4625: -20,-10
-            4626: -20,-9
-            4627: -19,-9
-            4628: -30,-21
-            4629: -30,-19
-            4630: -29,-19
-            4631: -30,-18
-            4632: -32,-21
-            4633: -32,-19
-            4634: -33,-18
-            4635: -34,-18
-            4636: -36,-15
-            4637: -36,-14
-            4638: -33,-14
-            4639: -33,-14
-            4640: -33,-15
-            4641: -30,-14
-            4642: -36,-10
-            4643: -37,-9
-            4644: -37,-10
-            4645: -29,-10
-            4646: -30,-11
-            4647: -30,-9
-            4648: -28,-10
-            4649: -40,-11
+            4437: 32,-26
+            4438: 31,-25
+            4439: 32,-24
+            4440: 32,-25
+            4441: 31,-24
+            4442: 40,-25
+            4443: 39,-24
+            4444: 40,-26
+            4445: 42,-25
+            4446: 42,-25
+            4447: 44,-24
+            4448: 42,-25
+            4449: 44,-25
+            4450: 45,-25
+            4451: 42,-26
+            4452: 43,-25
+            4453: 43,-25
+            4454: 41,-25
+            4455: 40,-25
+            4456: 40,-25
+            4457: 40,-24
+            4458: 35,-23
+            4459: 37,-23
+            4460: 36,-23
+            4461: 35,-23
+            4462: 38,-21
+            4463: 35,-21
+            4464: 33,-21
+            4465: 33,-22
+            4466: 32,-22
+            4467: 32,-21
+            4468: 37,-19
+            4469: 34,-19
+            4470: 32,-19
+            4471: 31,-19
+            4472: 28,-19
+            4473: 27,-19
+            4474: 27,-20
+            4475: 27,-21
+            4476: 30,-21
+            4477: 29,-21
+            4478: 29,-23
+            4479: 29,-24
+            4480: 29,-25
+            4481: 29,-26
+            4482: 27,-22
+            4483: 27,-24
+            4484: 27,-25
+            4485: 26,-25
+            4486: 25,-25
+            4487: 29,-27
+            4488: 27,-27
+            4489: 25,-27
+            4490: 24,-27
+            4491: 21,-27
+            4492: 21,-25
+            4493: 20,-25
+            4494: 19,-25
+            4495: 19,-26
+            4496: 19,-28
+            4497: 19,-28
+            4498: 19,-30
+            4499: 19,-31
+            4500: 19,-32
+            4501: 21,-30
+            4502: 21,-33
+            4503: 21,-34
+            4504: 21,-34
+            4505: 19,-34
+            4506: 20,-36
+            4507: 20,-37
+            4508: 19,-37
+            4509: 20,-39
+            4510: 21,-38
+            4511: 22,-39
+            4512: 21,-37
+            4513: 24,-37
+            4514: 23,-38
+            4515: 25,-37
+            4516: 25,-38
+            4517: 24,-38
+            4518: 25,-38
+            4519: 17,-34
+            4520: 17,-35
+            4521: 16,-34
+            4522: 14,-34
+            4523: 17,-32
+            4524: 15,-32
+            4525: 13,-32
+            4526: 11,-32
+            4527: 10,-32
+            4528: 12,-34
+            4529: 9,-34
+            4530: 8,-34
+            4531: 7,-34
+            4532: 7,-32
+            4533: 7,-32
+            4534: 6,-32
+            4535: 9,-30
+            4536: 8,-29
+            4537: 7,-29
+            4538: 7,-29
+            4539: 6,-28
+            4540: 8,-27
+            4541: 9,-27
+            4542: 7,-28
+            4543: 6,-27
+            4544: 5,-29
+            4545: 7,-30
+            4546: 9,-30
+            4547: 3,-30
+            4548: 1,-30
+            4549: 3,-32
+            4550: 2,-32
+            4551: 2,-33
+            4552: 0,-33
+            4553: -1,-33
+            4554: -1,-32
+            4555: 0,-30
+            4556: -3,-30
+            4557: -4,-30
+            4558: -6,-30
+            4559: -7,-30
+            4560: -9,-30
+            4561: -6,-32
+            4562: -5,-32
+            4563: -3,-32
+            4564: -8,-32
+            4565: -8,-33
+            4566: -9,-32
+            4567: -10,-32
+            4568: -11,-32
+            4569: -13,-32
+            4570: -10,-30
+            4571: -11,-30
+            4572: -13,-30
+            4573: -15,-30
+            4574: -16,-30
+            4575: -12,-29
+            4576: -12,-30
+            4577: -16,-32
+            4578: -17,-33
+            4579: -17,-32
+            4580: -19,-32
+            4581: -18,-30
+            4582: -20,-30
+            4583: -22,-30
+            4584: -23,-30
+            4585: -23,-29
+            4586: -22,-32
+            4587: -24,-32
+            4588: -24,-32
+            4589: -26,-30
+            4590: -26,-29
+            4591: -26,-27
+            4592: -26,-25
+            4593: -24,-27
+            4594: -24,-26
+            4595: -24,-25
+            4596: -24,-24
+            4597: -26,-23
+            4598: -26,-22
+            4599: -26,-20
+            4600: -24,-21
+            4601: -24,-19
+            4602: -24,-18
+            4603: -24,-16
+            4604: -26,-17
+            4605: -26,-16
+            4606: -26,-14
+            4607: -26,-13
+            4608: -26,-12
+            4609: -26,-10
+            4610: -26,-9
+            4611: -25,-9
+            4612: -24,-11
+            4613: -23,-11
+            4614: -23,-10
+            4615: -23,-9
+            4616: -24,-5
+            4617: -24,-4
+            4618: -24,-2
+            4619: -19,-11
+            4620: -19,-10
+            4621: -20,-10
+            4622: -20,-9
+            4623: -19,-9
+            4624: -30,-21
+            4625: -30,-19
+            4626: -29,-19
+            4627: -30,-18
+            4628: -32,-21
+            4629: -32,-19
+            4630: -33,-18
+            4631: -34,-18
+            4632: -36,-15
+            4633: -36,-14
+            4634: -33,-14
+            4635: -33,-14
+            4636: -33,-15
+            4637: -30,-14
+            4638: -36,-10
+            4639: -37,-9
+            4640: -37,-10
+            4641: -29,-10
+            4642: -30,-11
+            4643: -30,-9
+            4644: -28,-10
+            4645: -40,-11
+            4646: -41,-10
+            4647: -41,-9
+            4648: -40,-9
+            4649: -41,-10
             4650: -41,-10
-            4651: -41,-9
-            4652: -40,-9
-            4653: -41,-10
-            4654: -41,-10
-            4655: -49,-18
-            4656: -38,-33
-            4657: -36,-33
-            4658: -33,-33
-            4659: -32,-33
-            4660: -31,-33
-            4661: -31,-31
-            4662: -31,-29
-            4663: -31,-28
-            4664: -31,-26
-            4665: -33,-26
-            4666: -35,-26
-            4667: -36,-26
-            4668: -37,-26
-            4669: -38,-26
-            4670: -38,-27
-            4671: -38,-29
-            4672: -38,-30
-            4673: -38,-31
-            4674: -38,-29
-            4675: -38,-26
-            4676: -40,-26
-            4677: -40,-25
-            4678: -41,-25
-            4679: -41,-26
-            4680: -41,-28
-            4681: -41,-29
-            4682: -41,-30
-            4683: -41,-32
-            4684: -41,-33
-            4685: -41,-34
-            4686: -39,-33
-            4687: -40,-34
-            4688: -35,-34
-            4689: -34,-34
-            4690: -32,-34
-            4691: -31,-34
-            4692: -30,-34
-            4693: -30,-33
-            4694: -28,-34
-            4695: -28,-32
-            4696: -28,-31
-            4697: -28,-29
-            4698: -28,-27
-            4699: -28,-26
-            4700: -29,-25
-            4701: -30,-25
-            4702: -30,-26
-            4703: -32,-25
-            4704: -33,-26
-            4705: -35,-25
-            4706: -32,6
-            4707: -32,7
-            4708: -32,6
-            4709: -36,6
-            4710: -36,5
-            4711: -36,7
-            4712: -34,6
-            4713: -34,5
-            4714: -35,6
-            4715: -33,6
-            4716: -35,-4
-            4717: -35,-2
-            4718: -36,-5
-            4719: -35,-2
-            4720: -34,-2
-            4721: -35,-1
-            4733: -25,28
-            4734: -26,28
-            4735: -18,32
-            4736: -17,31
-            4737: -17,33
-            4738: -18,32
-            4739: -15,34
-            4740: -15,32
-            4741: -15,31
-            4742: -13,31
-            4743: -12,31
-            4744: -15,34
-            4745: -15,34
-            4746: -12,39
-            4747: -13,40
-            4748: -14,40
-            4749: -15,40
-            4750: -16,40
-            4751: -16,40
-            4752: -13,40
-            4753: -12,40
-            4754: -12,38
-            4755: -12,40
-            4761: -5,40
-            4762: -6,40
-            4763: -6,42
-            4764: -6,43
-            4765: -5,42
-            4766: -6,43
-            4767: -6,45
-            4768: -6,46
-            4769: -6,47
-            4770: -5,46
-            4771: -4,48
-            4772: -5,46
-            4773: -2,48
-            4774: -4,46
-            4775: -1,47
-            4776: -3,45
-            4777: 0,46
-            4778: -3,47
-            4779: -1,45
-            4780: -3,46
-            4781: 1,45
-            4782: 1,47
-            4783: 0,46
-            4784: 1,48
-            4785: 2,48
-            4786: 3,47
-            4787: 2,45
-            4788: 2,44
-            4789: 2,43
-            4790: 2,42
-            4791: 1,42
-            4792: 3,42
-            4793: -2,43
-            4794: -1,41
-            4795: -3,40
-            4796: -3,40
-            4797: 1,51
-            4798: -2,50
-            4799: -3,50
-            4800: -2,51
-            4801: 0,51
-            4802: -1,52
-            4803: -2,51
-            4804: -2,53
-            4805: 1,53
-            4806: 2,51
-            4807: 2,50
-            4808: 0,50
-            4809: -4,45
-            4810: -4,47
-            4837: 6,42
-            4838: 5,41
-            4839: 5,39
-            4840: 7,39
-            4841: 8,39
-            4842: 9,41
-            4843: 9,40
-            4844: 8,42
-            4845: 8,41
-            4846: 15,37
-            4847: 14,37
-            4848: 14,35
-            4849: 14,34
-            4850: 13,35
-            4851: 13,36
-            4852: 15,34
-            4853: 16,35
-            4854: 15,36
-            4855: 15,34
-            4856: 15,35
-            4857: 15,37
-            4858: 14,37
-            4859: 15,30
-            4860: 14,29
-            4861: 14,29
-            4862: 15,28
-            4863: 14,29
-            4864: 14,32
-            4865: 13,32
-            4866: 15,24
-            4890: 2,24
-            4891: 1,24
-            4892: 1,24
-            4893: 2,23
-            4894: 4,23
-            4895: 4,24
-            4896: 3,26
-            4897: 4,28
-            4898: 2,27
-            4899: 2,27
-            4900: 3,27
-            4901: -2,25
-            4902: -3,25
-            4903: -3,23
-            4904: -2,24
-            4905: -4,23
-            4906: -4,25
-            4942: -14,28
-            4943: -15,28
-            4944: -14,29
-            4945: -13,26
-            4946: -10,26
-            4947: -9,27
-            4948: -10,28
-            4949: -7,28
-            4950: -8,26
-            4951: -5,28
-            4952: -7,24
-            4953: -8,24
-            4954: -7,23
-            4955: -6,24
-            4956: -6,23
-            4957: -7,23
-            4958: -8,23
-            4959: -8,23
-            4960: -12,23
-            4961: -11,24
-            4962: -10,23
-            4963: -10,24
-            4964: -10,24
-            4965: -12,24
-            4966: -12,24
-            4967: -14,24
-            4968: -14,23
-            4969: -16,24
-            4970: -14,24
-            4971: -15,23
-            4972: -16,24
-            4973: -14,25
-            4974: -10,25
-            4975: -7,25
-            4976: -1,28
-            4977: -3,27
-            4978: -1,30
-            4979: -1,33
-            4980: -1,34
-            4981: -1,37
-            4982: -3,37
-            4983: -3,38
-            4984: -1,37
-            4985: -2,37
-            4986: -1,40
-            4987: -3,41
-            4988: -3,43
-            4989: -2,43
-            4990: -20,25
-            4991: -21,25
-            4992: -19,25
-            4993: -21,25
-            4994: -22,17
-            4995: -23,17
-            4996: -22,5
-            4997: -22,5
-            4998: -22,5
-            4999: -19,-28
-            5000: -16,-28
-            5001: -16,-27
-            5002: -15,-28
-            5003: -16,-26
-            5004: -15,-27
-            5005: -15,-28
-            5006: -15,-26
-            5007: -15,-26
-            5008: -14,-26
-            5019: -25,-34
-            5020: -23,-34
-            5021: -22,-34
-            5022: -21,-34
-            5023: -20,-34
-            5024: -20,-37
-            5025: -20,-36
-            5026: -19,-38
-            5027: -19,-36
-            5028: -22,-37
-            5029: -23,-37
-            5030: -23,-38
-            5031: -23,-36
-            5032: -24,-37
-            5033: -26,-37
-            5034: -26,-36
-            5035: -26,-37
-            5036: -28,-40
-            5037: -27,-40
-            5038: -25,-40
-            5039: -24,-40
-            5040: -23,-40
-            5041: -21,-40
-            5042: -19,-40
-            5043: -21,-40
-            5044: -24,-40
-            5045: -26,-40
-            5046: -32,-40
-            5047: -31,-40
-            5048: -33,-39
+            4651: -49,-18
+            4652: -38,-33
+            4653: -36,-33
+            4654: -33,-33
+            4655: -32,-33
+            4656: -31,-33
+            4657: -31,-31
+            4658: -31,-29
+            4659: -31,-28
+            4660: -31,-26
+            4661: -33,-26
+            4662: -35,-26
+            4663: -36,-26
+            4664: -37,-26
+            4665: -38,-26
+            4666: -38,-27
+            4667: -38,-29
+            4668: -38,-30
+            4669: -38,-31
+            4670: -38,-29
+            4671: -38,-26
+            4672: -40,-26
+            4673: -40,-25
+            4674: -41,-25
+            4675: -41,-26
+            4676: -41,-28
+            4677: -41,-29
+            4678: -41,-30
+            4679: -41,-32
+            4680: -41,-33
+            4681: -41,-34
+            4682: -39,-33
+            4683: -40,-34
+            4684: -35,-34
+            4685: -34,-34
+            4686: -32,-34
+            4687: -31,-34
+            4688: -30,-34
+            4689: -30,-33
+            4690: -28,-34
+            4691: -28,-32
+            4692: -28,-31
+            4693: -28,-29
+            4694: -28,-27
+            4695: -28,-26
+            4696: -29,-25
+            4697: -30,-25
+            4698: -30,-26
+            4699: -32,-25
+            4700: -33,-26
+            4701: -35,-25
+            4702: -32,6
+            4703: -32,7
+            4704: -32,6
+            4705: -36,6
+            4706: -36,5
+            4707: -36,7
+            4708: -34,6
+            4709: -34,5
+            4710: -35,6
+            4711: -33,6
+            4712: -35,-4
+            4713: -35,-2
+            4714: -36,-5
+            4715: -35,-2
+            4716: -34,-2
+            4717: -35,-1
+            4729: -25,28
+            4730: -26,28
+            4731: -18,32
+            4732: -17,31
+            4733: -17,33
+            4734: -18,32
+            4735: -15,34
+            4736: -15,32
+            4737: -15,31
+            4738: -13,31
+            4739: -12,31
+            4740: -15,34
+            4741: -15,34
+            4742: -12,39
+            4743: -13,40
+            4744: -14,40
+            4745: -15,40
+            4746: -16,40
+            4747: -16,40
+            4748: -13,40
+            4749: -12,40
+            4750: -12,38
+            4751: -12,40
+            4757: -5,40
+            4758: -6,40
+            4759: -6,42
+            4760: -6,43
+            4761: -5,42
+            4762: -6,43
+            4763: -6,45
+            4764: -6,46
+            4765: -6,47
+            4766: -5,46
+            4767: -4,48
+            4768: -5,46
+            4769: -2,48
+            4770: -4,46
+            4771: -1,47
+            4772: -3,45
+            4773: 0,46
+            4774: -3,47
+            4775: -1,45
+            4776: -3,46
+            4777: 1,45
+            4778: 1,47
+            4779: 0,46
+            4780: 1,48
+            4781: 2,48
+            4782: 3,47
+            4783: 2,45
+            4784: 2,44
+            4785: 2,43
+            4786: 2,42
+            4787: 1,42
+            4788: 3,42
+            4789: -2,43
+            4790: -1,41
+            4791: -3,40
+            4792: -3,40
+            4793: 1,51
+            4794: -2,50
+            4795: -3,50
+            4796: -2,51
+            4797: 0,51
+            4798: -1,52
+            4799: -2,51
+            4800: -2,53
+            4801: 1,53
+            4802: 2,51
+            4803: 2,50
+            4804: 0,50
+            4805: -4,45
+            4806: -4,47
+            4833: 6,42
+            4834: 5,41
+            4835: 5,39
+            4836: 7,39
+            4837: 8,39
+            4838: 9,41
+            4839: 9,40
+            4840: 8,42
+            4841: 8,41
+            4842: 15,37
+            4843: 14,37
+            4844: 14,35
+            4845: 14,34
+            4846: 13,35
+            4847: 13,36
+            4848: 15,34
+            4849: 16,35
+            4850: 15,36
+            4851: 15,34
+            4852: 15,35
+            4853: 15,37
+            4854: 14,37
+            4855: 15,30
+            4856: 14,29
+            4857: 14,29
+            4858: 15,28
+            4859: 14,29
+            4860: 14,32
+            4861: 13,32
+            4862: 15,24
+            4886: 2,24
+            4887: 1,24
+            4888: 1,24
+            4889: 2,23
+            4890: 4,23
+            4891: 4,24
+            4892: 3,26
+            4893: 4,28
+            4894: 2,27
+            4895: 2,27
+            4896: 3,27
+            4897: -2,25
+            4898: -3,25
+            4899: -3,23
+            4900: -2,24
+            4901: -4,23
+            4902: -4,25
+            4938: -14,28
+            4939: -15,28
+            4940: -14,29
+            4941: -13,26
+            4942: -10,26
+            4943: -9,27
+            4944: -10,28
+            4945: -7,28
+            4946: -8,26
+            4947: -5,28
+            4948: -7,24
+            4949: -8,24
+            4950: -7,23
+            4951: -6,24
+            4952: -6,23
+            4953: -7,23
+            4954: -8,23
+            4955: -8,23
+            4956: -12,23
+            4957: -11,24
+            4958: -10,23
+            4959: -10,24
+            4960: -10,24
+            4961: -12,24
+            4962: -12,24
+            4963: -14,24
+            4964: -14,23
+            4965: -16,24
+            4966: -14,24
+            4967: -15,23
+            4968: -16,24
+            4969: -14,25
+            4970: -10,25
+            4971: -7,25
+            4972: -1,28
+            4973: -3,27
+            4974: -1,30
+            4975: -1,33
+            4976: -1,34
+            4977: -1,37
+            4978: -3,37
+            4979: -3,38
+            4980: -1,37
+            4981: -2,37
+            4982: -1,40
+            4983: -3,41
+            4984: -3,43
+            4985: -2,43
+            4986: -20,25
+            4987: -21,25
+            4988: -19,25
+            4989: -21,25
+            4990: -22,17
+            4991: -23,17
+            4992: -22,5
+            4993: -22,5
+            4994: -22,5
+            4995: -19,-28
+            4996: -16,-28
+            4997: -16,-27
+            4998: -15,-28
+            4999: -16,-26
+            5000: -15,-27
+            5001: -15,-28
+            5002: -15,-26
+            5003: -15,-26
+            5004: -14,-26
+            5015: -25,-34
+            5016: -23,-34
+            5017: -22,-34
+            5018: -21,-34
+            5019: -20,-34
+            5020: -20,-37
+            5021: -20,-36
+            5022: -19,-38
+            5023: -19,-36
+            5024: -22,-37
+            5025: -23,-37
+            5026: -23,-38
+            5027: -23,-36
+            5028: -24,-37
+            5029: -26,-37
+            5030: -26,-36
+            5031: -26,-37
+            5032: -28,-40
+            5033: -27,-40
+            5034: -25,-40
+            5035: -24,-40
+            5036: -23,-40
+            5037: -21,-40
+            5038: -19,-40
+            5039: -21,-40
+            5040: -24,-40
+            5041: -26,-40
+            5042: -32,-40
+            5043: -31,-40
+            5044: -33,-39
+            5045: -33,-40
+            5046: -32,-39
+            5047: -31,-39
+            5048: -34,-39
             5049: -33,-40
-            5050: -32,-39
-            5051: -31,-39
-            5052: -34,-39
-            5053: -33,-40
-            5054: -39,-38
-            5055: -38,-38
-            5056: -29,-46
+            5050: -39,-38
+            5051: -38,-38
+            5052: -29,-46
+            5053: -30,-45
+            5054: -30,-45
+            5055: -30,-44
+            5056: -29,-45
             5057: -30,-45
-            5058: -30,-45
-            5059: -30,-44
-            5060: -29,-45
-            5061: -30,-45
-            5062: -30,-44
-            5063: -29,-45
-            5064: -38,-53
-            5065: -38,-54
-            5066: -37,-53
-            5067: -37,-54
-            5068: -14,-39
-            5069: -13,-38
-            5070: -13,-39
-            5071: -13,-40
-            5072: -13,-41
-            5073: -13,-39
-            5074: -13,-40
-            5075: -13,-41
-            5076: -13,-39
-            5077: -13,-40
-            5078: -13,-39
-            5079: -13,-40
-            5082: -5,-41
-            5083: -5,-40
-            5084: -6,-42
-            5085: -5,-36
-            5086: -6,-36
-            5087: -4,-35
-            5088: -4,-36
-            5089: 0,-36
-            5090: -2,-36
-            5091: 1,-35
-            5092: 1,-37
-            5093: 1,-38
-            5094: 2,-37
-            5095: 2,-38
-            5096: 0,-37
-            5097: 3,-37
-            5098: -1,-36
-            5102: -6,-28
-            5103: -6,-27
-            5104: -5,-27
-            5105: -6,-26
-            5106: -2,-27
-            5107: -3,-26
-            5108: -2,-28
-            5109: -1,-27
-            5110: 0,-27
-            5111: 0,-27
-            5112: -2,-27
-            5113: -2,-27
-            5114: 0,-24
-            5115: -2,-24
-            5116: -2,-23
-            5117: 0,-22
-            5118: 1,-22
-            5119: 1,-21
-            5120: -4,-19
-            5121: -5,-19
-            5122: -7,-19
-            5123: -9,-19
-            5124: -6,-19
-            5125: -7,-17
-            5126: -8,-17
-            5127: -9,-16
-            5128: -9,-16
-            5129: -5,-16
-            5130: -4,-14
-            5131: -5,-15
-            5132: -8,-16
-            5133: -8,-15
-            5134: -14,-14
-            5135: -12,-14
-            5136: -12,-16
-            5137: -13,-18
-            5138: -14,-16
-            5139: -13,-16
-            5140: -13,-19
-            5141: -14,-19
-            5142: -2,-17
-            5143: -2,-15
-            5144: -2,-13
-            5145: -2,-12
-            5146: -1,-15
-            5147: -1,-16
-            5148: -1,-17
-            5149: 1,-17
-            5150: -1,-18
-            5151: 2,-18
-            5152: 2,-16
-            5153: 2,-15
-            5154: 2,-13
-            5155: 1,-12
-            5156: 1,-14
-            5157: -1,-13
-            5158: 0,-14
-            5159: 2,-16
-            5160: -4,-14
-            5161: -7,-24
-            5162: -7,-22
-            5163: -8,-23
-            5164: -10,-23
-            5165: -9,-23
-            5166: -1,-24
-            5167: 8,-23
-            5168: 8,-22
-            5169: 10,-22
-            5170: 9,-23
-            5171: 8,-25
-            5172: 8,-21
-            5173: 8,-19
-            5174: 8,-18
-            5175: 6,-18
-            5176: 5,-18
-            5177: 0,-27
-            5178: 2,-27
-            5179: 10,-23
-            5180: 13,-23
-            5181: 12,-23
-            5182: 13,-21
-            5183: 14,-22
-            5184: 13,-18
-            5185: 14,-18
-            5186: 14,-17
-            5187: 12,-18
-            5188: 11,-18
-            5189: 11,-16
-            5190: 13,-17
-            5191: 11,-30
-            5192: 11,-28
-            5193: 11,-27
-            5194: 11,-26
-            5195: 17,-26
-            5196: 17,-28
-            5197: 17,-28
-            5198: 17,-30
-            5199: 17,-30
-            5200: 18,-23
-            5201: 20,-22
-            5202: 21,-23
-            5203: 19,-22
-            5204: 21,-22
-            5205: 20,-21
-            5206: 24,-22
-            5207: 23,-23
-            5208: 23,-21
-            5209: 23,-23
-            5210: 17,-16
-            5211: 19,-14
-            5212: 18,-13
-            5213: 20,-13
-            5214: 19,-12
-            5215: 22,-11
-            5216: 22,-13
+            5058: -30,-44
+            5059: -29,-45
+            5060: -38,-53
+            5061: -38,-54
+            5062: -37,-53
+            5063: -37,-54
+            5064: -14,-39
+            5065: -13,-38
+            5066: -13,-39
+            5067: -13,-40
+            5068: -13,-41
+            5069: -13,-39
+            5070: -13,-40
+            5071: -13,-41
+            5072: -13,-39
+            5073: -13,-40
+            5074: -13,-39
+            5075: -13,-40
+            5078: -5,-41
+            5079: -5,-40
+            5080: -6,-42
+            5081: -5,-36
+            5082: -6,-36
+            5083: -4,-35
+            5084: -4,-36
+            5085: 0,-36
+            5086: -2,-36
+            5087: 1,-35
+            5088: 1,-37
+            5089: 1,-38
+            5090: 2,-37
+            5091: 2,-38
+            5092: 0,-37
+            5093: 3,-37
+            5094: -1,-36
+            5098: -6,-28
+            5099: -6,-27
+            5100: -5,-27
+            5101: -6,-26
+            5102: -2,-27
+            5103: -3,-26
+            5104: -2,-28
+            5105: -1,-27
+            5106: 0,-27
+            5107: 0,-27
+            5108: -2,-27
+            5109: -2,-27
+            5110: 0,-24
+            5111: -2,-24
+            5112: -2,-23
+            5113: 0,-22
+            5114: 1,-22
+            5115: 1,-21
+            5116: -4,-19
+            5117: -5,-19
+            5118: -7,-19
+            5119: -9,-19
+            5120: -6,-19
+            5121: -7,-17
+            5122: -8,-17
+            5123: -9,-16
+            5124: -9,-16
+            5125: -5,-16
+            5126: -4,-14
+            5127: -5,-15
+            5128: -8,-16
+            5129: -8,-15
+            5130: -14,-14
+            5131: -12,-14
+            5132: -12,-16
+            5133: -13,-18
+            5134: -14,-16
+            5135: -13,-16
+            5136: -13,-19
+            5137: -14,-19
+            5138: -2,-17
+            5139: -2,-15
+            5140: -2,-13
+            5141: -2,-12
+            5142: -1,-15
+            5143: -1,-16
+            5144: -1,-17
+            5145: 1,-17
+            5146: -1,-18
+            5147: 2,-18
+            5148: 2,-16
+            5149: 2,-15
+            5150: 2,-13
+            5151: 1,-12
+            5152: 1,-14
+            5153: -1,-13
+            5154: 0,-14
+            5155: 2,-16
+            5156: -4,-14
+            5157: -7,-24
+            5158: -7,-22
+            5159: -8,-23
+            5160: -10,-23
+            5161: -9,-23
+            5162: -1,-24
+            5163: 8,-23
+            5164: 8,-22
+            5165: 10,-22
+            5166: 9,-23
+            5167: 8,-25
+            5168: 8,-21
+            5169: 8,-19
+            5170: 8,-18
+            5171: 6,-18
+            5172: 5,-18
+            5173: 0,-27
+            5174: 2,-27
+            5175: 10,-23
+            5176: 13,-23
+            5177: 12,-23
+            5178: 13,-21
+            5179: 14,-22
+            5180: 13,-18
+            5181: 14,-18
+            5182: 14,-17
+            5183: 12,-18
+            5184: 11,-18
+            5185: 11,-16
+            5186: 13,-17
+            5187: 11,-30
+            5188: 11,-28
+            5189: 11,-27
+            5190: 11,-26
+            5191: 17,-26
+            5192: 17,-28
+            5193: 17,-28
+            5194: 17,-30
+            5195: 17,-30
+            5196: 18,-23
+            5197: 20,-22
+            5198: 21,-23
+            5199: 19,-22
+            5200: 21,-22
+            5201: 20,-21
+            5202: 24,-22
+            5203: 23,-23
+            5204: 23,-21
+            5205: 23,-23
+            5206: 17,-16
+            5207: 19,-14
+            5208: 18,-13
+            5209: 20,-13
+            5210: 19,-12
+            5211: 22,-11
+            5212: 22,-13
+            5213: 20,-11
+            5214: 24,-13
+            5215: 26,-11
+            5216: 21,-11
             5217: 20,-11
-            5218: 24,-13
-            5219: 26,-11
-            5220: 21,-11
-            5221: 20,-11
-            5222: 25,-13
-            5223: 22,-13
-            5224: 23,-12
-            5225: 26,-12
-            5226: 19,-12
-            5227: 23,-13
-            5228: 23,-11
-            5229: 19,-10
-            5230: 26,-11
-            5231: 28,-12
-            5232: 25,-12
-            5233: 23,-16
-            5234: 23,-16
-            5235: 13,-19
-            5236: 23,-34
-            5237: 23,-31
-            5238: 23,-30
-            5239: 23,-29
-            5240: 23,-32
-            5241: 29,-34
-            5242: 29,-33
-            5243: 29,-32
-            5244: 29,-30
-            5245: 29,-29
-            5246: 32,-34
-            5247: 32,-31
-            5248: 32,-30
-            5249: 36,-30
-            5250: 35,-29
-            5251: 33,-26
-            5252: 36,-21
-            5253: 38,-16
+            5218: 25,-13
+            5219: 22,-13
+            5220: 23,-12
+            5221: 26,-12
+            5222: 19,-12
+            5223: 23,-13
+            5224: 23,-11
+            5225: 19,-10
+            5226: 26,-11
+            5227: 28,-12
+            5228: 25,-12
+            5229: 23,-16
+            5230: 23,-16
+            5231: 13,-19
+            5232: 23,-34
+            5233: 23,-31
+            5234: 23,-30
+            5235: 23,-29
+            5236: 23,-32
+            5237: 29,-34
+            5238: 29,-33
+            5239: 29,-32
+            5240: 29,-30
+            5241: 29,-29
+            5242: 32,-34
+            5243: 32,-31
+            5244: 32,-30
+            5245: 36,-30
+            5246: 35,-29
+            5247: 33,-26
+            5248: 36,-21
+            5249: 38,-16
+            5250: 37,-15
+            5251: 39,-16
+            5252: 38,-17
+            5253: 38,-15
             5254: 37,-15
-            5255: 39,-16
-            5256: 38,-17
-            5257: 38,-15
-            5258: 37,-15
-            5259: 62,-31
-            5260: 62,-33
-            5261: 61,-31
-            5262: 63,-33
-            5263: 63,-33
-            5264: 63,-32
-            5265: 62,-32
-            5266: 62,-32
-            5267: 64,8
-            5268: 63,9
-            5269: 65,9
-            5270: 64,8
-            5271: 64,9
-            5272: 64,10
-            5273: 67,6
-            5274: 68,4
-            5275: 68,6
-            5276: 67,5
-            5277: 68,0
-            5278: 68,1
-            5279: 68,2
-            5280: 67,0
-            5281: 68,-2
-            5282: 67,-3
-            5283: 68,-4
-            5284: 68,-3
-            5285: 68,-3
-            5286: 76,-6
-            5292: 54,-30
-            5293: 52,-31
-            5294: 51,-31
-            5295: 52,-33
-            5296: 52,-34
-            5297: 51,-33
-            5298: 51,-32
+            5255: 62,-31
+            5256: 62,-33
+            5257: 61,-31
+            5258: 63,-33
+            5259: 63,-33
+            5260: 63,-32
+            5261: 62,-32
+            5262: 62,-32
+            5263: 64,8
+            5264: 63,9
+            5265: 65,9
+            5266: 64,8
+            5267: 64,9
+            5268: 64,10
+            5269: 67,6
+            5270: 68,4
+            5271: 68,6
+            5272: 67,5
+            5273: 68,0
+            5274: 68,1
+            5275: 68,2
+            5276: 67,0
+            5277: 68,-2
+            5278: 67,-3
+            5279: 68,-4
+            5280: 68,-3
+            5281: 68,-3
+            5282: 76,-6
+            5288: 54,-30
+            5289: 52,-31
+            5290: 51,-31
+            5291: 52,-33
+            5292: 52,-34
+            5293: 51,-33
+            5294: 51,-32
+            5295: 52,-35
+            5296: 51,-33
+            5297: 51,-31
+            5298: 52,-35
             5299: 52,-35
-            5300: 51,-33
-            5301: 51,-31
-            5302: 52,-35
-            5303: 52,-35
-            5304: 55,-35
-            5305: 54,-34
-            5306: 56,-33
-            5307: 57,-33
-            5308: 55,-34
-            5309: 55,-36
-            5310: 54,-35
-            5311: 55,-34
-            5312: 54,-35
-            5313: 55,-35
-            5314: 55,-34
-            5315: 40,-31
-            5316: 40,-30
-            5317: 40,-30
-            5318: 41,-31
-            5319: 41,-29
-            5320: 42,-29
-            5321: 43,-29
-            5322: 44,-29
-            5323: 44,-31
-            5324: 43,-30
-            5325: 33,-29
-            5326: 15,-39
-            5327: 14,-39
-            5328: 14,-39
-            5329: 9,-40
-            5330: 9,-39
-            5331: 9,-41
-            5332: 8,-40
-            5333: 9,-45
-            5334: 8,-45
-            5335: 8,-45
-            5336: 19,-45
-            5337: 17,-45
-            5338: 16,-44
-            5339: 16,-45
-            5340: 16,-43
-            5341: 19,-45
-            5342: 20,-44
-            5343: 20,-45
-            5344: 18,-44
-            5345: 21,-45
-            5346: 21,-43
-            5347: 15,-48
-            5348: 14,-48
-            5349: 12,-47
-            5350: 12,-48
-            5351: 14,-48
-            5352: 16,-47
-            5353: 14,-48
-            5354: 13,-48
-            5355: 15,-47
-            5362: 21,-54
-            5363: 20,-54
-            5364: 18,-54
-            5365: 16,-54
-            5366: 16,-55
-            5367: 18,-53
-            5368: 19,-53
-            5369: 21,-55
-            5370: 21,-58
-            5371: 21,-59
-            5372: 20,-58
-            5373: 18,-58
-            5374: 17,-58
-            5375: 16,-58
-            5376: 16,-59
-            5377: 19,-59
-            5378: 19,-59
-            5379: 18,-59
-            5380: 27,-46
-            5381: 26,-45
-            5382: 26,-44
-            5383: 27,-45
-            5384: 27,-45
-            5385: 28,-42
-            5386: 29,-42
-            5387: 29,-40
-            5388: 28,-39
-            5389: 28,-39
-            5390: 28,-40
-            5391: 29,-47
-            5392: 28,-47
-            5393: 66,-52
-            5394: 65,-51
-            5395: 66,-52
-            5396: 66,-51
-            5397: 65,-52
-            5398: 66,-51
-            5399: 27,15
-            5400: 28,15
-            5401: 27,14
-            5402: 27,12
-            5403: -23,34
-            5404: -23,35
-            5405: -22,34
-            5406: -27,36
-            5407: -27,34
-            5408: -28,35
-            5409: -27,35
-            5410: -29,36
-            5411: -30,37
-            5412: -30,38
-            5413: -28,35
-            5414: -28,34
-            5415: -29,35
-            5416: -26,36
-            5417: -25,38
-            5418: -26,37
-            5419: -32,36
-            5420: -33,35
-            5421: -33,37
-            5422: -33,35
-            5423: -34,36
-            5424: -33,38
-            5425: -33,35
-            5426: -36,5
-            5427: -42,6
-            5428: -43,4
-            5429: -43,6
-            5430: -42,7
-            5431: -51,9
-            5432: -49,13
-            5433: -42,-5
-            5434: -43,-5
-            5435: -42,-3
-            5436: -45,-4
-            5437: -45,-5
-            5438: -46,-4
-            5439: -43,-3
-            5440: -43,-2
-            5441: -42,-2
-            5442: -60,-29
-            5443: -60,-29
-            5444: -57,-36
-            5445: -58,-36
-            5446: -59,-36
-            5447: -57,-37
-            5448: -58,-35
-            5449: -58,-34
-            5450: -57,-35
-            5451: -59,-34
-            5452: -58,-34
-            5453: -59,-34
-            5454: -60,-34
-            5455: -60,-35
-            5456: -61,-21
-            5457: -62,-21
-            5458: -62,-20
-            5459: -61,-20
-            5460: -61,-20
-            5461: 13,35
-            6115: 52,20
-            6116: 51,21
-            6117: 53,20
-            6118: 53,21
-            6219: 46,14
-            6220: 45,15
-            6221: 46,16
-            6427: 49,-7
-            6428: 48,-6
-            6429: 48,-4
-            6430: 49,-4
-            6431: 52,-7
-            6432: 52,-5
-            6433: 51,-6
-            6434: 52,-2
-            6435: 52,-3
-            6436: 48,-1
-            6437: 48,-2
-            6457: 49,-12
-            6458: 49,-14
-            6459: 49,-15
-            6460: 49,-13
-            6461: 52,-14
-            6462: 52,-13
-            6463: 52,-12
-            6464: 52,-15
-            6465: 52,-15
-            6466: 52,-10
-            6467: 51,1
-            6468: 51,3
-            6469: 51,4
-            6471: 51,8
-            6472: 51,9
-            6473: 51,11
-            6474: 51,13
-            6475: 49,13
-            6476: 49,11
-            6477: 49,9
-            6478: 49,7
-            6479: 49,5
-            6480: 49,3
-            6481: 49,1
-            6494: 42,9
-            6495: 43,9
-            6496: 42,7
-            6497: 43,7
-            6498: 45,7
-            6499: 45,9
-            6500: 46,7
-            6501: 40,4
-            6502: 42,4
-            6503: 43,4
-            6504: 43,2
-            6505: 43,1
-            6506: 43,-2
-            6507: 43,-4
-            6508: 43,-7
-            6509: 43,-6
-            6510: 43,-10
-            6511: 43,-11
-            6512: 45,5
-            6513: 42,5
-            6514: 41,5
-            6593: 90,-18
-            6594: 89,-18
-            6677: 51,-39
-            6678: 52,-39
-            6679: 54,-39
-            6680: 52,-37
-            6690: 51,-30
-            6691: 52,-29
-            6715: -33,-12
-            6716: -33,-10
-            6732: -36,-45
-            6733: -35,-44
-            6734: -35,-46
-            6826: 14,39
-            6827: 13,40
-            6828: 15,42
-            6829: 15,41
-            6830: 16,39
+            5300: 55,-35
+            5301: 54,-34
+            5302: 56,-33
+            5303: 57,-33
+            5304: 55,-34
+            5305: 55,-36
+            5306: 54,-35
+            5307: 55,-34
+            5308: 54,-35
+            5309: 55,-35
+            5310: 55,-34
+            5311: 40,-31
+            5312: 40,-30
+            5313: 40,-30
+            5314: 41,-31
+            5315: 41,-29
+            5316: 42,-29
+            5317: 43,-29
+            5318: 44,-29
+            5319: 44,-31
+            5320: 43,-30
+            5321: 33,-29
+            5322: 15,-39
+            5323: 14,-39
+            5324: 14,-39
+            5325: 9,-40
+            5326: 9,-39
+            5327: 9,-41
+            5328: 8,-40
+            5332: 19,-45
+            5333: 17,-45
+            5334: 16,-44
+            5335: 16,-45
+            5336: 16,-43
+            5337: 19,-45
+            5338: 20,-44
+            5339: 20,-45
+            5340: 18,-44
+            5341: 21,-45
+            5342: 21,-43
+            5343: 15,-48
+            5344: 14,-48
+            5345: 12,-47
+            5346: 12,-48
+            5347: 14,-48
+            5348: 16,-47
+            5349: 14,-48
+            5350: 13,-48
+            5351: 15,-47
+            5358: 21,-54
+            5359: 20,-54
+            5360: 18,-54
+            5361: 16,-54
+            5362: 16,-55
+            5363: 18,-53
+            5364: 19,-53
+            5365: 21,-55
+            5366: 21,-58
+            5367: 21,-59
+            5368: 20,-58
+            5369: 18,-58
+            5370: 17,-58
+            5371: 16,-58
+            5372: 16,-59
+            5373: 19,-59
+            5374: 19,-59
+            5375: 18,-59
+            5376: 27,-46
+            5377: 26,-45
+            5378: 26,-44
+            5379: 27,-45
+            5380: 27,-45
+            5381: 28,-42
+            5382: 29,-42
+            5383: 29,-40
+            5384: 28,-39
+            5385: 28,-39
+            5386: 28,-40
+            5387: 29,-47
+            5388: 28,-47
+            5389: 66,-52
+            5390: 65,-51
+            5391: 66,-52
+            5392: 66,-51
+            5393: 65,-52
+            5394: 66,-51
+            5395: 27,15
+            5396: 28,15
+            5397: 27,14
+            5398: 27,12
+            5399: -23,34
+            5400: -23,35
+            5401: -22,34
+            5402: -27,36
+            5403: -27,34
+            5404: -28,35
+            5405: -27,35
+            5406: -29,36
+            5407: -30,37
+            5408: -30,38
+            5409: -28,35
+            5410: -28,34
+            5411: -29,35
+            5412: -26,36
+            5413: -25,38
+            5414: -26,37
+            5415: -32,36
+            5416: -33,35
+            5417: -33,37
+            5418: -33,35
+            5419: -34,36
+            5420: -33,38
+            5421: -33,35
+            5422: -36,5
+            5423: -42,6
+            5424: -43,4
+            5425: -43,6
+            5426: -42,7
+            5427: -51,9
+            5428: -49,13
+            5429: -42,-5
+            5430: -43,-5
+            5431: -42,-3
+            5432: -45,-4
+            5433: -45,-5
+            5434: -46,-4
+            5435: -43,-3
+            5436: -43,-2
+            5437: -42,-2
+            5438: -60,-29
+            5439: -60,-29
+            5440: -57,-36
+            5441: -58,-36
+            5442: -59,-36
+            5443: -57,-37
+            5444: -58,-35
+            5445: -58,-34
+            5446: -57,-35
+            5447: -59,-34
+            5448: -58,-34
+            5449: -59,-34
+            5450: -60,-34
+            5451: -60,-35
+            5452: -61,-21
+            5453: -62,-21
+            5454: -62,-20
+            5455: -61,-20
+            5456: -61,-20
+            5457: 13,35
+            6111: 52,20
+            6112: 51,21
+            6113: 53,20
+            6114: 53,21
+            6215: 46,14
+            6216: 45,15
+            6217: 46,16
+            6422: 49,-7
+            6423: 48,-6
+            6424: 48,-4
+            6425: 49,-4
+            6426: 52,-7
+            6427: 52,-5
+            6428: 51,-6
+            6429: 52,-2
+            6430: 52,-3
+            6431: 48,-1
+            6432: 48,-2
+            6452: 49,-12
+            6453: 49,-14
+            6454: 49,-15
+            6455: 49,-13
+            6456: 52,-14
+            6457: 52,-13
+            6458: 52,-12
+            6459: 52,-15
+            6460: 52,-15
+            6461: 52,-10
+            6462: 51,1
+            6463: 51,3
+            6464: 51,4
+            6465: 51,8
+            6466: 51,9
+            6467: 51,11
+            6468: 51,13
+            6469: 49,13
+            6470: 49,11
+            6471: 49,9
+            6472: 49,7
+            6473: 49,5
+            6474: 49,3
+            6475: 49,1
+            6488: 42,9
+            6489: 43,9
+            6490: 42,7
+            6491: 43,7
+            6492: 45,7
+            6493: 45,9
+            6494: 46,7
+            6495: 40,4
+            6496: 42,4
+            6497: 43,4
+            6498: 43,2
+            6499: 43,1
+            6500: 43,-2
+            6501: 43,-4
+            6502: 43,-7
+            6503: 43,-6
+            6504: 43,-10
+            6505: 43,-11
+            6506: 45,5
+            6507: 42,5
+            6508: 41,5
+            6587: 90,-18
+            6588: 89,-18
+            6671: 51,-39
+            6672: 52,-39
+            6673: 54,-39
+            6674: 52,-37
+            6684: 51,-30
+            6685: 52,-29
+            6709: -33,-12
+            6710: -33,-10
+            6726: -36,-45
+            6727: -35,-44
+            6728: -35,-46
+            6820: 14,39
+            6821: 13,40
+            6822: 15,42
+            6823: 15,41
+            6824: 16,39
+            6884: 8,-47
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            3016: -43,17
+            3012: -43,17
         - node:
             cleanable: True
             color: '#835432FF'
             id: DirtHeavyMonotile
           decals:
-            2924: -38,29
-            2925: -36,28
-            2926: -34,26
-            2927: -34,24
-            2928: -36,22
-            2929: -37,25
-            2930: -37,26
-            2931: -37,27
-            2932: -38,27
-            2933: -36,26
+            2920: -38,29
+            2921: -36,28
+            2922: -34,26
+            2923: -34,24
+            2924: -36,22
+            2925: -37,25
+            2926: -37,26
+            2927: -37,27
+            2928: -38,27
+            2929: -36,26
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            6618: 88,-21
-            6619: 88,-20
-            6620: 91,-20
-            6623: 87,-20
-            6626: 88,-19
+            6612: 88,-21
+            6613: 88,-20
+            6614: 91,-20
+            6617: 87,-20
+            6620: 88,-19
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            3185: 4,-31
-            3186: 0,-31
-            3187: -4,-31
-            3188: -8,-31
-            3189: -10,-31
-            3190: -13,-31
-            3191: -17,-31
-            3192: -18,-31
-            3193: -21,-31
-            3194: -25,-31
-            3195: -25,-27
-            3196: -25,-24
-            3197: -25,-22
-            3198: -25,-19
-            3199: -25,-18
-            3200: -25,-13
-            3201: -25,-11
-            3202: -24,-10
-            3203: -24,-8
-            3204: -22,-2
-            3205: -22,0
-            3206: -22,3
-            3207: -20,8
-            3208: -22,9
-            3209: -24,8
-            3210: -25,9
-            3211: -26,8
-            3212: -26,12
-            3213: -26,15
-            3214: -26,17
-            3215: -25,20
-            3216: -23,19
-            3217: -20,19
-            3218: -18,20
-            3219: -15,20
-            3220: -12,20
-            3221: -7,20
-            3222: -3,20
-            3223: -1,20
-            3224: 2,20
-            3225: 6,20
-            3226: 9,20
-            3227: 11,20
-            3228: 14,20
-            3229: 17,20
-            3230: 20,19
-            3231: 20,17
-            3232: 20,15
-            3233: 20,11
-            3234: 20,9
-            3235: 20,6
-            3236: 20,3
-            3237: 22,3
-            3238: 25,3
-            3239: 27,3
-            3240: 30,3
-            3241: 33,3
-            3242: 36,3
-            3243: 41,3
-            3244: 42,2
-            3245: 42,0
-            3246: 42,-3
-            3247: 42,-6
-            3248: 42,-9
-            3249: 42,-11
-            3250: 42,-15
-            3251: 42,-18
-            3252: 42,-20
-            3253: 44,-20
-            3254: 42,-13
-            3255: 42,-10
-            3256: 42,-7
-            3257: 42,-5
-            3258: 42,-2
-            3259: 42,1
-            3260: 39,3
-            3261: 37,3
-            3262: 35,3
-            3263: 32,3
-            3264: 31,3
-            3265: 26,3
-            3266: 22,3
-            3267: 20,6
-            3268: 20,9
-            3269: 20,12
-            3270: 20,15
-            3271: 20,19
-            3272: 19,20
-            3273: 12,20
-            3274: 8,20
-            3275: 5,20
-            3276: 2,20
-            3277: -1,20
-            3278: -5,20
-            3279: -9,20
-            3280: -12,20
-            3281: -16,20
-            3283: -19,19
-            3284: -26,20
-            3285: -26,16
-            3286: -26,11
-            3287: -26,8
-            3288: -23,8
-            3289: -22,9
-            3290: -21,8
-            3291: -20,9
-            3292: -22,3
-            3293: -22,0
-            3294: -22,-3
-            3295: -22,-5
-            3296: -23,-7
-            3297: -25,-7
-            3298: -23,-8
-            3299: -25,-10
-            3300: -25,-10
-            3301: -25,-14
-            3302: -25,-18
-            3303: -25,-21
-            3304: -25,-25
-            3305: -25,-28
-            3306: -23,-31
-            3307: -20,-31
-            3308: -15,-31
-            3309: -9,-31
-            3310: -5,-31
-            3311: 1,-31
-            3312: 1,-32
-            3313: 7,-31
-            3314: 5,-31
-            3315: 8,-32
-            3316: 9,-33
-            3317: 12,-33
-            3318: 15,-33
-            3319: 18,-33
-            3320: 19,-33
-            3321: 20,-29
-            3322: 20,-27
-            3323: 21,-26
-            3324: 24,-26
-            3325: 27,-26
-            3326: 28,-26
-            3327: 28,-22
-            3328: 28,-21
-            3329: 28,-20
-            3330: 32,-20
-            3331: 35,-20
-            3332: 39,-20
-            3333: 42,-20
-            3334: 40,-20
-            3335: 42,-17
-            3336: 42,-19
-            3337: 49,-20
-            3338: 52,-20
-            3339: 47,-20
-            3340: 53,-20
-            3341: 53,-22
-            3342: 53,-23
-            3343: 54,-20
-            3344: 56,-20
-            3345: 58,-20
-            3346: 58,-20
-            3347: 58,-22
-            3348: 58,-23
-            3349: 58,-22
-            3350: 49,-20
-            3351: 50,-20
-            3352: 44,-13
-            3353: 41,-13
-            3354: 39,-1
-            3355: 37,-1
-            3356: 36,-1
-            3357: 50,6
-            3358: 50,2
-            3359: 50,14
-            3360: 46,-7
-            3361: 45,-8
-            3362: 46,-4
-            3363: 46,-5
-            3364: 45,-1
-            3365: 46,-2
-            3366: 54,-1
-            3367: 55,-1
-            3368: 55,-7
-            3369: 58,-4
-            3370: 59,-6
-            3371: 60,-5
-            3372: 62,-6
-            3373: 61,-6
-            3374: 55,7
-            3375: 54,7
-            3376: 59,15
-            3377: 58,15
-            3378: 60,16
-            3379: 60,3
-            3380: 60,1
-            3381: 63,1
-            3382: 62,1
-            3383: 62,0
-            3384: 62,3
-            3385: 62,4
-            3386: 28,3
-            3387: 28,3
-            3388: 24,8
+            3181: 4,-31
+            3182: 0,-31
+            3183: -4,-31
+            3184: -8,-31
+            3185: -10,-31
+            3186: -13,-31
+            3187: -17,-31
+            3188: -18,-31
+            3189: -21,-31
+            3190: -25,-31
+            3191: -25,-27
+            3192: -25,-24
+            3193: -25,-22
+            3194: -25,-19
+            3195: -25,-18
+            3196: -25,-13
+            3197: -25,-11
+            3198: -24,-10
+            3199: -24,-8
+            3200: -22,-2
+            3201: -22,0
+            3202: -22,3
+            3203: -20,8
+            3204: -22,9
+            3205: -24,8
+            3206: -25,9
+            3207: -26,8
+            3208: -26,12
+            3209: -26,15
+            3210: -26,17
+            3211: -25,20
+            3212: -23,19
+            3213: -20,19
+            3214: -18,20
+            3215: -15,20
+            3216: -12,20
+            3217: -7,20
+            3218: -3,20
+            3219: -1,20
+            3220: 2,20
+            3221: 6,20
+            3222: 9,20
+            3223: 11,20
+            3224: 14,20
+            3225: 17,20
+            3226: 20,19
+            3227: 20,17
+            3228: 20,15
+            3229: 20,11
+            3230: 20,9
+            3231: 20,6
+            3232: 20,3
+            3233: 22,3
+            3234: 25,3
+            3235: 27,3
+            3236: 30,3
+            3237: 33,3
+            3238: 36,3
+            3239: 41,3
+            3240: 42,2
+            3241: 42,0
+            3242: 42,-3
+            3243: 42,-6
+            3244: 42,-9
+            3245: 42,-11
+            3246: 42,-15
+            3247: 42,-18
+            3248: 42,-20
+            3249: 44,-20
+            3250: 42,-13
+            3251: 42,-10
+            3252: 42,-7
+            3253: 42,-5
+            3254: 42,-2
+            3255: 42,1
+            3256: 39,3
+            3257: 37,3
+            3258: 35,3
+            3259: 32,3
+            3260: 31,3
+            3261: 26,3
+            3262: 22,3
+            3263: 20,6
+            3264: 20,9
+            3265: 20,12
+            3266: 20,15
+            3267: 20,19
+            3268: 19,20
+            3269: 12,20
+            3270: 8,20
+            3271: 5,20
+            3272: 2,20
+            3273: -1,20
+            3274: -5,20
+            3275: -9,20
+            3276: -12,20
+            3277: -16,20
+            3279: -19,19
+            3280: -26,20
+            3281: -26,16
+            3282: -26,11
+            3283: -26,8
+            3284: -23,8
+            3285: -22,9
+            3286: -21,8
+            3287: -20,9
+            3288: -22,3
+            3289: -22,0
+            3290: -22,-3
+            3291: -22,-5
+            3292: -23,-7
+            3293: -25,-7
+            3294: -23,-8
+            3295: -25,-10
+            3296: -25,-10
+            3297: -25,-14
+            3298: -25,-18
+            3299: -25,-21
+            3300: -25,-25
+            3301: -25,-28
+            3302: -23,-31
+            3303: -20,-31
+            3304: -15,-31
+            3305: -9,-31
+            3306: -5,-31
+            3307: 1,-31
+            3308: 1,-32
+            3309: 7,-31
+            3310: 5,-31
+            3311: 8,-32
+            3312: 9,-33
+            3313: 12,-33
+            3314: 15,-33
+            3315: 18,-33
+            3316: 19,-33
+            3317: 20,-29
+            3318: 20,-27
+            3319: 21,-26
+            3320: 24,-26
+            3321: 27,-26
+            3322: 28,-26
+            3323: 28,-22
+            3324: 28,-21
+            3325: 28,-20
+            3326: 32,-20
+            3327: 35,-20
+            3328: 39,-20
+            3329: 42,-20
+            3330: 40,-20
+            3331: 42,-17
+            3332: 42,-19
+            3333: 49,-20
+            3334: 52,-20
+            3335: 47,-20
+            3336: 53,-20
+            3337: 53,-22
+            3338: 53,-23
+            3339: 54,-20
+            3340: 56,-20
+            3341: 58,-20
+            3342: 58,-20
+            3343: 58,-22
+            3344: 58,-23
+            3345: 58,-22
+            3346: 49,-20
+            3347: 50,-20
+            3348: 44,-13
+            3349: 41,-13
+            3350: 39,-1
+            3351: 37,-1
+            3352: 36,-1
+            3353: 50,6
+            3354: 50,2
+            3355: 50,14
+            3356: 46,-7
+            3357: 45,-8
+            3358: 46,-4
+            3359: 46,-5
+            3360: 45,-1
+            3361: 46,-2
+            3362: 54,-1
+            3363: 55,-1
+            3364: 55,-7
+            3365: 58,-4
+            3366: 59,-6
+            3367: 60,-5
+            3368: 62,-6
+            3369: 61,-6
+            3370: 55,7
+            3371: 54,7
+            3372: 59,15
+            3373: 58,15
+            3374: 60,16
+            3375: 60,3
+            3376: 60,1
+            3377: 63,1
+            3378: 62,1
+            3379: 62,0
+            3380: 62,3
+            3381: 62,4
+            3382: 28,3
+            3383: 28,3
+            3384: 24,8
+            3385: 24,6
+            3386: 23,8
+            3387: 25,7
+            3388: 24,7
             3389: 24,6
-            3390: 23,8
-            3391: 25,7
-            3392: 24,7
-            3393: 24,6
-            3394: 25,11
-            3395: 25,13
-            3396: 25,14
-            3397: 23,15
-            3398: 22,12
-            3399: 23,12
-            3400: 23,14
-            3401: 23,11
-            3402: 26,19
-            3403: 24,20
-            3404: 25,21
-            3405: 26,19
-            3406: 25,20
-            3407: 29,20
-            3408: 29,19
-            3409: 30,19
-            3410: 29,21
-            3411: -19,26
-            3412: -21,28
-            3413: -20,26
-            3414: -20,28
-            3415: -7,40
-            3416: 3,40
-            3417: -26,19
-            3418: -17,11
-            3419: -16,11
-            3420: -16,13
-            3421: -17,13
-            3422: -33,11
-            3423: -33,13
-            3424: -33,14
-            3425: -32,14
-            3426: -30,14
-            3427: -29,14
-            3428: -31,14
-            3429: -30,3
-            3430: -32,3
-            3431: -37,3
-            3432: -36,2
-            3433: -35,2
-            3434: -37,1
-            3435: -33,1
-            3436: -32,2
-            3437: -32,1
-            3438: -31,2
-            3439: -33,2
-            3440: -38,0
-            3441: -37,0
-            3442: -34,0
-            3443: -33,0
-            3444: -31,0
-            3445: -30,0
-            3446: -55,6
-            3447: -54,6
-            3448: -54,4
-            3449: -54,2
-            3450: -56,5
-            3451: -55,4
-            3452: -53,1
-            3453: -51,1
-            3454: -49,1
-            3455: -47,1
-            3456: -45,1
-            3457: -44,1
-            3458: -43,1
-            3459: -54,1
-            3460: -54,-4
-            3461: -55,-4
-            3462: -54,-8
-            3463: -54,-10
-            3464: -54,-12
-            3465: -54,-14
-            3466: -54,-16
-            3467: -54,-19
-            3468: -53,-21
-            3469: -51,-21
-            3470: -54,-21
-            3471: -54,-20
-            3472: -54,-18
-            3473: -48,-21
-            3474: -48,-23
-            3475: -48,-24
-            3476: -50,-25
-            3477: -47,-25
-            3478: -45,-25
-            3479: -45,-26
-            3480: -45,-29
-            3481: -44,-28
-            3482: -43,-28
-            3483: -45,-31
-            3484: -48,-32
-            3485: -49,-32
-            3486: -51,-32
-            3487: -51,-30
-            3488: -51,-28
-            3489: -51,-26
-            3490: -48,-33
-            3491: -54,-26
-            3492: -56,-25
-            3493: -55,-25
-            3494: -56,-26
-            3495: -57,-26
-            3496: -55,-26
-            3497: -56,-25
-            3498: -48,-36
-            3499: -48,-38
-            3500: -48,-40
-            3501: -48,-42
-            3502: -48,-44
-            3503: -48,-47
-            3504: -49,-47
-            3505: -51,-47
-            3506: -53,-47
-            3507: -54,-47
-            3508: -45,-47
-            3509: -45,-47
-            3510: -43,-47
-            3511: -41,-47
-            3512: -41,-47
-            3513: -41,-50
-            3514: -41,-51
-            3515: -41,-54
-            3516: -36,-58
-            3517: -36,-60
-            3518: -36,-63
-            3519: -36,-64
-            3520: -36,-56
-            3521: -37,-56
-            3522: -41,-61
-            3523: -42,-62
-            3524: -41,-64
-            3525: -41,-64
-            3526: -42,-62
-            3527: -41,-48
-            3528: -53,-47
-            3529: -55,-47
-            3530: -55,-49
-            3531: -55,-52
-            3532: -55,-54
-            3533: -60,-58
-            3534: -60,-60
-            3535: -60,-62
-            3536: -60,-63
-            3537: -60,-64
-            3538: -58,-56
-            3539: -60,-56
-            3540: -55,-64
-            3541: -55,-62
-            3542: -54,-61
-            3543: -54,-63
-            3544: -54,-64
-            3545: -8,-28
-            3546: -7,-26
-            3547: -8,-27
-            3548: -8,-27
-            3549: 7,-22
-            3550: 5,-22
-            3551: 4,-23
-            3552: 4,-20
-            3553: 4,-19
-            3554: 7,-20
-            3555: 7,-21
-            3556: 7,-24
-            3557: 7,-25
-            3558: 10,-16
-            3559: 10,-18
-            3560: 10,-18
-            3561: 12,-29
-            3562: 12,-28
-            3563: 12,-26
-            3564: 13,-25
-            3565: 14,-25
-            3566: 14,-26
-            3567: 15,-25
-            3568: 16,-26
-            3569: 16,-29
-            3570: -4,-36
-            3571: -4,-37
-            3572: -6,-37
-            3573: 34,-2
-            3574: 33,-2
-            3575: 34,-3
-            3576: 32,-2
-            3577: 32,-3
-            3578: 31,-2
-            3579: 31,-3
-            3580: 31,-35
-            3581: 33,-35
-            3582: 32,-37
-            3583: 33,-36
-            3584: 33,-38
-            3585: 32,-36
-            3586: 31,-38
-            3587: 47,-36
-            3588: 47,-35
-            3589: 49,-35
-            3590: 49,-37
-            3591: 47,-37
-            3592: 47,-38
-            3593: 49,-38
-            3594: 47,-39
-            3595: 24,-29
-            3596: 26,-29
-            3597: 27,-29
-            3598: 28,-29
-            3599: 25,-34
-            3600: 27,-34
-            3601: 28,-34
-            3602: 26,-34
-            3603: 28,-43
-            3604: 29,-43
-            3605: 28,-45
-            3606: 29,-45
-            3607: 28,-46
-            3608: 29,-46
-            3609: 19,-46
-            3610: 18,-46
-            3611: 18,-47
-            3612: 19,-49
-            3613: 19,-49
-            3614: 18,-50
-            3615: 19,-50
-            3616: 18,-48
-            3617: 16,-48
-            3618: 14,-48
-            3619: 12,-47
-            3620: 10,-40
-            3621: 11,-39
-            3622: 11,-40
-            3623: 11,-40
-            3624: 8,-31
-            3625: 8,-31
-            3626: 5,-14
-            3627: 6,-14
-            3628: 6,-15
-            3629: 5,-15
-            3630: 4,-15
-            3631: 4,-15
-            3632: 25,7
-            3633: 20,16
-            3634: 20,18
-            3635: 15,26
-            3636: 14,26
-            3637: 13,26
-            3638: 13,26
-            3639: -44,10
-            3640: -45,10
-            3641: -46,10
-            3642: -47,10
-            3643: -49,10
-            3644: -50,10
-            3645: -50,12
-            3646: -47,12
-            3647: -48,1
-            3648: -47,1
-            3649: -48,-41
-            3650: -38,-56
-            3651: -38,-56
-            3652: -42,-57
-            3653: -55,-57
-            3785: -50,0
-            3786: -50,2
-            3787: -48,2
-            3788: -46,2
-            3789: -45,2
-            3790: -44,0
-            3791: -46,0
-            3792: -48,0
-            3824: -51,3
-            3825: -49,3
-            3826: -47,3
-            3827: -45,3
-            3828: -44,5
-            3829: -46,5
-            3830: -48,5
-            3831: -50,5
-            3832: -50,-1
-            3833: -49,-1
-            3834: -47,-1
-            3835: -46,-1
-            3836: -44,-1
-            3837: -44,-3
-            3838: -46,-3
-            3839: -47,-3
-            3840: -49,-3
-            3841: -50,-3
-            3842: -48,-3
-            3843: -46,-3
-            3844: -48,3
-            3845: -46,3
-            3925: -21,6
-            3926: -21,7
-            3927: -22,6
-            3928: -21,7
-            4125: 19,1
-            4126: 21,1
-            4127: 22,1
-            4128: 23,1
-            4129: 23,1
-            4194: 40,-22
-            4195: 41,-22
-            4196: 43,-22
-            4197: 44,-22
-            4256: 61,-25
-            4257: 62,-25
-            4258: 62,-26
-            4263: 68,-23
-            4286: 68,-15
-            4287: 68,-13
-            4288: 68,-14
-            4289: 67,-12
-            4290: 70,-12
-            4291: 70,-14
-            4292: 68,-11
-            4293: 71,-12
-            4294: 70,-14
-            4295: 70,-15
-            4296: 71,-13
-            4297: 69,-13
-            4298: 69,-12
-            4299: 68,-10
-            4300: 67,-10
-            4301: 68,-8
-            4302: 69,-8
-            4303: 70,-9
-            4304: 70,-10
-            4398: 39,-34
-            4399: 40,-34
-            4400: 39,-34
-            4401: 42,-34
-            4402: 40,-34
-            4403: 41,-33
-            4404: 34,-36
-            4405: 34,-35
-            4406: 35,-36
-            4407: 38,-37
-            4408: 43,-37
-            4409: 43,-37
-            4410: 46,-37
-            4411: 46,-35
-            4412: 46,-37
-            4413: 47,-37
-            4414: 48,-36
-            4415: 48,-37
-            4416: 46,-39
-            4417: 44,-39
-            4418: 41,-39
-            4419: 37,-39
-            4420: 35,-39
-            4421: 39,-38
-            4422: 33,-38
+            3390: 25,11
+            3391: 25,13
+            3392: 25,14
+            3393: 23,15
+            3394: 22,12
+            3395: 23,12
+            3396: 23,14
+            3397: 23,11
+            3398: 26,19
+            3399: 24,20
+            3400: 25,21
+            3401: 26,19
+            3402: 25,20
+            3403: 29,20
+            3404: 29,19
+            3405: 30,19
+            3406: 29,21
+            3407: -19,26
+            3408: -21,28
+            3409: -20,26
+            3410: -20,28
+            3411: -7,40
+            3412: 3,40
+            3413: -26,19
+            3414: -17,11
+            3415: -16,11
+            3416: -16,13
+            3417: -17,13
+            3418: -33,11
+            3419: -33,13
+            3420: -33,14
+            3421: -32,14
+            3422: -30,14
+            3423: -29,14
+            3424: -31,14
+            3425: -30,3
+            3426: -32,3
+            3427: -37,3
+            3428: -36,2
+            3429: -35,2
+            3430: -37,1
+            3431: -33,1
+            3432: -32,2
+            3433: -32,1
+            3434: -31,2
+            3435: -33,2
+            3436: -38,0
+            3437: -37,0
+            3438: -34,0
+            3439: -33,0
+            3440: -31,0
+            3441: -30,0
+            3442: -55,6
+            3443: -54,6
+            3444: -54,4
+            3445: -54,2
+            3446: -56,5
+            3447: -55,4
+            3448: -53,1
+            3449: -51,1
+            3450: -49,1
+            3451: -47,1
+            3452: -45,1
+            3453: -44,1
+            3454: -43,1
+            3455: -54,1
+            3456: -54,-4
+            3457: -55,-4
+            3458: -54,-8
+            3459: -54,-10
+            3460: -54,-12
+            3461: -54,-14
+            3462: -54,-16
+            3463: -54,-19
+            3464: -53,-21
+            3465: -51,-21
+            3466: -54,-21
+            3467: -54,-20
+            3468: -54,-18
+            3469: -48,-21
+            3470: -48,-23
+            3471: -48,-24
+            3472: -50,-25
+            3473: -47,-25
+            3474: -45,-25
+            3475: -45,-26
+            3476: -45,-29
+            3477: -44,-28
+            3478: -43,-28
+            3479: -45,-31
+            3480: -48,-32
+            3481: -49,-32
+            3482: -51,-32
+            3483: -51,-30
+            3484: -51,-28
+            3485: -51,-26
+            3486: -48,-33
+            3487: -54,-26
+            3488: -56,-25
+            3489: -55,-25
+            3490: -56,-26
+            3491: -57,-26
+            3492: -55,-26
+            3493: -56,-25
+            3494: -48,-36
+            3495: -48,-38
+            3496: -48,-40
+            3497: -48,-42
+            3498: -48,-44
+            3499: -48,-47
+            3500: -49,-47
+            3501: -51,-47
+            3502: -53,-47
+            3503: -54,-47
+            3504: -45,-47
+            3505: -45,-47
+            3506: -43,-47
+            3507: -41,-47
+            3508: -41,-47
+            3509: -41,-50
+            3510: -41,-51
+            3511: -41,-54
+            3512: -36,-58
+            3513: -36,-60
+            3514: -36,-63
+            3515: -36,-64
+            3516: -36,-56
+            3517: -37,-56
+            3518: -41,-61
+            3519: -42,-62
+            3520: -41,-64
+            3521: -41,-64
+            3522: -42,-62
+            3523: -41,-48
+            3524: -53,-47
+            3525: -55,-47
+            3526: -55,-49
+            3527: -55,-52
+            3528: -55,-54
+            3529: -60,-58
+            3530: -60,-60
+            3531: -60,-62
+            3532: -60,-63
+            3533: -60,-64
+            3534: -58,-56
+            3535: -60,-56
+            3536: -55,-64
+            3537: -55,-62
+            3538: -54,-61
+            3539: -54,-63
+            3540: -54,-64
+            3541: -8,-28
+            3542: -7,-26
+            3543: -8,-27
+            3544: -8,-27
+            3545: 7,-22
+            3546: 5,-22
+            3547: 4,-23
+            3548: 4,-20
+            3549: 4,-19
+            3550: 7,-20
+            3551: 7,-21
+            3552: 7,-24
+            3553: 7,-25
+            3554: 10,-16
+            3555: 10,-18
+            3556: 10,-18
+            3557: 12,-29
+            3558: 12,-28
+            3559: 12,-26
+            3560: 13,-25
+            3561: 14,-25
+            3562: 14,-26
+            3563: 15,-25
+            3564: 16,-26
+            3565: 16,-29
+            3566: -4,-36
+            3567: -4,-37
+            3568: -6,-37
+            3571: 34,-3
+            3572: 32,-2
+            3573: 32,-3
+            3574: 31,-2
+            3575: 31,-3
+            3576: 31,-35
+            3577: 33,-35
+            3578: 32,-37
+            3579: 33,-36
+            3580: 33,-38
+            3581: 32,-36
+            3582: 31,-38
+            3583: 47,-36
+            3584: 47,-35
+            3585: 49,-35
+            3586: 49,-37
+            3587: 47,-37
+            3588: 47,-38
+            3589: 49,-38
+            3590: 47,-39
+            3591: 24,-29
+            3592: 26,-29
+            3593: 27,-29
+            3594: 28,-29
+            3595: 25,-34
+            3596: 27,-34
+            3597: 28,-34
+            3598: 26,-34
+            3599: 28,-43
+            3600: 29,-43
+            3601: 28,-45
+            3602: 29,-45
+            3603: 28,-46
+            3604: 29,-46
+            3605: 19,-46
+            3606: 18,-46
+            3607: 18,-47
+            3608: 19,-49
+            3609: 19,-49
+            3610: 18,-50
+            3611: 19,-50
+            3612: 18,-48
+            3613: 16,-48
+            3614: 14,-48
+            3615: 12,-47
+            3616: 10,-40
+            3617: 11,-39
+            3618: 11,-40
+            3619: 11,-40
+            3620: 8,-31
+            3621: 8,-31
+            3622: 5,-14
+            3623: 6,-14
+            3624: 6,-15
+            3625: 5,-15
+            3626: 4,-15
+            3627: 4,-15
+            3628: 25,7
+            3629: 20,16
+            3630: 20,18
+            3631: 15,26
+            3632: 14,26
+            3633: 13,26
+            3634: 13,26
+            3635: -44,10
+            3636: -45,10
+            3637: -46,10
+            3638: -47,10
+            3639: -49,10
+            3640: -50,10
+            3641: -50,12
+            3642: -47,12
+            3643: -48,1
+            3644: -47,1
+            3645: -48,-41
+            3646: -38,-56
+            3647: -38,-56
+            3648: -42,-57
+            3649: -55,-57
+            3781: -50,0
+            3782: -50,2
+            3783: -48,2
+            3784: -46,2
+            3785: -45,2
+            3786: -44,0
+            3787: -46,0
+            3788: -48,0
+            3820: -51,3
+            3821: -49,3
+            3822: -47,3
+            3823: -45,3
+            3824: -44,5
+            3825: -46,5
+            3826: -48,5
+            3827: -50,5
+            3828: -50,-1
+            3829: -49,-1
+            3830: -47,-1
+            3831: -46,-1
+            3832: -44,-1
+            3833: -44,-3
+            3834: -46,-3
+            3835: -47,-3
+            3836: -49,-3
+            3837: -50,-3
+            3838: -48,-3
+            3839: -46,-3
+            3840: -48,3
+            3841: -46,3
+            3921: -21,6
+            3922: -21,7
+            3923: -22,6
+            3924: -21,7
+            4121: 19,1
+            4122: 21,1
+            4123: 22,1
+            4124: 23,1
+            4125: 23,1
+            4190: 40,-22
+            4191: 41,-22
+            4192: 43,-22
+            4193: 44,-22
+            4252: 61,-25
+            4253: 62,-25
+            4254: 62,-26
+            4259: 68,-23
+            4282: 68,-15
+            4283: 68,-13
+            4284: 68,-14
+            4285: 67,-12
+            4286: 70,-12
+            4287: 70,-14
+            4288: 68,-11
+            4289: 71,-12
+            4290: 70,-14
+            4291: 70,-15
+            4292: 71,-13
+            4293: 69,-13
+            4294: 69,-12
+            4295: 68,-10
+            4296: 67,-10
+            4297: 68,-8
+            4298: 69,-8
+            4299: 70,-9
+            4300: 70,-10
+            4394: 39,-34
+            4395: 40,-34
+            4396: 39,-34
+            4397: 42,-34
+            4398: 40,-34
+            4399: 41,-33
+            4400: 34,-36
+            4401: 34,-35
+            4402: 35,-36
+            4403: 38,-37
+            4404: 43,-37
+            4405: 43,-37
+            4406: 46,-37
+            4407: 46,-35
+            4408: 46,-37
+            4409: 47,-37
+            4410: 48,-36
+            4411: 48,-37
+            4412: 46,-39
+            4413: 44,-39
+            4414: 41,-39
+            4415: 37,-39
+            4416: 35,-39
+            4417: 39,-38
+            4418: 33,-38
+            4718: -20,6
+            4719: -20,7
+            4720: -21,6
+            4721: -20,7
             4722: -20,6
-            4723: -20,7
-            4724: -21,6
-            4725: -20,7
-            4726: -20,6
-            4727: -21,12
-            4728: -25,29
-            4729: -25,28
-            4730: -26,30
-            4731: -26,28
-            4732: -26,29
-            4756: -16,40
-            4757: -17,41
-            4758: -15,39
-            4759: -13,41
-            4760: -12,39
-            4811: -2,46
-            4812: -4,46
-            4813: -1,48
-            4814: 0,47
-            4815: -3,50
-            4816: 0,51
-            4817: 2,47
-            4818: 2,45
-            4819: 2,43
-            4820: 2,40
-            4821: -6,40
-            4822: -7,40
-            4823: -7,40
-            4824: -4,46
-            4825: -5,45
-            4826: -6,46
-            4827: 7,41
-            4828: 6,42
-            4829: 9,40
-            4830: 6,39
-            4831: 8,40
-            4832: 6,39
-            4833: 8,39
-            4834: 7,42
-            4835: 7,41
-            4836: 5,41
-            4867: 14,34
-            4868: 13,36
-            4869: 14,37
-            4870: 16,37
-            4871: 14,36
-            4872: 5,30
-            4873: 4,30
-            4874: 3,32
-            4875: 5,32
-            4876: 5,32
-            4877: 4,31
-            4878: 4,31
-            4879: 3,32
-            4880: 3,28
-            4881: 2,27
-            4882: 1,28
-            4883: 3,27
-            4884: 4,26
-            4885: 3,25
-            4886: 4,24
-            4887: 3,23
-            4888: 1,24
-            4889: 2,23
-            4907: -3,25
-            4908: -4,23
-            4909: -2,23
-            4910: -3,24
-            4911: 0,24
-            4912: 0,23
-            4913: -16,29
-            4914: -15,26
-            4915: -15,28
-            4916: -13,28
-            4917: -13,29
-            4918: -9,28
-            4919: -10,26
-            4920: -9,27
-            4921: -11,28
-            4922: -8,29
-            4923: -9,26
-            4924: -6,27
-            4925: -6,26
-            4926: -6,28
-            4927: -3,29
-            4928: -4,27
-            4929: -1,28
-            4930: -3,29
-            4931: -2,30
-            4932: -3,32
-            4933: -2,33
-            4934: -2,34
-            4935: -8,33
-            4936: -7,32
-            4937: -8,32
-            4938: -9,33
-            4939: -6,34
-            4940: -6,33
-            4941: -13,34
-            5009: -17,-28
-            5010: -19,-28
-            5011: -20,-27
-            5012: -20,-26
-            5013: -20,-27
-            5014: -15,-28
-            5015: -14,-28
-            5016: -14,-27
-            5017: -14,-29
-            5018: -17,-29
-            5080: -14,-38
-            5081: -14,-38
-            5099: -6,-37
-            5100: -5,-37
-            5101: -4,-37
-            5287: 78,-28
-            5288: 79,-28
-            5289: 78,-28
-            5290: 78,-27
-            5291: 78,-29
-            5356: 13,-45
-            5357: 12,-45
-            5358: 12,-50
-            5359: 12,-49
-            5360: 16,-49
-            5361: 15,-49
-            6167: 81,-34
-            6168: 82,-35
-            6169: 81,-35
-            6170: 81,-35
-            6196: -2,41
-            6197: -2,42
-            6198: -3,42
-            6199: -3,42
-            6200: -1,43
-            6222: 46,15
-            6223: 47,15
-            6224: 47,15
-            6225: 45,16
-            6438: 49,-1
-            6439: 51,-1
-            6440: 50,-2
-            6441: 49,-3
-            6442: 49,-5
-            6443: 51,-5
-            6444: 51,-3
-            6445: 50,-8
-            6446: 49,-8
-            6447: 48,-7
-            6448: 52,-8
-            6449: 54,-7
-            6450: 49,-10
-            6451: 50,-11
-            6452: 48,-11
-            6453: 51,-10
-            6454: 51,-11
-            6455: 52,-11
-            6456: 53,-11
-            6482: 50,2
-            6483: 50,4
-            6484: 50,9
-            6485: 50,12
-            6486: 50,13
-            6487: 47,9
-            6488: 47,7
-            6489: 41,8
-            6490: 41,7
-            6491: 40,8
-            6492: 40,7
-            6493: 44,8
-            6515: 46,4
-            6516: 45,4
-            6517: 46,2
-            6518: 45,2
-            6519: 45,1
-            6520: 46,5
-            6521: 40,5
-            6522: 44,4
-            6523: 44,7
-            6524: 55,3
-            6525: 54,2
-            6526: 53,3
-            6527: 55,4
-            6528: 57,4
-            6529: 56,2
-            6530: 55,1
-            6531: 55,6
-            6532: 53,7
-            6533: 53,6
-            6534: 55,8
-            6535: 56,10
-            6536: 55,10
-            6537: 53,12
-            6538: 53,11
-            6539: 57,14
-            6549: -1,-23
-            6550: 0,-23
-            6551: -4,-23
-            6552: -5,-23
-            6553: 35,19
-            6554: 34,19
-            6555: 35,20
-            6556: -8,27
-            6557: -12,27
-            6558: -10,27
-            6559: -14,27
-            6560: -15,27
-            6561: -15,27
-            6595: 88,-18
-            6596: 87,-18
-            6597: 91,-19
-            6598: 91,-18
-            6599: 92,-19
-            6681: 51,-36
-            6682: 51,-37
-            6683: 53,-39
-            6684: 54,-40
-            6685: 51,-35
-            6692: 51,-29
-            6698: 51,-26
-            6699: 52,-27
-            6700: 56,-27
-            6701: 56,-29
-            6717: -32,-12
-            6718: -34,-11
-            6719: -32,-10
-            6720: -33,-9
-            6721: -34,-9
-            6725: 61,-21
-            6726: -24,-42
-            6728: -25,-42
-            6729: -22,-42
-            6730: -22,-42
-            6737: -37,-45
-            6738: -38,-44
-            6739: -38,-46
-            6740: -37,-46
-            6831: 13,41
-            6832: 15,39
-            6833: 16,41
+            4723: -21,12
+            4724: -25,29
+            4725: -25,28
+            4726: -26,30
+            4727: -26,28
+            4728: -26,29
+            4752: -16,40
+            4753: -17,41
+            4754: -15,39
+            4755: -13,41
+            4756: -12,39
+            4807: -2,46
+            4808: -4,46
+            4809: -1,48
+            4810: 0,47
+            4811: -3,50
+            4812: 0,51
+            4813: 2,47
+            4814: 2,45
+            4815: 2,43
+            4816: 2,40
+            4817: -6,40
+            4818: -7,40
+            4819: -7,40
+            4820: -4,46
+            4821: -5,45
+            4822: -6,46
+            4823: 7,41
+            4824: 6,42
+            4825: 9,40
+            4826: 6,39
+            4827: 8,40
+            4828: 6,39
+            4829: 8,39
+            4830: 7,42
+            4831: 7,41
+            4832: 5,41
+            4863: 14,34
+            4864: 13,36
+            4865: 14,37
+            4866: 16,37
+            4867: 14,36
+            4868: 5,30
+            4869: 4,30
+            4870: 3,32
+            4871: 5,32
+            4872: 5,32
+            4873: 4,31
+            4874: 4,31
+            4875: 3,32
+            4876: 3,28
+            4877: 2,27
+            4878: 1,28
+            4879: 3,27
+            4880: 4,26
+            4881: 3,25
+            4882: 4,24
+            4883: 3,23
+            4884: 1,24
+            4885: 2,23
+            4903: -3,25
+            4904: -4,23
+            4905: -2,23
+            4906: -3,24
+            4907: 0,24
+            4908: 0,23
+            4909: -16,29
+            4910: -15,26
+            4911: -15,28
+            4912: -13,28
+            4913: -13,29
+            4914: -9,28
+            4915: -10,26
+            4916: -9,27
+            4917: -11,28
+            4918: -8,29
+            4919: -9,26
+            4920: -6,27
+            4921: -6,26
+            4922: -6,28
+            4923: -3,29
+            4924: -4,27
+            4925: -1,28
+            4926: -3,29
+            4927: -2,30
+            4928: -3,32
+            4929: -2,33
+            4930: -2,34
+            4931: -8,33
+            4932: -7,32
+            4933: -8,32
+            4934: -9,33
+            4935: -6,34
+            4936: -6,33
+            4937: -13,34
+            5005: -17,-28
+            5006: -19,-28
+            5007: -20,-27
+            5008: -20,-26
+            5009: -20,-27
+            5010: -15,-28
+            5011: -14,-28
+            5012: -14,-27
+            5013: -14,-29
+            5014: -17,-29
+            5076: -14,-38
+            5077: -14,-38
+            5095: -6,-37
+            5096: -5,-37
+            5097: -4,-37
+            5283: 78,-28
+            5284: 79,-28
+            5285: 78,-28
+            5286: 78,-27
+            5287: 78,-29
+            5352: 13,-45
+            5353: 12,-45
+            5354: 12,-50
+            5355: 12,-49
+            5356: 16,-49
+            5357: 15,-49
+            6163: 81,-34
+            6164: 82,-35
+            6165: 81,-35
+            6166: 81,-35
+            6192: -2,41
+            6193: -2,42
+            6194: -3,42
+            6195: -3,42
+            6196: -1,43
+            6218: 46,15
+            6219: 47,15
+            6220: 47,15
+            6221: 45,16
+            6433: 49,-1
+            6434: 51,-1
+            6435: 50,-2
+            6436: 49,-3
+            6437: 49,-5
+            6438: 51,-5
+            6439: 51,-3
+            6440: 50,-8
+            6441: 49,-8
+            6442: 48,-7
+            6443: 52,-8
+            6444: 54,-7
+            6445: 49,-10
+            6446: 50,-11
+            6447: 48,-11
+            6448: 51,-10
+            6449: 51,-11
+            6450: 52,-11
+            6451: 53,-11
+            6476: 50,2
+            6477: 50,4
+            6478: 50,9
+            6479: 50,12
+            6480: 50,13
+            6481: 47,9
+            6482: 47,7
+            6483: 41,8
+            6484: 41,7
+            6485: 40,8
+            6486: 40,7
+            6487: 44,8
+            6509: 46,4
+            6510: 45,4
+            6511: 46,2
+            6512: 45,2
+            6513: 45,1
+            6514: 46,5
+            6515: 40,5
+            6516: 44,4
+            6517: 44,7
+            6518: 55,3
+            6519: 54,2
+            6520: 53,3
+            6521: 55,4
+            6522: 57,4
+            6523: 56,2
+            6524: 55,1
+            6525: 55,6
+            6526: 53,7
+            6527: 53,6
+            6528: 55,8
+            6529: 56,10
+            6530: 55,10
+            6531: 53,12
+            6532: 53,11
+            6533: 57,14
+            6543: -1,-23
+            6544: 0,-23
+            6545: -4,-23
+            6546: -5,-23
+            6547: 35,19
+            6548: 34,19
+            6549: 35,20
+            6550: -8,27
+            6551: -12,27
+            6552: -10,27
+            6553: -14,27
+            6554: -15,27
+            6555: -15,27
+            6589: 88,-18
+            6590: 87,-18
+            6591: 91,-19
+            6592: 91,-18
+            6593: 92,-19
+            6675: 51,-36
+            6676: 51,-37
+            6677: 53,-39
+            6678: 54,-40
+            6679: 51,-35
+            6686: 51,-29
+            6692: 51,-26
+            6693: 52,-27
+            6694: 56,-27
+            6695: 56,-29
+            6711: -32,-12
+            6712: -34,-11
+            6713: -32,-10
+            6714: -33,-9
+            6715: -34,-9
+            6719: 61,-21
+            6720: -24,-42
+            6722: -25,-42
+            6723: -22,-42
+            6724: -22,-42
+            6731: -37,-45
+            6732: -38,-44
+            6733: -38,-46
+            6734: -37,-46
+            6825: 13,41
+            6826: 15,39
+            6827: 16,41
+            6863: 33,-2
+            6864: 34,-2
+            6865: 34,-2
+            6883: 7,-47
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            3015: -44,17
-            6646: 13,-30
-            6647: 16,-30
-            6648: 12,-30
-            6649: 12,-30
+            3011: -44,17
+            6640: 13,-30
+            6641: 16,-30
+            6642: 12,-30
+            6643: 12,-30
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            6621: 89,-21
-            6622: 90,-20
+            6615: 89,-21
+            6616: 90,-20
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            6540: 57,4
-            6541: 57,2
-            6542: 54,3
-            6543: 56,1
-            6544: 49,-15
-            6545: 52,-15
-            6546: 43,4
-            6736: -36,-44
-            6834: 14,42
-            6835: 14,40
-            6836: 16,42
+            6534: 57,4
+            6535: 57,2
+            6536: 54,3
+            6537: 56,1
+            6538: 49,-15
+            6539: 52,-15
+            6540: 43,4
+            6730: -36,-44
+            6828: 14,42
+            6829: 14,40
+            6830: 16,42
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            3014: -44,16
+            3010: -44,16
         - node:
             cleanable: True
             color: '#FFFFFF47'
             id: DirtMedium
           decals:
-            6654: 11,-29
-            6655: 11,-29
+            6648: 11,-29
+            6649: 11,-29
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            6624: 91,-21
-            6625: 90,-21
+            6618: 91,-21
+            6619: 90,-21
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            3955: -16,11
-            3956: -17,12
-            6693: 52,-30
-            6722: -32,-9
-            6723: -34,-12
-            6735: -36,-46
-            6837: 13,39
-            6838: 13,42
-            6839: 16,40
-            6840: 13,38
-            6841: 13,38
+            3951: -16,11
+            3952: -17,12
+            6687: 52,-30
+            6716: -32,-9
+            6717: -34,-12
+            6729: -36,-46
+            6831: 13,39
+            6832: 13,42
+            6833: 16,40
+            6834: 13,38
+            6835: 13,38
+            6885: 9,-47
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            3013: -44,15
+            3009: -44,15
         - node:
             color: '#FFFFFFFF'
             id: FlowersBROne
@@ -6427,7 +6428,7 @@ entities:
             color: '#FFFFFFFF'
             id: FlowersBRThree
           decals:
-            3047: 80.70172,-6.173584
+            3043: 80.70172,-6.173584
         - node:
             color: '#FFFFFFFF'
             id: FlowersBRTwo
@@ -6458,7 +6459,7 @@ entities:
             color: '#FFFFFFFF'
             id: Flowerspv1
           decals:
-            3048: 80.04127,-7.0725327
+            3044: 80.04127,-7.0725327
         - node:
             color: '#FFFFFFFF'
             id: Flowerspv3
@@ -6486,14 +6487,14 @@ entities:
             color: '#FFFFFFFF'
             id: Flowersy2
           decals:
-            3049: 81.08699,-7.6962934
+            3045: 81.08699,-7.6962934
         - node:
             color: '#FFFFFFFF'
             id: Flowersy3
           decals:
             877: -50,4
             908: -47,-7
-            2257: 25,1
+            2253: 25,1
         - node:
             color: '#FFFFFFFF'
             id: Flowersy4
@@ -6504,13 +6505,13 @@ entities:
             color: '#EFB34196'
             id: FullTileOverlayGreyscale
           decals:
-            6201: 43,13
+            6197: 43,13
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassa2
           decals:
-            3037: 80,-6
+            3033: 80,-6
         - node:
             color: '#FFFFFFFF'
             id: Grassa3
@@ -6527,7 +6528,7 @@ entities:
             color: '#FFFFFFFF'
             id: Grassa4
           decals:
-            3036: 80,-8
+            3032: 80,-8
         - node:
             color: '#FFFFFFFF'
             id: Grassa5
@@ -6574,7 +6575,7 @@ entities:
             color: '#FFFFFFFF'
             id: Grassc1
           decals:
-            3039: 79.637665,-6.118546
+            3035: 79.637665,-6.118546
         - node:
             color: '#FFFFFFFF'
             id: Grassc2
@@ -6585,7 +6586,7 @@ entities:
             color: '#FFFFFFFF'
             id: Grassc2
           decals:
-            3040: 81.362175,-7.1642623
+            3036: 81.362175,-7.1642623
         - node:
             color: '#FFFFFFFF'
             id: Grassc4
@@ -6597,7 +6598,7 @@ entities:
             color: '#FFFFFFFF'
             id: Grassc4
           decals:
-            3038: 79.56428,-7.366067
+            3034: 79.56428,-7.366067
         - node:
             color: '#FFFFFFFF'
             id: Grassd1
@@ -6609,7 +6610,7 @@ entities:
             color: '#FFFFFFFF'
             id: Grassd1
           decals:
-            3041: 79.14232,-8.063211
+            3037: 79.14232,-8.063211
         - node:
             color: '#FFFFFFFF'
             id: Grassd2
@@ -6628,8 +6629,8 @@ entities:
             color: '#FFFFFFFF'
             id: Grassd3
           decals:
-            3042: 79.05059,-6.320351
-            3043: 80.53661,-6.6872687
+            3038: 79.05059,-6.320351
+            3039: 80.53661,-6.6872687
         - node:
             color: '#FFFFFFFF'
             id: Grasse1
@@ -6641,13 +6642,13 @@ entities:
             color: '#FFFFFFFF'
             id: Grasse1
           decals:
-            3046: 81.784134,-6.4304266
+            3042: 81.784134,-6.4304266
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grasse2
           decals:
-            3044: 80.518265,-8.02652
+            3040: 80.518265,-8.02652
         - node:
             color: '#FFFFFFFF'
             id: Grasse3
@@ -6661,12 +6662,12 @@ entities:
             color: '#FFFFFFFF'
             id: Grasse3
           decals:
-            3045: 80.72007,-6.0451627
+            3041: 80.72007,-6.0451627
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale
           decals:
-            6271: 44,7
+            6267: 44,7
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale
@@ -6713,7 +6714,7 @@ entities:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale180
           decals:
-            6272: 44,9
+            6268: 44,9
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale180
@@ -6737,7 +6738,7 @@ entities:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale270
           decals:
-            6273: 45,8
+            6269: 45,8
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale270
@@ -6752,7 +6753,7 @@ entities:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale90
           decals:
-            6274: 43,8
+            6270: 43,8
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale90
@@ -6798,8 +6799,8 @@ entities:
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            6613: 89,-20
-            6614: 90,-20
+            6607: 89,-20
+            6608: 90,-20
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -6807,25 +6808,25 @@ entities:
           decals:
             1791: 58,-24
             1792: 58,-23
-            2190: -4,-36
-            2208: -56,-59
-            2209: -56,-66
+            2186: -4,-36
+            2204: -56,-59
+            2205: -56,-66
         - node:
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
             352: 39,-22
-            3175: 25,22
-            3176: 29,22
-            6180: -44,24
+            3171: 25,22
+            3172: 29,22
+            6176: -44,24
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            2224: -40,-59
-            2225: -40,-66
-            6181: -45,23
+            2220: -40,-59
+            2221: -40,-66
+            6177: -45,23
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -6833,35 +6834,35 @@ entities:
           decals:
             351: 45,-22
             1772: 63,-26
-            6182: -44,22
+            6178: -44,22
         - node:
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
             1273: 23,12
-            6183: -43,23
+            6179: -43,23
         - node:
             color: '#52B4E996'
             id: MiniTileCheckerAOverlay
           decals:
-            2242: 13,25
-            2243: 14,25
-            2244: 15,25
-            2245: 15,24
-            2246: 15,23
-            2247: 14,23
-            2248: 14,24
-            2249: 13,24
-            2250: 13,23
+            2238: 13,25
+            2239: 14,25
+            2240: 15,25
+            2241: 15,24
+            2242: 15,23
+            2243: 14,23
+            2244: 14,24
+            2245: 13,24
+            2246: 13,23
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineE
           decals:
-            6765: 9,39
-            6766: 9,40
-            6767: 9,41
-            6768: 9,42
+            6759: 9,39
+            6760: 9,40
+            6761: 9,41
+            6762: 9,42
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineN
@@ -6876,7 +6877,7 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineN
           decals:
-            3282: -19,20
+            3278: -19,20
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineS
@@ -6891,649 +6892,649 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineW
           decals:
-            6769: 5,39
-            6770: 5,40
-            6771: 5,41
-            6772: 5,42
+            6763: 5,39
+            6764: 5,40
+            6765: 5,41
+            6766: 5,42
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerNe
           decals:
-            2428: -43,-25
-            2514: -40,-46
+            2424: -43,-25
+            2510: -40,-46
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerNw
           decals:
-            2328: -26,-9
-            2372: -55,7
-            2513: -56,-46
-            2614: 27,-19
-            2824: -27,21
+            2324: -26,-9
+            2368: -55,7
+            2509: -56,-46
+            2610: 27,-19
+            2820: -27,21
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerSe
           decals:
-            2316: -23,-11
-            2440: -46,-33
-            2444: -43,-32
+            2312: -23,-11
+            2436: -46,-33
+            2440: -43,-32
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerSw
           decals:
-            2436: -52,-32
-            2439: -50,-33
-            2590: 7,-34
-            2694: 40,1
-            2723: 19,2
+            2432: -52,-32
+            2435: -50,-33
+            2586: 7,-34
+            2690: 40,1
+            2719: 19,2
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerNe
           decals:
-            2291: -23,-30
-            2340: -25,9
-            2429: -44,-25
-            2559: -28,-30
-            2842: 77,-19
-            2843: 77,-15
+            2287: -23,-30
+            2336: -25,9
+            2425: -44,-25
+            2555: -28,-30
+            2838: 77,-19
+            2839: 77,-15
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerNw
           decals:
-            2329: -25,-9
-            2558: -41,-30
-            2606: 27,-25
-            2658: 57,-19
+            2325: -25,-9
+            2554: -41,-30
+            2602: 27,-25
+            2654: 57,-19
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerSe
           decals:
-            2315: -24,-11
-            2441: -46,-32
-            2447: -47,-33
-            2512: -54,-48
-            2557: -28,-27
-            2662: 59,-21
-            2840: 77,-13
-            2841: 77,-17
+            2311: -24,-11
+            2437: -46,-32
+            2443: -47,-33
+            2508: -54,-48
+            2553: -28,-27
+            2658: 59,-21
+            2836: 77,-13
+            2837: 77,-17
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerSw
           decals:
-            2438: -50,-32
-            2448: -49,-33
-            2511: -42,-48
-            2556: -41,-27
-            2588: 7,-32
-            2667: 52,-21
-            2693: 41,1
-            2695: 40,2
-            2763: 19,19
+            2434: -50,-32
+            2444: -49,-33
+            2507: -42,-48
+            2552: -41,-27
+            2584: 7,-32
+            2663: 52,-21
+            2689: 41,1
+            2691: 40,2
+            2759: 19,19
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineE
           decals:
-            2292: -23,-29
-            2293: -24,-25
-            2294: -24,-24
-            2295: -24,-23
-            2296: -24,-23
-            2297: -24,-20
+            2288: -23,-29
+            2289: -24,-25
+            2290: -24,-24
+            2291: -24,-23
+            2292: -24,-23
+            2293: -24,-20
+            2294: -24,-20
+            2295: -24,-20
+            2296: -24,-21
+            2297: -24,-21
             2298: -24,-20
-            2299: -24,-20
-            2300: -24,-21
-            2301: -24,-21
-            2302: -24,-20
-            2303: -24,-19
-            2304: -24,-19
-            2305: -24,-19
-            2306: -24,-17
-            2307: -24,-17
-            2308: -24,-16
-            2309: -24,-16
-            2310: -24,-16
-            2311: -24,-15
-            2312: -24,-14
-            2313: -24,-14
-            2314: -24,-13
-            2317: -23,-10
-            2318: -23,-9
-            2319: -23,-8
-            2330: -25,4
-            2331: -25,5
-            2332: -25,6
-            2333: -25,7
-            2345: -43,0
-            2346: -43,1
-            2347: -43,2
-            2348: -43,3
-            2349: -43,-1
-            2388: -53,-6
-            2389: -53,-7
-            2390: -53,-7
-            2391: -53,-8
-            2392: -53,-9
-            2393: -53,-9
-            2394: -53,-10
-            2395: -53,-12
-            2403: -53,-13
-            2404: -53,-13
-            2405: -53,-15
-            2406: -53,-15
-            2407: -53,-15
-            2409: -53,-14
-            2410: -53,-16
-            2411: -53,-17
-            2412: -53,-18
-            2418: -44,-20
-            2419: -44,-21
-            2420: -44,-22
-            2421: -44,-22
-            2422: -44,-23
-            2423: -44,-23
-            2424: -44,-24
-            2425: -43,-25
-            2426: -43,-26
-            2427: -43,-27
-            2445: -43,-31
-            2446: -43,-30
-            2451: -47,-35
-            2452: -47,-36
-            2453: -47,-36
-            2454: -47,-38
-            2455: -47,-39
-            2456: -47,-40
-            2467: -47,-41
-            2468: -47,-42
-            2469: -47,-42
-            2470: -47,-43
-            2471: -47,-44
-            2472: -47,-44
-            2523: -40,-47
-            2524: -40,-48
-            2525: -40,-50
-            2526: -40,-50
-            2527: -40,-51
-            2528: -40,-51
-            2529: -40,-51
-            2530: -40,-52
-            2531: -40,-53
-            2532: -40,-53
-            2533: -40,-53
-            2534: -40,-54
-            2535: -54,-51
-            2536: -54,-51
-            2537: -54,-52
-            2538: -54,-52
-            2539: -54,-53
-            2540: -54,-53
-            2541: -54,-54
-            2552: -28,-29
-            2553: -28,-28
-            2663: 59,-22
-            2668: 43,-17
-            2669: 43,-16
-            2670: 43,-15
-            2671: 43,-15
-            2677: 43,-12
-            2678: 43,-11
-            2743: 21,10
-            2744: 21,11
-            2745: 21,11
-            2746: 21,12
-            2747: 21,12
-            2748: 21,12
-            2749: 21,13
-            2750: 21,14
-            2751: 21,15
-            2838: 77,-14
-            2839: 77,-18
-            3174: -54,-50
-            6860: -24,-18
+            2299: -24,-19
+            2300: -24,-19
+            2301: -24,-19
+            2302: -24,-17
+            2303: -24,-17
+            2304: -24,-16
+            2305: -24,-16
+            2306: -24,-16
+            2307: -24,-15
+            2308: -24,-14
+            2309: -24,-14
+            2310: -24,-13
+            2313: -23,-10
+            2314: -23,-9
+            2315: -23,-8
+            2326: -25,4
+            2327: -25,5
+            2328: -25,6
+            2329: -25,7
+            2341: -43,0
+            2342: -43,1
+            2343: -43,2
+            2344: -43,3
+            2345: -43,-1
+            2384: -53,-6
+            2385: -53,-7
+            2386: -53,-7
+            2387: -53,-8
+            2388: -53,-9
+            2389: -53,-9
+            2390: -53,-10
+            2391: -53,-12
+            2399: -53,-13
+            2400: -53,-13
+            2401: -53,-15
+            2402: -53,-15
+            2403: -53,-15
+            2405: -53,-14
+            2406: -53,-16
+            2407: -53,-17
+            2408: -53,-18
+            2414: -44,-20
+            2415: -44,-21
+            2416: -44,-22
+            2417: -44,-22
+            2418: -44,-23
+            2419: -44,-23
+            2420: -44,-24
+            2421: -43,-25
+            2422: -43,-26
+            2423: -43,-27
+            2441: -43,-31
+            2442: -43,-30
+            2447: -47,-35
+            2448: -47,-36
+            2449: -47,-36
+            2450: -47,-38
+            2451: -47,-39
+            2452: -47,-40
+            2463: -47,-41
+            2464: -47,-42
+            2465: -47,-42
+            2466: -47,-43
+            2467: -47,-44
+            2468: -47,-44
+            2519: -40,-47
+            2520: -40,-48
+            2521: -40,-50
+            2522: -40,-50
+            2523: -40,-51
+            2524: -40,-51
+            2525: -40,-51
+            2526: -40,-52
+            2527: -40,-53
+            2528: -40,-53
+            2529: -40,-53
+            2530: -40,-54
+            2531: -54,-51
+            2532: -54,-51
+            2533: -54,-52
+            2534: -54,-52
+            2535: -54,-53
+            2536: -54,-53
+            2537: -54,-54
+            2548: -28,-29
+            2549: -28,-28
+            2659: 59,-22
+            2664: 43,-17
+            2665: 43,-16
+            2666: 43,-15
+            2667: 43,-15
+            2673: 43,-12
+            2674: 43,-11
+            2739: 21,10
+            2740: 21,11
+            2741: 21,11
+            2742: 21,12
+            2743: 21,12
+            2744: 21,12
+            2745: 21,13
+            2746: 21,14
+            2747: 21,15
+            2834: 77,-14
+            2835: 77,-18
+            3170: -54,-50
+            6848: -24,-18
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineN
           decals:
-            2285: -22,-30
-            2286: -21,-30
-            2287: -20,-30
-            2288: -20,-30
-            2289: -18,-30
-            2290: -19,-30
-            2334: -19,9
-            2335: -20,9
-            2336: -21,9
-            2337: -22,9
-            2338: -24,9
-            2339: -23,9
-            2359: -51,7
-            2360: -50,7
-            2361: -49,7
-            2362: -48,7
-            2363: -47,7
-            2364: -47,7
-            2365: -46,7
-            2366: -45,7
-            2367: -42,7
-            2368: -43,7
-            2369: -54,7
-            2370: -55,7
-            2371: -53,7
-            2473: -54,-46
-            2474: -51,-46
-            2475: -50,-46
-            2476: -50,-46
-            2477: -51,-46
-            2478: -53,-46
+            2281: -22,-30
+            2282: -21,-30
+            2283: -20,-30
+            2284: -20,-30
+            2285: -18,-30
+            2286: -19,-30
+            2330: -19,9
+            2331: -20,9
+            2332: -21,9
+            2333: -22,9
+            2334: -24,9
+            2335: -23,9
+            2355: -51,7
+            2356: -50,7
+            2357: -49,7
+            2358: -48,7
+            2359: -47,7
+            2360: -47,7
+            2361: -46,7
+            2362: -45,7
+            2363: -42,7
+            2364: -43,7
+            2365: -54,7
+            2366: -55,7
+            2367: -53,7
+            2469: -54,-46
+            2470: -51,-46
+            2471: -50,-46
+            2472: -50,-46
+            2473: -51,-46
+            2474: -53,-46
+            2475: -54,-46
+            2476: -54,-46
+            2477: -53,-46
+            2478: -52,-46
             2479: -54,-46
-            2480: -54,-46
-            2481: -53,-46
-            2482: -52,-46
-            2483: -54,-46
-            2484: -55,-46
-            2485: -46,-46
-            2486: -45,-46
-            2487: -45,-46
-            2488: -44,-46
-            2489: -44,-46
-            2490: -43,-46
-            2491: -43,-46
-            2492: -42,-46
-            2493: -42,-46
-            2494: -41,-46
-            2578: -11,-30
-            2579: -10,-30
-            2580: -10,-30
-            2604: 25,-25
-            2605: 26,-25
-            2615: 28,-19
-            2616: 29,-19
-            2617: 29,-19
-            2618: 31,-19
-            2619: 31,-19
-            2620: 32,-19
-            2621: 32,-19
-            2622: 32,-19
-            2623: 34,-19
-            2624: 34,-19
-            2625: 34,-19
-            2626: 33,-19
-            2627: 35,-19
-            2628: 35,-19
-            2629: 36,-19
-            2630: 36,-19
-            2631: 37,-19
-            2632: 37,-19
-            2633: 39,-19
-            2634: 39,-19
-            2635: 40,-19
-            2636: 40,-19
-            2637: 40,-19
-            2638: 41,-19
-            2639: 42,-19
-            2640: 42,-19
-            2641: 43,-19
-            2642: 44,-19
-            2643: 44,-19
-            2644: 45,-19
-            2645: 47,-19
-            2646: 47,-19
-            2647: 48,-19
-            2648: 49,-19
-            2649: 49,-19
-            2650: 50,-19
-            2651: 51,-19
-            2652: 52,-19
-            2653: 52,-19
-            2654: 54,-19
-            2655: 55,-19
-            2656: 56,-19
-            2657: 53,-19
-            2700: 37,4
-            2701: 35,4
-            2702: 34,4
-            2703: 33,4
-            2704: 32,4
-            2705: 32,4
-            2706: 31,4
-            2766: 20,21
-            2767: 19,21
-            2768: 19,21
-            2769: 18,21
-            2770: 16,21
-            2771: 16,21
-            2772: 16,21
-            2773: 16,21
-            2774: 15,21
-            2775: 13,21
-            2776: 13,21
-            2777: 12,21
-            2778: 11,21
-            2779: 10,21
-            2780: 10,21
-            2781: 9,21
-            2782: 8,21
-            2821: -26,21
-            2831: 66,-17
-            2832: 68,-17
-            2833: 67,-17
-            2834: 69,-17
-            2835: 70,-17
-            2836: 70,-17
-            2837: 71,-17
+            2480: -55,-46
+            2481: -46,-46
+            2482: -45,-46
+            2483: -45,-46
+            2484: -44,-46
+            2485: -44,-46
+            2486: -43,-46
+            2487: -43,-46
+            2488: -42,-46
+            2489: -42,-46
+            2490: -41,-46
+            2574: -11,-30
+            2575: -10,-30
+            2576: -10,-30
+            2600: 25,-25
+            2601: 26,-25
+            2611: 28,-19
+            2612: 29,-19
+            2613: 29,-19
+            2614: 31,-19
+            2615: 31,-19
+            2616: 32,-19
+            2617: 32,-19
+            2618: 32,-19
+            2619: 34,-19
+            2620: 34,-19
+            2621: 34,-19
+            2622: 33,-19
+            2623: 35,-19
+            2624: 35,-19
+            2625: 36,-19
+            2626: 36,-19
+            2627: 37,-19
+            2628: 37,-19
+            2629: 39,-19
+            2630: 39,-19
+            2631: 40,-19
+            2632: 40,-19
+            2633: 40,-19
+            2634: 41,-19
+            2635: 42,-19
+            2636: 42,-19
+            2637: 43,-19
+            2638: 44,-19
+            2639: 44,-19
+            2640: 45,-19
+            2641: 47,-19
+            2642: 47,-19
+            2643: 48,-19
+            2644: 49,-19
+            2645: 49,-19
+            2646: 50,-19
+            2647: 51,-19
+            2648: 52,-19
+            2649: 52,-19
+            2650: 54,-19
+            2651: 55,-19
+            2652: 56,-19
+            2653: 53,-19
+            2696: 37,4
+            2697: 35,4
+            2698: 34,4
+            2699: 33,4
+            2700: 32,4
+            2701: 32,4
+            2702: 31,4
+            2762: 20,21
+            2763: 19,21
+            2764: 19,21
+            2765: 18,21
+            2766: 16,21
+            2767: 16,21
+            2768: 16,21
+            2769: 16,21
+            2770: 15,21
+            2771: 13,21
+            2772: 13,21
+            2773: 12,21
+            2774: 11,21
+            2775: 10,21
+            2776: 10,21
+            2777: 9,21
+            2778: 8,21
+            2817: -26,21
+            2827: 66,-17
+            2828: 68,-17
+            2829: 67,-17
+            2830: 69,-17
+            2831: 70,-17
+            2832: 70,-17
+            2833: 71,-17
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineS
           decals:
-            2275: -25,-32
-            2276: -23,-32
-            2277: -24,-32
-            2278: -22,-32
-            2279: -22,-32
-            2280: -21,-32
-            2281: -19,-32
-            2282: -19,-32
-            2283: -18,-32
-            2284: -18,-32
-            2350: -45,-5
-            2351: -46,-5
-            2352: -47,-5
-            2353: -48,-5
-            2354: -48,-5
-            2355: -50,-5
-            2356: -50,-5
-            2357: -49,-5
-            2358: -51,-5
-            2437: -51,-32
-            2442: -45,-32
-            2443: -44,-32
-            2495: -53,-48
-            2496: -52,-48
-            2497: -51,-48
+            2271: -25,-32
+            2272: -23,-32
+            2273: -24,-32
+            2274: -22,-32
+            2275: -22,-32
+            2276: -21,-32
+            2277: -19,-32
+            2278: -19,-32
+            2279: -18,-32
+            2280: -18,-32
+            2346: -45,-5
+            2347: -46,-5
+            2348: -47,-5
+            2349: -48,-5
+            2350: -48,-5
+            2351: -50,-5
+            2352: -50,-5
+            2353: -49,-5
+            2354: -51,-5
+            2433: -51,-32
+            2438: -45,-32
+            2439: -44,-32
+            2491: -53,-48
+            2492: -52,-48
+            2493: -51,-48
+            2494: -50,-48
+            2495: -50,-48
+            2496: -49,-48
+            2497: -50,-48
             2498: -50,-48
-            2499: -50,-48
-            2500: -49,-48
-            2501: -50,-48
-            2502: -50,-48
-            2503: -48,-48
-            2504: -48,-48
-            2505: -47,-48
-            2506: -47,-48
-            2507: -46,-48
-            2508: -45,-48
-            2509: -44,-48
-            2510: -43,-48
-            2560: -16,-32
+            2499: -48,-48
+            2500: -48,-48
+            2501: -47,-48
+            2502: -47,-48
+            2503: -46,-48
+            2504: -45,-48
+            2505: -44,-48
+            2506: -43,-48
+            2556: -16,-32
+            2557: -14,-32
+            2558: -14,-32
+            2559: -14,-32
+            2560: -15,-32
             2561: -14,-32
             2562: -14,-32
-            2563: -14,-32
-            2564: -15,-32
-            2565: -14,-32
-            2566: -14,-32
-            2567: -13,-32
-            2568: -12,-32
-            2569: -12,-32
-            2570: -11,-32
-            2571: -11,-32
-            2572: -10,-32
-            2573: -10,-32
-            2574: -7,-32
-            2575: -6,-32
-            2576: -5,-32
-            2577: -5,-32
-            2581: -4,-32
-            2582: -3,-32
-            2583: -3,-32
-            2584: -3,-32
-            2585: -2,-32
-            2586: 3,-32
-            2587: 6,-32
-            2591: 8,-34
-            2592: 9,-34
-            2593: 9,-34
-            2594: 11,-34
-            2595: 11,-34
-            2596: 12,-34
-            2597: 12,-34
-            2598: 13,-34
-            2599: 13,-34
-            2600: 14,-34
-            2601: 15,-34
-            2602: 15,-34
-            2603: 16,-34
-            2661: 60,-21
-            2696: 38,2
-            2697: 36,2
-            2698: 37,2
-            2699: 38,2
-            2707: 34,2
-            2708: 33,2
-            2709: 32,2
-            2710: 31,2
-            2711: 31,2
-            2712: 27,2
-            2713: 26,2
-            2714: 26,2
-            2715: 25,2
-            2716: 24,2
-            2717: 23,2
-            2718: 23,2
-            2719: 21,2
-            2720: 21,2
-            2721: 22,2
-            2722: 20,2
-            2764: 18,19
-            2765: 16,19
-            2783: 14,19
-            2784: 13,19
-            2785: 12,19
-            2786: 11,19
-            2787: 10,19
-            2788: 10,19
-            2789: 9,19
-            2790: 9,19
-            2791: 8,19
-            2792: 6,19
-            2793: 6,19
-            2794: 7,19
-            2795: 5,19
-            2796: 0,19
-            2797: 0,19
-            2798: -1,19
-            2799: -1,19
-            2800: -2,19
-            2801: -3,19
-            2802: -3,19
-            2803: -4,19
-            2804: -5,19
-            2805: -6,19
-            2806: -6,19
-            2807: -7,19
-            2808: -7,19
-            2809: -8,19
-            2810: -8,19
-            2811: -8,19
-            2812: -11,19
-            2813: -11,19
-            2814: -13,19
-            2815: -13,19
-            2816: -14,19
-            2817: -12,19
-            2818: -16,19
-            2819: -16,19
-            2820: -18,19
-            2825: 66,-19
-            2826: 67,-19
-            2827: 68,-19
-            2828: 69,-19
-            2829: 70,-19
-            2830: 71,-19
-            3071: 1,19
-            3072: 2,19
+            2563: -13,-32
+            2564: -12,-32
+            2565: -12,-32
+            2566: -11,-32
+            2567: -11,-32
+            2568: -10,-32
+            2569: -10,-32
+            2570: -7,-32
+            2571: -6,-32
+            2572: -5,-32
+            2573: -5,-32
+            2577: -4,-32
+            2578: -3,-32
+            2579: -3,-32
+            2580: -3,-32
+            2581: -2,-32
+            2582: 3,-32
+            2583: 6,-32
+            2587: 8,-34
+            2588: 9,-34
+            2589: 9,-34
+            2590: 11,-34
+            2591: 11,-34
+            2592: 12,-34
+            2593: 12,-34
+            2594: 13,-34
+            2595: 13,-34
+            2596: 14,-34
+            2597: 15,-34
+            2598: 15,-34
+            2599: 16,-34
+            2657: 60,-21
+            2692: 38,2
+            2693: 36,2
+            2694: 37,2
+            2695: 38,2
+            2703: 34,2
+            2704: 33,2
+            2705: 32,2
+            2706: 31,2
+            2707: 31,2
+            2708: 27,2
+            2709: 26,2
+            2710: 26,2
+            2711: 25,2
+            2712: 24,2
+            2713: 23,2
+            2714: 23,2
+            2715: 21,2
+            2716: 21,2
+            2717: 22,2
+            2718: 20,2
+            2760: 18,19
+            2761: 16,19
+            2779: 14,19
+            2780: 13,19
+            2781: 12,19
+            2782: 11,19
+            2783: 10,19
+            2784: 10,19
+            2785: 9,19
+            2786: 9,19
+            2787: 8,19
+            2788: 6,19
+            2789: 6,19
+            2790: 7,19
+            2791: 5,19
+            2792: 0,19
+            2793: 0,19
+            2794: -1,19
+            2795: -1,19
+            2796: -2,19
+            2797: -3,19
+            2798: -3,19
+            2799: -4,19
+            2800: -5,19
+            2801: -6,19
+            2802: -6,19
+            2803: -7,19
+            2804: -7,19
+            2805: -8,19
+            2806: -8,19
+            2807: -8,19
+            2808: -11,19
+            2809: -11,19
+            2810: -13,19
+            2811: -13,19
+            2812: -14,19
+            2813: -12,19
+            2814: -16,19
+            2815: -16,19
+            2816: -18,19
+            2821: 66,-19
+            2822: 67,-19
+            2823: 68,-19
+            2824: 69,-19
+            2825: 70,-19
+            2826: 71,-19
+            3067: 1,19
+            3068: 2,19
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineW
           decals:
-            2258: -26,-21
-            2259: -26,-20
-            2260: -26,-18
-            2261: -26,-19
-            2262: -26,-17
-            2267: -26,-25
-            2268: -26,-24
-            2269: -26,-27
-            2270: -26,-26
-            2271: -26,-28
-            2272: -26,-29
-            2273: -26,-30
-            2274: -26,-31
-            2320: -25,-8
-            2321: -26,-10
-            2322: -26,-11
-            2323: -26,-16
-            2324: -26,-15
-            2325: -26,-15
-            2326: -26,-14
-            2327: -26,-13
-            2341: -27,7
-            2342: -27,8
-            2343: -27,6
-            2344: -27,5
-            2373: -55,5
-            2374: -55,3
-            2375: -55,2
-            2376: -55,1
-            2377: -55,0
-            2378: -55,-1
-            2379: -55,-3
-            2380: -55,-6
-            2381: -55,-6
-            2382: -55,-7
-            2383: -55,-7
-            2384: -55,-8
-            2385: -55,-9
-            2386: -55,-9
-            2387: -55,-11
-            2396: -55,-10
-            2397: -55,-11
-            2398: -55,-12
-            2399: -55,-13
-            2400: -55,-13
-            2401: -55,-15
-            2402: -55,-15
-            2408: -55,-14
-            2413: -55,-16
-            2414: -55,-17
-            2415: -55,-18
-            2416: -55,-20
-            2417: -55,-21
-            2430: -52,-28
-            2431: -52,-29
-            2432: -52,-30
-            2433: -52,-30
-            2434: -52,-31
-            2435: -52,-32
-            2449: -49,-35
-            2450: -49,-36
-            2457: -49,-38
-            2458: -49,-38
-            2459: -49,-39
-            2460: -49,-40
-            2461: -49,-40
-            2462: -49,-41
-            2463: -49,-42
-            2464: -49,-43
-            2465: -49,-43
-            2466: -49,-44
-            2515: -42,-50
-            2516: -42,-50
-            2517: -42,-51
-            2518: -42,-51
-            2519: -42,-52
-            2520: -42,-52
-            2521: -42,-53
-            2522: -42,-54
-            2542: -56,-54
-            2543: -56,-53
-            2544: -56,-52
-            2545: -56,-52
-            2546: -56,-51
-            2547: -56,-51
-            2548: -56,-48
-            2549: -56,-48
-            2550: -56,-47
-            2551: -56,-50
-            2554: -41,-29
-            2555: -41,-28
-            2589: 7,-33
-            2607: 27,-23
-            2608: 27,-23
-            2609: 27,-23
-            2610: 27,-22
-            2611: 27,-24
-            2612: 27,-21
-            2613: 27,-20
-            2659: 57,-18
-            2660: 57,-17
-            2664: 52,-24
-            2665: 52,-23
-            2666: 52,-22
-            2672: 41,-17
-            2673: 41,-16
-            2674: 41,-15
-            2675: 41,-12
-            2676: 41,-11
-            2679: 41,-9
-            2680: 41,-8
-            2681: 41,-7
-            2682: 41,-7
-            2683: 41,-6
-            2684: 41,-5
-            2685: 41,-5
-            2686: 41,-4
-            2687: 41,-3
-            2688: 41,-3
-            2689: 41,-1
-            2690: 41,-1
-            2691: 41,-1
-            2692: 41,-2
-            2724: 19,3
-            2725: 19,4
-            2726: 19,4
-            2727: 19,4
-            2728: 19,5
-            2729: 19,5
-            2730: 19,7
-            2731: 19,8
-            2732: 19,8
-            2733: 19,8
+            2254: -26,-21
+            2255: -26,-20
+            2256: -26,-18
+            2257: -26,-19
+            2258: -26,-17
+            2263: -26,-25
+            2264: -26,-24
+            2265: -26,-27
+            2266: -26,-26
+            2267: -26,-28
+            2268: -26,-29
+            2269: -26,-30
+            2270: -26,-31
+            2316: -25,-8
+            2317: -26,-10
+            2318: -26,-11
+            2319: -26,-16
+            2320: -26,-15
+            2321: -26,-15
+            2322: -26,-14
+            2323: -26,-13
+            2337: -27,7
+            2338: -27,8
+            2339: -27,6
+            2340: -27,5
+            2369: -55,5
+            2370: -55,3
+            2371: -55,2
+            2372: -55,1
+            2373: -55,0
+            2374: -55,-1
+            2375: -55,-3
+            2376: -55,-6
+            2377: -55,-6
+            2378: -55,-7
+            2379: -55,-7
+            2380: -55,-8
+            2381: -55,-9
+            2382: -55,-9
+            2383: -55,-11
+            2392: -55,-10
+            2393: -55,-11
+            2394: -55,-12
+            2395: -55,-13
+            2396: -55,-13
+            2397: -55,-15
+            2398: -55,-15
+            2404: -55,-14
+            2409: -55,-16
+            2410: -55,-17
+            2411: -55,-18
+            2412: -55,-20
+            2413: -55,-21
+            2426: -52,-28
+            2427: -52,-29
+            2428: -52,-30
+            2429: -52,-30
+            2430: -52,-31
+            2431: -52,-32
+            2445: -49,-35
+            2446: -49,-36
+            2453: -49,-38
+            2454: -49,-38
+            2455: -49,-39
+            2456: -49,-40
+            2457: -49,-40
+            2458: -49,-41
+            2459: -49,-42
+            2460: -49,-43
+            2461: -49,-43
+            2462: -49,-44
+            2511: -42,-50
+            2512: -42,-50
+            2513: -42,-51
+            2514: -42,-51
+            2515: -42,-52
+            2516: -42,-52
+            2517: -42,-53
+            2518: -42,-54
+            2538: -56,-54
+            2539: -56,-53
+            2540: -56,-52
+            2541: -56,-52
+            2542: -56,-51
+            2543: -56,-51
+            2544: -56,-48
+            2545: -56,-48
+            2546: -56,-47
+            2547: -56,-50
+            2550: -41,-29
+            2551: -41,-28
+            2585: 7,-33
+            2603: 27,-23
+            2604: 27,-23
+            2605: 27,-23
+            2606: 27,-22
+            2607: 27,-24
+            2608: 27,-21
+            2609: 27,-20
+            2655: 57,-18
+            2656: 57,-17
+            2660: 52,-24
+            2661: 52,-23
+            2662: 52,-22
+            2668: 41,-17
+            2669: 41,-16
+            2670: 41,-15
+            2671: 41,-12
+            2672: 41,-11
+            2675: 41,-9
+            2676: 41,-8
+            2677: 41,-7
+            2678: 41,-7
+            2679: 41,-6
+            2680: 41,-5
+            2681: 41,-5
+            2682: 41,-4
+            2683: 41,-3
+            2684: 41,-3
+            2685: 41,-1
+            2686: 41,-1
+            2687: 41,-1
+            2688: 41,-2
+            2720: 19,3
+            2721: 19,4
+            2722: 19,4
+            2723: 19,4
+            2724: 19,5
+            2725: 19,5
+            2726: 19,7
+            2727: 19,8
+            2728: 19,8
+            2729: 19,8
+            2730: 19,10
+            2731: 19,10
+            2732: 19,11
+            2733: 19,10
             2734: 19,10
-            2735: 19,10
-            2736: 19,11
-            2737: 19,10
-            2738: 19,10
-            2739: 19,12
-            2740: 19,10
-            2741: 19,9
-            2742: 19,9
-            2752: 19,13
-            2753: 19,14
-            2754: 19,14
-            2755: 19,14
-            2756: 19,15
-            2757: 19,15
-            2758: 19,15
-            2759: 19,16
-            2760: 19,16
-            2761: 19,18
-            2762: 19,18
-            2822: -27,20
-            2823: -27,18
+            2735: 19,12
+            2736: 19,10
+            2737: 19,9
+            2738: 19,9
+            2748: 19,13
+            2749: 19,14
+            2750: 19,14
+            2751: 19,14
+            2752: 19,15
+            2753: 19,15
+            2754: 19,15
+            2755: 19,16
+            2756: 19,16
+            2757: 19,18
+            2758: 19,18
+            2818: -27,20
+            2819: -27,18
         - node:
             color: '#52B4E996'
             id: MonoOverlay
           decals:
-            6266: 44,8
+            6262: 44,8
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale
@@ -7543,7 +7544,7 @@ entities:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale
           decals:
-            6268: 43,9
+            6264: 43,9
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale
@@ -7609,12 +7610,12 @@ entities:
             1919: 59,-17
             1920: 60,-17
             1921: 61,-17
-            2173: -1,-33
-            6247: 38,4
-            6248: 40,4
-            6249: 41,4
-            6250: 42,4
-            6251: 43,4
+            2169: -1,-33
+            6243: 38,4
+            6244: 40,4
+            6245: 41,4
+            6246: 42,4
+            6247: 43,4
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale
@@ -7683,7 +7684,7 @@ entities:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale180
           decals:
-            6269: 45,7
+            6265: 45,7
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale180
@@ -7712,24 +7713,24 @@ entities:
             1923: 61,-18
             1924: 61,-19
             1925: 61,-20
-            2169: -1,-33
-            2170: 0,-33
-            2171: 1,-33
-            2172: 2,-33
-            6252: 43,4
-            6253: 43,3
-            6254: 43,2
-            6255: 43,1
-            6256: 43,-1
-            6257: 43,-2
-            6258: 43,-3
-            6259: 43,-4
-            6260: 43,-5
-            6261: 43,-6
-            6262: 43,-7
-            6263: 43,-8
-            6264: 43,-9
-            6265: 43,-10
+            2165: -1,-33
+            2166: 0,-33
+            2167: 1,-33
+            2168: 2,-33
+            6248: 43,4
+            6249: 43,3
+            6250: 43,2
+            6251: 43,1
+            6252: 43,-1
+            6253: 43,-2
+            6254: 43,-3
+            6255: 43,-4
+            6256: 43,-5
+            6257: 43,-6
+            6258: 43,-7
+            6259: 43,-8
+            6260: 43,-9
+            6261: 43,-10
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale180
@@ -7752,7 +7753,7 @@ entities:
             1599: 19,-27
             1600: 19,-29
             1601: 19,-30
-            6270: 43,7
+            6266: 43,7
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale270
@@ -7798,10 +7799,10 @@ entities:
             1567: 5,-29
             1568: 5,-28
             1569: 5,-27
-            2164: -1,-33
-            2165: 1,-33
-            2166: 0,-33
-            2167: 2,-33
+            2160: -1,-33
+            2161: 1,-33
+            2162: 0,-33
+            2163: 2,-33
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale90
@@ -7816,25 +7817,25 @@ entities:
             1594: 21,-25
             1595: 22,-25
             1596: 23,-25
-            6229: 40,4
-            6230: 38,4
-            6231: 41,4
-            6232: 42,4
-            6233: 43,4
-            6234: 43,3
-            6235: 43,2
-            6236: 43,1
-            6237: 43,-1
-            6238: 43,-2
-            6239: 43,-3
-            6240: 43,-4
-            6241: 43,-5
-            6242: 43,-6
-            6243: 43,-7
-            6244: 43,-10
-            6245: 43,-9
-            6246: 43,-8
-            6267: 45,9
+            6225: 40,4
+            6226: 38,4
+            6227: 41,4
+            6228: 42,4
+            6229: 43,4
+            6230: 43,3
+            6231: 43,2
+            6232: 43,1
+            6233: 43,-1
+            6234: 43,-2
+            6235: 43,-3
+            6236: 43,-4
+            6237: 43,-5
+            6238: 43,-6
+            6239: 43,-7
+            6240: 43,-10
+            6241: 43,-9
+            6242: 43,-8
+            6263: 45,9
         - node:
             color: '#79150096'
             id: QuarterTileOverlayGreyscale90
@@ -7955,7 +7956,7 @@ entities:
             1564: 1,-30
             1565: 2,-30
             1566: 3,-30
-            2168: 2,-33
+            2164: 2,-33
         - node:
             color: '#FFFFFFFF'
             id: Rock01
@@ -7998,12 +7999,12 @@ entities:
             color: '#FFFFFFFF'
             id: Rust
           decals:
-            2956: -5,-39
-            2957: -7,-40
-            2958: -6,-41
-            2959: -7,-41
-            2960: -8,-39
-            2961: -8,-42
+            2952: -5,-39
+            2953: -7,-40
+            2954: -6,-41
+            2955: -7,-41
+            2956: -8,-39
+            2957: -8,-42
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign1
@@ -8088,19 +8089,19 @@ entities:
             color: '#FFFFFFB1'
             id: VentSmall
           decals:
-            2890: -36,22
+            2886: -36,22
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNE
           decals:
             1184: 6,32
-            6583: 91,-13
+            6577: 91,-13
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNW
           decals:
             1183: 3,32
-            6584: 88,-13
+            6578: 88,-13
         - node:
             color: '#EFB34196'
             id: WarnCornerSE
@@ -8110,7 +8111,7 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSE
           decals:
-            6582: 91,-16
+            6576: 91,-16
         - node:
             color: '#EFB34196'
             id: WarnCornerSW
@@ -8120,38 +8121,38 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSW
           decals:
-            6581: 88,-16
+            6575: 88,-16
         - node:
             color: '#52B4E996'
             id: WarnCornerSmallGreyscaleSE
           decals:
-            6744: 49,-11
-            6745: 52,-11
+            6738: 49,-11
+            6739: 52,-11
         - node:
             color: '#52B4E996'
             id: WarnCornerSmallGreyscaleSW
           decals:
-            6742: 49,-11
-            6743: 52,-11
+            6736: 49,-11
+            6737: 52,-11
         - node:
             color: '#EFB34118'
             id: WarnCornerSmallNE
           decals:
-            6661: 12,-30
-            6662: 12,-30
+            6655: 12,-30
+            6656: 12,-30
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallNE
           decals:
-            6813: 14,39
-            6814: 14,39
-            6815: 14,39
-            6816: 14,39
+            6807: 14,39
+            6808: 14,39
+            6809: 14,39
+            6810: 14,39
         - node:
             color: '#EFB3416C'
             id: WarnCornerSmallNE
           decals:
-            6660: 12,-30
+            6654: 12,-30
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallNE
@@ -8164,27 +8165,27 @@ entities:
             1317: 25,23
             1318: 29,23
             2075: 11,-47
-            6317: 51,13
-            6405: 51,-11
+            6312: 51,13
+            6400: 51,-11
         - node:
             color: '#EFB34118'
             id: WarnCornerSmallNW
           decals:
-            6663: 16,-30
-            6664: 16,-30
+            6657: 16,-30
+            6658: 16,-30
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallNW
           decals:
-            6809: 16,39
-            6810: 16,39
-            6811: 16,39
-            6812: 16,39
+            6803: 16,39
+            6804: 16,39
+            6805: 16,39
+            6806: 16,39
         - node:
             color: '#EFB3416C'
             id: WarnCornerSmallNW
           decals:
-            6659: 16,-30
+            6653: 16,-30
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallNW
@@ -8203,10 +8204,10 @@ entities:
             color: '#EFB34131'
             id: WarnCornerSmallSE
           decals:
-            6805: 14,42
-            6806: 14,42
-            6807: 14,42
-            6808: 14,42
+            6799: 14,42
+            6800: 14,42
+            6801: 14,42
+            6802: 14,42
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallSE
@@ -8220,15 +8221,15 @@ entities:
             id: WarnCornerSmallSE
           decals:
             1439: 55,-33
-            6316: 51,15
+            6311: 51,15
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallSW
           decals:
-            6801: 16,42
-            6802: 16,42
-            6803: 16,42
-            6804: 16,42
+            6795: 16,42
+            6796: 16,42
+            6797: 16,42
+            6798: 16,42
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallSW
@@ -8239,14 +8240,14 @@ entities:
             color: '#EFB34131'
             id: WarnLineE
           decals:
-            6777: 14,40
-            6778: 14,40
-            6779: 14,41
-            6780: 14,41
-            6789: 14,40
-            6790: 14,40
-            6791: 14,41
-            6792: 14,41
+            6771: 14,40
+            6772: 14,40
+            6773: 14,41
+            6774: 14,41
+            6783: 14,40
+            6784: 14,40
+            6785: 14,41
+            6786: 14,41
         - node:
             color: '#EFB34196'
             id: WarnLineE
@@ -8274,10 +8275,10 @@ entities:
             279: 29,-13
             280: 29,-12
             281: 29,-11
-            6213: 47,14
-            6214: 47,14
-            6215: 47,15
-            6216: 47,15
+            6209: 47,14
+            6210: 47,14
+            6211: 47,15
+            6212: 47,15
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
@@ -8293,48 +8294,48 @@ entities:
             1855: 73,-16
             1856: 73,-18
             1857: 73,-19
-            6179: -45,23
-            6314: 51,14
-            6404: 51,-10
-            6579: 91,-15
-            6580: 91,-14
-            6672: 56,-29
-            6673: 56,-28
-            6674: 56,-27
-            6712: -33,-11
-            6713: -33,-10
+            6175: -45,23
+            6309: 51,14
+            6399: 51,-10
+            6573: 91,-15
+            6574: 91,-14
+            6666: 56,-29
+            6667: 56,-28
+            6668: 56,-27
+            6706: -33,-11
+            6707: -33,-10
         - node:
             color: '#52B4E996'
             id: WarnLineGreyscaleE
           decals:
-            6406: 52,-12
-            6407: 52,-13
-            6408: 52,-14
-            6409: 52,-15
-            6410: 49,-12
-            6411: 49,-13
-            6412: 49,-14
-            6413: 49,-15
+            6401: 52,-12
+            6402: 52,-13
+            6403: 52,-14
+            6404: 52,-15
+            6405: 49,-12
+            6406: 49,-13
+            6407: 49,-14
+            6408: 49,-15
         - node:
             color: '#52B4E996'
             id: WarnLineGreyscaleW
           decals:
-            6414: 49,-15
-            6415: 49,-14
-            6416: 49,-13
-            6417: 49,-12
-            6418: 52,-12
-            6419: 52,-13
-            6420: 52,-14
-            6421: 52,-15
+            6409: 49,-15
+            6410: 49,-14
+            6411: 49,-13
+            6412: 49,-12
+            6413: 52,-12
+            6414: 52,-13
+            6415: 52,-14
+            6416: 52,-15
         - node:
             color: '#EFB34131'
             id: WarnLineN
           decals:
-            6797: 15,42
-            6798: 15,42
-            6799: 15,42
-            6800: 15,42
+            6791: 15,42
+            6792: 15,42
+            6793: 15,42
+            6794: 15,42
         - node:
             color: '#EFB34196'
             id: WarnLineN
@@ -8353,8 +8354,8 @@ entities:
             272: 27,-14
             273: 28,-14
             1474: 46,14
-            6203: 46,14
-            6204: 46,14
+            6199: 46,14
+            6200: 46,14
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
@@ -8374,30 +8375,30 @@ entities:
             2070: 13,-48
             2071: 15,-48
             2072: 16,-48
-            2128: 0,-38
-            2129: 1,-38
-            2130: 2,-38
-            2134: 7,-45
-            2135: 8,-45
-            2136: 9,-45
-            6176: -44,24
-            6573: 89,-16
-            6574: 90,-16
-            6842: 33,-14
-            6843: 34,-14
-            6844: 35,-14
+            2124: 0,-38
+            2125: 1,-38
+            2126: 2,-38
+            6172: -44,24
+            6567: 89,-16
+            6568: 90,-16
+            6836: 33,-14
+            6837: 34,-14
+            6838: 35,-14
+            6880: 7,-47
+            6881: 8,-47
+            6882: 9,-47
         - node:
             color: '#EFB34131'
             id: WarnLineS
           decals:
-            6781: 16,40
+            6775: 16,40
+            6776: 16,40
+            6777: 16,41
+            6778: 16,41
+            6779: 16,41
+            6780: 16,40
+            6781: 16,41
             6782: 16,40
-            6783: 16,41
-            6784: 16,41
-            6785: 16,41
-            6786: 16,40
-            6787: 16,41
-            6788: 16,40
         - node:
             color: '#EFB34196'
             id: WarnLineS
@@ -8425,12 +8426,12 @@ entities:
             275: 16,-11
             276: 16,-10
             277: 16,-9
-            6207: 45,16
-            6208: 45,15
-            6209: 45,14
-            6210: 45,14
-            6211: 45,15
-            6212: 45,16
+            6203: 45,16
+            6204: 45,15
+            6205: 45,14
+            6206: 45,14
+            6207: 45,15
+            6208: 45,16
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
@@ -8439,37 +8440,37 @@ entities:
             1784: 61,-23
             1998: 26,-43
             1999: 26,-46
-            6177: -43,23
-            6315: 57,14
-            6577: 88,-15
-            6578: 88,-14
-            6710: -33,-10
-            6711: -33,-11
+            6173: -43,23
+            6310: 57,14
+            6571: 88,-15
+            6572: 88,-14
+            6704: -33,-10
+            6705: -33,-11
         - node:
             color: '#EFB34118'
             id: WarnLineW
           decals:
-            6665: 13,-30
-            6666: 13,-30
-            6667: 14,-30
-            6668: 14,-30
-            6669: 15,-30
-            6670: 15,-30
+            6659: 13,-30
+            6660: 13,-30
+            6661: 14,-30
+            6662: 14,-30
+            6663: 15,-30
+            6664: 15,-30
         - node:
             color: '#EFB34131'
             id: WarnLineW
           decals:
-            6793: 15,39
-            6794: 15,39
-            6795: 15,39
-            6796: 15,39
+            6787: 15,39
+            6788: 15,39
+            6789: 15,39
+            6790: 15,39
         - node:
             color: '#EFB3416C'
             id: WarnLineW
           decals:
-            6656: 13,-30
-            6657: 14,-30
-            6658: 15,-30
+            6650: 13,-30
+            6651: 14,-30
+            6652: 15,-30
         - node:
             color: '#EFB34196'
             id: WarnLineW
@@ -8511,26 +8512,26 @@ entities:
             2019: 29,-38
             2073: 12,-47
             2074: 13,-47
-            2157: 9,-39
-            2158: 10,-39
-            2159: 8,-39
-            2160: 11,-39
-            2174: -5,-35
-            2188: -6,-35
-            2189: -4,-35
-            6178: -44,22
-            6402: 52,-11
-            6403: 53,-11
-            6575: 89,-13
-            6576: 90,-13
-            6845: 33,-11
-            6846: 34,-11
-            6847: 35,-11
+            2153: 9,-39
+            2154: 10,-39
+            2155: 8,-39
+            2156: 11,-39
+            2170: -5,-35
+            2184: -6,-35
+            2185: -4,-35
+            6174: -44,22
+            6397: 52,-11
+            6398: 53,-11
+            6569: 89,-13
+            6570: 90,-13
+            6839: 33,-11
+            6840: 34,-11
+            6841: 35,-11
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinBox
           decals:
-            6175: -44,23
+            6171: -44,23
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNe
@@ -8543,13 +8544,14 @@ entities:
           decals:
             379: -22,7
             995: 40,-29
+            6849: -19,-13
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSe
           decals:
             401: -18,-16
             501: -32,5
-            3067: -31,-45
+            3063: -31,-45
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSw
@@ -8593,6 +8595,8 @@ entities:
             578: -33,14
             654: -39,-13
             855: -52,-3
+            6859: -22,-20
+            6860: -20,-20
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerSw
@@ -8606,6 +8610,8 @@ entities:
             965: -45.158802,-25.282345
             966: -50.020466,-25.282345
             1098: -59,-25
+            6857: -20,-20
+            6858: -18,-20
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineE
@@ -8665,7 +8671,9 @@ entities:
             1873: 69,-23
             1874: 69,-22
             1875: 69,-21
-            3064: -30,-46
+            3060: -30,-46
+            6851: -20,-21
+            6853: -22,-21
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineN
@@ -8763,15 +8771,15 @@ entities:
             1177: -14,31
             1178: -13,31
             1179: -12,31
-            3063: -30,-45
-            6114: -35,3
-            6173: 36,-24
+            3059: -30,-45
+            6110: -35,3
+            6169: 36,-24
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: WoodTrimThinLineN
           decals:
-            3020: 80,-25
+            3016: 80,-25
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineS
@@ -8855,12 +8863,14 @@ entities:
             1724: 58,19
             1725: 59,19
             1726: 60,19
-            3065: -31,-45
-            3068: 65,-52
-            3069: 66,-52
-            3070: 67,-52
-            6172: 36,-24
-            6192: -38,-17
+            3061: -31,-45
+            3064: 65,-52
+            3065: 66,-52
+            3066: 67,-52
+            6168: 36,-24
+            6188: -38,-17
+            6855: -21,-20
+            6856: -19,-20
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineW
@@ -8910,41 +8920,43 @@ entities:
             1091: -59,-27
             1092: -59,-26
             1744: 58,19
-            2263: -27,-16
-            2264: -27,-15
-            2265: -27,-14
-            2266: -27,-13
-            3066: -31,-44
+            2259: -27,-16
+            2260: -27,-15
+            2261: -27,-14
+            2262: -27,-13
+            3062: -31,-44
+            6852: -20,-21
+            6854: -18,-21
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowa1
           decals:
-            6130: 80.134224,-34.739353
+            6126: 80.134224,-34.739353
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowa2
           decals:
-            6131: 81.98104,-35.791183
+            6127: 81.98104,-35.791183
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowa3
           decals:
-            6132: 80.43999,-36.158104
+            6128: 80.43999,-36.158104
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowb1
           decals:
-            6133: 83.2041,-35.583263
+            6129: 83.2041,-35.583263
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowb3
           decals:
-            6134: 83.020645,-36.060257
+            6130: 83.020645,-36.060257
         - node:
             color: '#FFFFFFFF'
             id: e
@@ -8955,113 +8967,113 @@ entities:
             color: '#FFFFFFFF'
             id: grasssnow01
           decals:
-            6147: 83.460945,-36.10918
-            6148: 80.01192,-34.201206
+            6143: 83.460945,-36.10918
+            6144: 80.01192,-34.201206
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow03
           decals:
-            6144: 81.7242,-35.840107
+            6140: 81.7242,-35.840107
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow05
           decals:
-            6149: 81.07172,-34.84943
+            6145: 81.07172,-34.84943
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow06
           decals:
-            6153: 80.39903,-34.335743
+            6149: 80.39903,-34.335743
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow07
           decals:
-            6142: 80.04861,-36.219257
+            6138: 80.04861,-36.219257
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow08
           decals:
-            6143: 80.8436,-35.974644
+            6139: 80.8436,-35.974644
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow09
           decals:
-            6145: 82.201195,-35.974644
-            6152: 81.98901,-35.155193
+            6141: 82.201195,-35.974644
+            6148: 81.98901,-35.155193
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow10
           decals:
-            6140: 80.02415,-34.922813
+            6136: 80.02415,-34.922813
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow11
           decals:
-            6141: 80.42776,-35.546574
-            6146: 83.24079,-35.7178
+            6137: 80.42776,-35.546574
+            6142: 83.24079,-35.7178
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow12
           decals:
-            6150: 82.99192,-34.910583
+            6146: 82.99192,-34.910583
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow13
           decals:
-            6151: 82.56385,-34.88612
+            6147: 82.56385,-34.88612
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowa1
           decals:
-            6137: 82.82495,-35.571033
+            6133: 82.82495,-35.571033
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowa2
           decals:
-            6156: 83.059845,-34.91084
+            6152: 83.059845,-34.91084
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowa3
           decals:
-            6135: 79.9263,-35.46096
+            6131: 79.9263,-35.46096
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowb2
           decals:
-            6136: 81.369514,-35.70557
-            6154: 80.8828,-34.87415
+            6132: 81.369514,-35.70557
+            6150: 80.8828,-34.87415
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowb3
           decals:
-            6155: 79.87989,-33.993546
+            6151: 79.87989,-33.993546
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowc2
           decals:
-            6139: 79.79176,-36.060257
+            6135: 79.79176,-36.060257
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowc3
           decals:
-            6138: 81.10044,-36.13364
+            6134: 81.10044,-36.13364
         - node:
             color: '#FFFFFFFF'
             id: h
@@ -9071,9 +9083,9 @@ entities:
             color: '#FFFF0066'
             id: shop
           decals:
-            3057: 50.31763,23.128677
-            3058: 51.239506,23.738052
-            3059: 52.00513,23.034927
+            3053: 50.31763,23.128677
+            3054: 51.239506,23.738052
+            3055: 52.00513,23.034927
         - node:
             color: '#FFFFFFFF'
             id: w
@@ -9980,7 +9992,7 @@ entities:
           7,3:
             0: 65535
           5,6:
-            0: 52431
+            0: 34959
           6,4:
             0: 65535
           6,5:
@@ -10030,7 +10042,7 @@ entities:
           8,5:
             0: 65535
           8,6:
-            0: 4383
+            0: 15
           9,4:
             0: 65535
           9,5:
@@ -10085,12 +10097,10 @@ entities:
             0: 65535
           -15,-12:
             0: 52428
-          -15,-11:
-            0: 8
           -14,-12:
             0: 65535
           -14,-11:
-            0: 36863
+            0: 35071
           -14,-10:
             0: 65423
           -13,-12:
@@ -10477,7 +10487,7 @@ entities:
           1,-13:
             0: 61937
           -11,6:
-            0: 35838
+            0: 35070
             3: 1
           -11,7:
             0: 34952
@@ -10504,7 +10514,7 @@ entities:
           -1,-12:
             0: 65520
           -7,-12:
-            0: 65523
+            0: 65521
           -6,-12:
             0: 65535
           -5,-12:
@@ -10651,7 +10661,7 @@ entities:
           2,10:
             0: 65535
           11,5:
-            0: 24575
+            0: 8191
           16,-10:
             0: 4369
           17,-10:
@@ -10695,9 +10705,7 @@ entities:
           9,6:
             0: 3
           11,6:
-            0: 22015
-          11,7:
-            0: 21
+            0: 15
           -16,-18:
             0: 57344
           -15,-18:
@@ -10733,7 +10741,7 @@ entities:
           -8,-13:
             0: 61440
           -7,-13:
-            0: 28672
+            0: 12288
           8,-15:
             0: 3840
           8,-14:
@@ -10806,10 +10814,10 @@ entities:
           4,10:
             0: 13107
           -12,5:
-            0: 28360
+            0: 19656
             3: 32768
           -12,6:
-            0: 2254
+            0: 140
           -3,-12:
             0: 34952
           1,-15:
@@ -11135,8 +11143,6 @@ entities:
       - 493
       - 492
       - 491
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8353
     components:
     - type: Transform
@@ -11160,8 +11166,6 @@ entities:
       - 19300
       - 19302
       - 19303
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8367
     components:
     - type: Transform
@@ -11185,8 +11189,6 @@ entities:
       - 18331
       - 18336
       - 18356
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8368
     components:
     - type: Transform
@@ -11199,8 +11201,6 @@ entities:
       - 8756
       - 18389
       - 18375
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8369
     components:
     - type: Transform
@@ -11215,8 +11215,6 @@ entities:
       - 8749
       - 8750
       - 8751
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8370
     components:
     - type: Transform
@@ -11236,16 +11234,12 @@ entities:
       - 18308
       - 18321
       - 18330
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8371
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 58.5,1.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8372
     components:
     - type: Transform
@@ -11259,8 +11253,6 @@ entities:
       - 18514
       - 18512
       - 18513
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8373
     components:
     - type: Transform
@@ -11274,8 +11266,6 @@ entities:
       - 18475
       - 18474
       - 18472
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8374
     components:
     - type: Transform
@@ -11293,8 +11283,6 @@ entities:
       - 18441
       - 18440
       - 18439
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8375
     components:
     - type: Transform
@@ -11309,8 +11297,6 @@ entities:
       - 18496
       - 18498
       - 18497
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8376
     components:
     - type: Transform
@@ -11325,8 +11311,6 @@ entities:
       - 19951
       - 19922
       - 19923
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8377
     components:
     - type: Transform
@@ -11348,8 +11332,6 @@ entities:
       - 19910
       - 19911
       - 19912
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8378
     components:
     - type: Transform
@@ -11366,8 +11348,6 @@ entities:
       - 19900
       - 16937
       - 16936
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8379
     components:
     - type: Transform
@@ -11383,8 +11363,6 @@ entities:
       - 19909
       - 19907
       - 19908
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8380
     components:
     - type: Transform
@@ -11398,8 +11376,6 @@ entities:
       - 19964
       - 19963
       - 19962
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8381
     components:
     - type: Transform
@@ -11412,8 +11388,6 @@ entities:
       - 8732
       - 8711
       - 20219
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8382
     components:
     - type: Transform
@@ -11428,8 +11402,6 @@ entities:
       - 19969
       - 19953
       - 19952
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8383
     components:
     - type: Transform
@@ -11450,16 +11422,12 @@ entities:
       - 19842
       - 19841
       - 19840
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8384
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8385
     components:
     - type: Transform
@@ -11473,8 +11441,6 @@ entities:
       - 19790
       - 19774
       - 19789
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8386
     components:
     - type: Transform
@@ -11487,8 +11453,6 @@ entities:
       - 19762
       - 19760
       - 19761
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8387
     components:
     - type: Transform
@@ -11504,8 +11468,6 @@ entities:
       - 8705
       - 17363
       - 19795
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8388
     components:
     - type: Transform
@@ -11528,8 +11490,6 @@ entities:
       - 19672
       - 19673
       - 19674
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8389
     components:
     - type: Transform
@@ -11552,8 +11512,6 @@ entities:
       - 19672
       - 19673
       - 19674
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8390
     components:
     - type: Transform
@@ -11572,8 +11530,6 @@ entities:
       - 18221
       - 18219
       - 18220
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8391
     components:
     - type: Transform
@@ -11592,8 +11548,6 @@ entities:
       - 19734
       - 19728
       - 19730
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8392
     components:
     - type: Transform
@@ -11610,8 +11564,6 @@ entities:
       - 8696
       - 19731
       - 19729
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8393
     components:
     - type: Transform
@@ -11632,8 +11584,6 @@ entities:
       - 18218
       - 18217
       - 18216
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8394
     components:
     - type: Transform
@@ -11651,8 +11601,6 @@ entities:
       - 18305
       - 18307
       - 18306
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8395
     components:
     - type: Transform
@@ -11671,8 +11619,6 @@ entities:
       - 18302
       - 18303
       - 18304
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8396
     components:
     - type: Transform
@@ -11692,8 +11638,6 @@ entities:
       - 18298
       - 18299
       - 18300
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8397
     components:
     - type: Transform
@@ -11706,8 +11650,6 @@ entities:
       - 19641
       - 19640
       - 19639
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8398
     components:
     - type: Transform
@@ -11724,8 +11666,6 @@ entities:
       - 19510
       - 19508
       - 19507
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8399
     components:
     - type: Transform
@@ -11741,8 +11681,6 @@ entities:
       - 19543
       - 19520
       - 19519
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8400
     components:
     - type: Transform
@@ -11759,8 +11697,6 @@ entities:
       - 19542
       - 19521
       - 19522
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8401
     components:
     - type: Transform
@@ -11778,8 +11714,6 @@ entities:
       - 19582
       - 19569
       - 19570
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8402
     components:
     - type: Transform
@@ -11793,8 +11727,6 @@ entities:
       - 19568
       - 19567
       - 19566
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8403
     components:
     - type: Transform
@@ -11808,8 +11740,6 @@ entities:
       - 19589
       - 19588
       - 19587
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8404
     components:
     - type: Transform
@@ -11828,8 +11758,6 @@ entities:
       - 19474
       - 19470
       - 19469
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8405
     components:
     - type: Transform
@@ -11837,22 +11765,18 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8773
-      - 8771
-      - 8772
-      - 19035
       - 19034
       - 19033
-    - type: AtmosDevice
-      joinedGrid: 2
+      - 8773
+      - 8772
+      - 8771
+      - 21559
   - uid: 8406
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -16.5,-15.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8407
     components:
     - type: Transform
@@ -11865,8 +11789,6 @@ entities:
       - 19071
       - 19069
       - 19070
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8408
     components:
     - type: Transform
@@ -11884,8 +11806,6 @@ entities:
       - 18914
       - 18912
       - 18913
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8409
     components:
     - type: Transform
@@ -11899,8 +11819,6 @@ entities:
       - 18941
       - 18936
       - 7082
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8410
     components:
     - type: Transform
@@ -11918,8 +11836,6 @@ entities:
       - 18871
       - 18870
       - 18869
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8411
     components:
     - type: Transform
@@ -11935,8 +11851,6 @@ entities:
       - 18868
       - 18867
       - 18866
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8412
     components:
     - type: Transform
@@ -11975,8 +11889,6 @@ entities:
       - 18270
       - 18268
       - 18258
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8413
     components:
     - type: Transform
@@ -12014,8 +11926,6 @@ entities:
       - 18270
       - 18268
       - 18258
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8414
     components:
     - type: Transform
@@ -12036,8 +11946,6 @@ entities:
       - 19367
       - 19131
       - 19136
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8415
     components:
     - type: Transform
@@ -12059,8 +11967,6 @@ entities:
       - 19367
       - 19131
       - 19136
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8416
     components:
     - type: Transform
@@ -12079,8 +11985,6 @@ entities:
       - 19167
       - 19171
       - 20195
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8417
     components:
     - type: Transform
@@ -12107,8 +12011,6 @@ entities:
       - 19334
       - 19103
       - 19346
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8418
     components:
     - type: Transform
@@ -12128,8 +12030,6 @@ entities:
       - 19306
       - 19085
       - 18121
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8419
     components:
     - type: Transform
@@ -12153,8 +12053,6 @@ entities:
       - 19300
       - 19302
       - 19303
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8421
     components:
     - type: Transform
@@ -12169,8 +12067,6 @@ entities:
       - 20177
       - 20169
       - 20167
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8422
     components:
     - type: Transform
@@ -12185,8 +12081,6 @@ entities:
       - 20178
       - 20164
       - 20168
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8423
     components:
     - type: Transform
@@ -12205,8 +12099,6 @@ entities:
       - 19079
       - 19084
       - 13923
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8424
     components:
     - type: Transform
@@ -12222,8 +12114,6 @@ entities:
       - 19427
       - 19425
       - 19426
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8425
     components:
     - type: Transform
@@ -12236,16 +12126,12 @@ entities:
       - 19460
       - 19308
       - 18975
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8426
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -9.5,-38.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8427
     components:
     - type: Transform
@@ -12259,8 +12145,6 @@ entities:
       - 19631
       - 19630
       - 19622
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8428
     components:
     - type: Transform
@@ -12277,8 +12161,6 @@ entities:
       - 19632
       - 19607
       - 19608
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8429
     components:
     - type: Transform
@@ -12289,19 +12171,6 @@ entities:
       devices:
       - 20249
       - 14942
-    - type: AtmosDevice
-      joinedGrid: 2
-  - uid: 8430
-    components:
-    - type: Transform
-      pos: 9.5,-43.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 20250
-      - 14941
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8431
     components:
     - type: Transform
@@ -12315,8 +12184,6 @@ entities:
       - 20042
       - 20041
       - 20040
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8432
     components:
     - type: Transform
@@ -12333,8 +12200,6 @@ entities:
       - 20039
       - 20037
       - 20038
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8433
     components:
     - type: Transform
@@ -12350,16 +12215,12 @@ entities:
       - 20087
       - 9078
       - 9034
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8434
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 30.5,-42.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8435
     components:
     - type: Transform
@@ -12372,8 +12233,6 @@ entities:
       - 19752
       - 19751
       - 19748
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8436
     components:
     - type: Transform
@@ -12385,8 +12244,6 @@ entities:
       - 19829
       - 19820
       - 19828
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8438
     components:
     - type: Transform
@@ -12399,8 +12256,6 @@ entities:
       - 18388
       - 18374
       - 18373
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8439
     components:
     - type: Transform
@@ -12413,8 +12268,6 @@ entities:
       - 18428
       - 18427
       - 18426
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8440
     components:
     - type: Transform
@@ -12433,8 +12286,6 @@ entities:
       - 18235
       - 18232
       - 18234
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8441
     components:
     - type: Transform
@@ -12455,8 +12306,6 @@ entities:
       - 18226
       - 18229
       - 18230
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8442
     components:
     - type: Transform
@@ -12469,8 +12318,6 @@ entities:
       - 18532
       - 18530
       - 18531
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8443
     components:
     - type: Transform
@@ -12483,8 +12330,6 @@ entities:
       - 18516
       - 18233
       - 18515
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8444
     components:
     - type: Transform
@@ -12502,8 +12347,6 @@ entities:
       - 17875
       - 17867
       - 18236
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8445
     components:
     - type: Transform
@@ -12524,8 +12367,6 @@ entities:
       - 18237
       - 18239
       - 18238
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8446
     components:
     - type: Transform
@@ -12541,8 +12382,6 @@ entities:
       - 18535
       - 18533
       - 18534
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8447
     components:
     - type: Transform
@@ -12555,8 +12394,6 @@ entities:
       - 18616
       - 18614
       - 18615
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8448
     components:
     - type: Transform
@@ -12570,8 +12407,6 @@ entities:
       - 18606
       - 18603
       - 18604
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8449
     components:
     - type: Transform
@@ -12584,8 +12419,6 @@ entities:
       - 18629
       - 18627
       - 18628
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8450
     components:
     - type: Transform
@@ -12601,8 +12434,6 @@ entities:
       - 18580
       - 18579
       - 18577
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8451
     components:
     - type: Transform
@@ -12622,8 +12453,6 @@ entities:
       - 18564
       - 18554
       - 18553
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8452
     components:
     - type: Transform
@@ -12642,8 +12471,6 @@ entities:
       - 18243
       - 18244
       - 18245
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8453
     components:
     - type: Transform
@@ -12658,8 +12485,6 @@ entities:
       - 18632
       - 18630
       - 18631
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8454
     components:
     - type: Transform
@@ -12677,8 +12502,6 @@ entities:
       - 18240
       - 18242
       - 18241
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8455
     components:
     - type: Transform
@@ -12698,8 +12521,6 @@ entities:
       - 5306
       - 18247
       - 18248
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8456
     components:
     - type: Transform
@@ -12715,8 +12536,6 @@ entities:
       - 18707
       - 18703
       - 18705
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8457
     components:
     - type: Transform
@@ -12731,8 +12550,6 @@ entities:
       - 8575
       - 18811
       - 18812
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8458
     components:
     - type: Transform
@@ -12755,8 +12572,6 @@ entities:
       - 18681
       - 18679
       - 18678
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8459
     components:
     - type: Transform
@@ -12770,8 +12585,6 @@ entities:
       - 18774
       - 18773
       - 18764
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8460
     components:
     - type: Transform
@@ -12784,8 +12597,6 @@ entities:
       - 18756
       - 18753
       - 18755
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8461
     components:
     - type: Transform
@@ -12798,8 +12609,6 @@ entities:
       - 18684
       - 18683
       - 18682
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8462
     components:
     - type: Transform
@@ -12816,8 +12625,6 @@ entities:
       - 18743
       - 18741
       - 18742
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8463
     components:
     - type: Transform
@@ -12834,16 +12641,12 @@ entities:
       - 18249
       - 18251
       - 18250
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8464
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -27.5,18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8465
     components:
     - type: Transform
@@ -12858,8 +12661,6 @@ entities:
       - 19017
       - 19013
       - 19012
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8466
     components:
     - type: Transform
@@ -12873,8 +12674,6 @@ entities:
       - 19018
       - 18998
       - 19000
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8467
     components:
     - type: Transform
@@ -12888,8 +12687,6 @@ entities:
       - 19032
       - 19031
       - 19030
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8468
     components:
     - type: Transform
@@ -12907,8 +12704,6 @@ entities:
       - 19317
       - 18126
       - 19092
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8469
     components:
     - type: Transform
@@ -12921,8 +12716,6 @@ entities:
       - 20181
       - 19314
       - 19077
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8470
     components:
     - type: Transform
@@ -12939,8 +12732,6 @@ entities:
       - 19370
       - 19369
       - 19368
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8471
     components:
     - type: Transform
@@ -12953,8 +12744,6 @@ entities:
       - 19420
       - 19410
       - 19409
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8472
     components:
     - type: Transform
@@ -12969,8 +12758,6 @@ entities:
       - 20004
       - 19999
       - 19998
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8473
     components:
     - type: Transform
@@ -12983,8 +12770,6 @@ entities:
       - 19973
       - 19971
       - 19970
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8474
     components:
     - type: Transform
@@ -12994,8 +12779,6 @@ entities:
     - type: DeviceList
       devices:
       - 20248
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8475
     components:
     - type: Transform
@@ -13012,8 +12795,6 @@ entities:
       - 19581
       - 19575
       - 19580
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8476
     components:
     - type: Transform
@@ -13032,8 +12813,6 @@ entities:
       - 19514
       - 17793
       - 17792
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8477
     components:
     - type: Transform
@@ -13049,8 +12828,6 @@ entities:
       - 19642
       - 17708
       - 17707
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8478
     components:
     - type: Transform
@@ -13067,8 +12844,6 @@ entities:
       - 19351
       - 18127
       - 19109
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8479
     components:
     - type: Transform
@@ -13080,8 +12855,6 @@ entities:
       - 19352
       - 19307
       - 18128
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8892
     components:
     - type: Transform
@@ -13094,8 +12867,6 @@ entities:
       - 8781
       - 18972
       - 18983
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 11469
     components:
     - type: Transform
@@ -13109,8 +12880,6 @@ entities:
       - 8693
       - 19778
       - 19775
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17617
     components:
     - type: Transform
@@ -13123,8 +12892,6 @@ entities:
       - 18831
       - 18770
       - 18830
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17618
     components:
     - type: Transform
@@ -13138,8 +12905,7 @@ entities:
       - 18850
       - 18858
       - 18859
-    - type: AtmosDevice
-      joinedGrid: 2
+      - 7358
   - uid: 17629
     components:
     - type: Transform
@@ -13166,8 +12932,6 @@ entities:
       - 18944
       - 492
       - 491
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17630
     components:
     - type: Transform
@@ -13181,8 +12945,6 @@ entities:
       - 19058
       - 19056
       - 19057
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17653
     components:
     - type: Transform
@@ -13208,8 +12970,6 @@ entities:
       - 18289
       - 18290
       - 18291
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17655
     components:
     - type: Transform
@@ -13232,8 +12992,6 @@ entities:
       - 8789
       - 18287
       - 18286
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17660
     components:
     - type: Transform
@@ -13258,8 +13016,6 @@ entities:
       - 18252
       - 18254
       - 18253
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17661
     components:
     - type: Transform
@@ -13277,16 +13033,12 @@ entities:
       - 18871
       - 18870
       - 18869
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17668
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 18.5,3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17670
     components:
     - type: Transform
@@ -13307,8 +13059,6 @@ entities:
       - 18225
       - 18228
       - 18227
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17671
     components:
     - type: Transform
@@ -13334,8 +13084,6 @@ entities:
       - 18224
       - 17810
       - 17800
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17679
     components:
     - type: Transform
@@ -13357,8 +13105,6 @@ entities:
       - 18295
       - 18297
       - 18296
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17681
     components:
     - type: Transform
@@ -13381,8 +13127,6 @@ entities:
       - 18292
       - 18294
       - 18293
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 18581
     components:
     - type: Transform
@@ -13397,8 +13141,6 @@ entities:
       - 18605
       - 18591
       - 18590
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 19606
     components:
     - type: Transform
@@ -13411,8 +13153,6 @@ entities:
       - 17576
       - 19602
       - 19603
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20220
     components:
     - type: Transform
@@ -13430,8 +13170,6 @@ entities:
       - 8726
       - 19884
       - 19885
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20222
     components:
     - type: Transform
@@ -13449,8 +13187,6 @@ entities:
       - 17501
       - 18642
       - 18643
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20225
     components:
     - type: Transform
@@ -13464,8 +13200,6 @@ entities:
       - 18727
       - 18744
       - 18725
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20240
     components:
     - type: Transform
@@ -13478,8 +13212,6 @@ entities:
       - 8779
       - 18971
       - 19001
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20242
     components:
     - type: Transform
@@ -13499,8 +13231,6 @@ entities:
       - 18282
       - 18284
       - 18283
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20243
     components:
     - type: Transform
@@ -13516,8 +13246,6 @@ entities:
       - 19483
       - 19481
       - 19482
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20246
     components:
     - type: Transform
@@ -13532,8 +13260,6 @@ entities:
       - 19509
       - 19498
       - 19484
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 21113
     components:
     - type: Transform
@@ -13546,8 +13272,6 @@ entities:
       - 21114
       - 21102
       - 21101
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: AirCanister
   entities:
   - uid: 4
@@ -13555,120 +13279,86 @@ entities:
     - type: Transform
       pos: -5.5,-13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14680
     components:
     - type: Transform
       pos: 79.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14698
     components:
     - type: Transform
       pos: -4.5,38.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14699
     components:
     - type: Transform
       pos: -40.5,17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14705
     components:
     - type: Transform
       pos: -63.5,-31.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14710
     components:
     - type: Transform
       pos: -36.5,-41.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14711
     components:
     - type: Transform
       pos: -9.5,-33.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14714
     components:
     - type: Transform
       pos: 45.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14727
     components:
     - type: Transform
       pos: 55.5,17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14731
     components:
     - type: Transform
       pos: 39.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14788
     components:
     - type: Transform
       pos: -29.5,-43.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14855
     components:
     - type: Transform
       pos: -10.5,17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14856
     components:
     - type: Transform
       pos: 1.5,16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14861
     components:
     - type: Transform
       pos: 15.5,1.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 15857
     components:
     - type: Transform
       pos: 68.5,4.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 16066
     components:
     - type: Transform
       pos: 67.5,20.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 21243
     components:
     - type: Transform
       pos: 2.5,-7.5
       parent: 21128
-    - type: AtmosDevice
-      joinedGrid: 21128
 - proto: Airlock
   entities:
   - uid: 6
@@ -13928,18 +13618,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 30.5,-29.5
       parent: 2
-  - uid: 7632
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 29.5,-40.5
-      parent: 2
-  - uid: 7633
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 28.5,-40.5
-      parent: 2
   - uid: 7952
     components:
     - type: Transform
@@ -13968,6 +13646,16 @@ entities:
     - type: Transform
       pos: 48.5,-22.5
       parent: 2
+  - uid: 512
+    components:
+    - type: Transform
+      pos: 28.5,-40.5
+      parent: 2
+  - uid: 645
+    components:
+    - type: Transform
+      pos: 29.5,-40.5
+      parent: 2
   - uid: 4309
     components:
     - type: MetaData
@@ -14049,16 +13737,20 @@ entities:
     - type: Transform
       pos: 7.5,-25.5
       parent: 2
+  - uid: 848
+    components:
+    - type: Transform
+      pos: -30.5,36.5
+      parent: 2
   - uid: 7999
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,-35.5
       parent: 2
-  - uid: 15081
+  - uid: 8170
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: -30.5,37.5
       parent: 2
 - proto: AirlockEngineeringLocked
@@ -14326,6 +14018,21 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -54.5,-58.5
       parent: 2
+  - uid: 15198
+    components:
+    - type: Transform
+      pos: 71.5,5.5
+      parent: 2
+  - uid: 15206
+    components:
+    - type: Transform
+      pos: 71.5,1.5
+      parent: 2
+  - uid: 15214
+    components:
+    - type: Transform
+      pos: 71.5,-2.5
+      parent: 2
   - uid: 17259
     components:
     - type: Transform
@@ -14404,23 +14111,6 @@ entities:
     - type: Transform
       pos: 26.5,24.5
       parent: 2
-- proto: AirlockExternalGlassEasyPry
-  entities:
-  - uid: 15198
-    components:
-    - type: Transform
-      pos: 71.5,5.5
-      parent: 2
-  - uid: 15206
-    components:
-    - type: Transform
-      pos: 71.5,1.5
-      parent: 2
-  - uid: 15214
-    components:
-    - type: Transform
-      pos: 71.5,-2.5
-      parent: 2
 - proto: AirlockExternalGlassEngineeringLocked
   entities:
   - uid: 44
@@ -14710,9 +14400,10 @@ entities:
     - type: Transform
       pos: -22.5,-17.5
       parent: 2
-  - uid: 48
+  - uid: 849
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -22.5,-18.5
       parent: 2
   - uid: 1661
@@ -14737,7 +14428,7 @@ entities:
       pos: -16.5,19.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -34612.758
+      secondsUntilStateChange: -38043.45
       state: Opening
   - uid: 4196
     components:
@@ -16623,12 +16314,6 @@ entities:
     - type: Transform
       pos: -29.5,-20.5
       parent: 2
-  - uid: 19035
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -18.5,-20.5
-      parent: 2
   - uid: 19058
     components:
     - type: Transform
@@ -17007,20 +16692,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 33.5,-10.5
       parent: 2
-      deviceLists:
-      - 8474
   - uid: 20249
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 11.5,-38.5
       parent: 2
-  - uid: 20250
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,-44.5
-      parent: 2
   - uid: 21115
     components:
     - type: Transform
@@ -17031,6 +16708,16 @@ entities:
       deviceLists:
       - 21112
       - 21113
+  - uid: 21559
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -18.5,-19.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17633
+      - 8405
 - proto: AltarHeaven
   entities:
   - uid: 16557
@@ -17571,10 +17258,10 @@ entities:
       parent: 2
 - proto: ArtifactAnalyzerMachineCircuitboard
   entities:
-  - uid: 17538
+  - uid: 8162
     components:
     - type: Transform
-      pos: 75.60128,-15.434497
+      pos: 75.564476,-15.243714
       parent: 2
 - proto: Ashtray
   entities:
@@ -19387,15 +19074,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 16.5,-12.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20610
     components:
     - type: Transform
       pos: 47.5,16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: Bed
   entities:
   - uid: 132
@@ -20410,6 +20093,15 @@ entities:
     - type: Transform
       pos: 58.383793,26.371101
       parent: 2
+- proto: BoxCleanerGrenades
+  entities:
+  - uid: 2142
+    components:
+    - type: Transform
+      parent: 156
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: BoxFolderBlack
   entities:
   - uid: 176
@@ -20461,6 +20153,11 @@ entities:
     - type: Transform
       pos: 71.50742,-20.366497
       parent: 2
+  - uid: 21556
+    components:
+    - type: Transform
+      pos: 27.520927,-43.577324
+      parent: 2
 - proto: BoxFolderGrey
   entities:
   - uid: 178
@@ -36513,6 +36210,11 @@ entities:
     - type: Transform
       pos: 63.5,-52.5
       parent: 2
+  - uid: 19035
+    components:
+    - type: Transform
+      pos: 8.5,-48.5
+      parent: 2
   - uid: 19623
     components:
     - type: Transform
@@ -37088,6 +36790,11 @@ entities:
     - type: Transform
       pos: 5.5,-1.5
       parent: 21128
+  - uid: 21336
+    components:
+    - type: Transform
+      pos: 8.5,-47.5
+      parent: 2
   - uid: 21413
     components:
     - type: Transform
@@ -37130,11 +36837,6 @@ entities:
     - type: Transform
       pos: 65.445175,-26.40616
       parent: 2
-  - uid: 8194
-    components:
-    - type: Transform
-      pos: 7.540995,-45.37761
-      parent: 2
   - uid: 15196
     components:
     - type: Transform
@@ -37145,6 +36847,11 @@ entities:
     - type: Transform
       pos: 63.52819,-32.40197
       parent: 2
+  - uid: 21596
+    components:
+    - type: Transform
+      pos: 7.51995,-47.496635
+      parent: 2
 - proto: CableHV
   entities:
   - uid: 265
@@ -47356,28 +47063,24 @@ entities:
     - type: Transform
       pos: 20.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 452
     components:
     - type: Transform
       pos: 24.5,-18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: CargoBountyComputerCircuitboard
   entities:
-  - uid: 8169
+  - uid: 21590
     components:
     - type: Transform
-      pos: 7.522449,-46.434998
+      pos: 7.506061,-48.42719
       parent: 2
 - proto: CargoRequestComputerCircuitboard
   entities:
-  - uid: 8170
+  - uid: 21591
     components:
     - type: Transform
-      pos: 7.5346794,-46.239307
+      pos: 7.5130057,-48.2883
       parent: 2
 - proto: Carpet
   entities:
@@ -47485,6 +47188,26 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 90.5,-18.5
       parent: 2
+  - uid: 21566
+    components:
+    - type: Transform
+      pos: -30.5,-36.5
+      parent: 2
+  - uid: 21567
+    components:
+    - type: Transform
+      pos: -31.5,-36.5
+      parent: 2
+  - uid: 21568
+    components:
+    - type: Transform
+      pos: -31.5,-35.5
+      parent: 2
+  - uid: 21569
+    components:
+    - type: Transform
+      pos: -30.5,-35.5
+      parent: 2
 - proto: CarpetBlack
   entities:
   - uid: 453
@@ -48334,11 +48057,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -23.5,-38.5
       parent: 2
-  - uid: 512
-    components:
-    - type: Transform
-      pos: -24.5,-38.5
-      parent: 2
   - uid: 513
     components:
     - type: Transform
@@ -48385,6 +48103,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -21.5,-37.5
       parent: 2
+  - uid: 1899
+    components:
+    - type: Transform
+      pos: -24.5,-38.5
+      parent: 2
   - uid: 16205
     components:
     - type: Transform
@@ -50419,6 +50142,11 @@ entities:
     - type: Transform
       pos: 7.5,-42.5
       parent: 2
+  - uid: 8153
+    components:
+    - type: Transform
+      pos: 8.5,-44.5
+      parent: 2
   - uid: 8165
     components:
     - type: Transform
@@ -56086,102 +55814,6 @@ entities:
     - type: Transform
       pos: -17.5,-22.5
       parent: 2
-  - uid: 848
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -24.5,-35.5
-      parent: 2
-  - uid: 849
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -24.5,-34.5
-      parent: 2
-  - uid: 850
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,-35.5
-      parent: 2
-  - uid: 851
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,-34.5
-      parent: 2
-  - uid: 852
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,-35.5
-      parent: 2
-  - uid: 853
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,-34.5
-      parent: 2
-  - uid: 854
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-35.5
-      parent: 2
-  - uid: 855
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-34.5
-      parent: 2
-  - uid: 856
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-37.5
-      parent: 2
-  - uid: 857
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-38.5
-      parent: 2
-  - uid: 858
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,-37.5
-      parent: 2
-  - uid: 859
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,-38.5
-      parent: 2
-  - uid: 860
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -24.5,-37.5
-      parent: 2
-  - uid: 861
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,-38.5
-      parent: 2
-  - uid: 862
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,-37.5
-      parent: 2
-  - uid: 863
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -24.5,-38.5
-      parent: 2
   - uid: 4570
     components:
     - type: Transform
@@ -56408,6 +56040,14 @@ entities:
     - type: Transform
       pos: 65.5038,-52.411602
       parent: 2
+- proto: ChurchBell
+  entities:
+  - uid: 8169
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -18.5,-37.5
+      parent: 2
 - proto: ChurchOrganInstrument
   entities:
   - uid: 865
@@ -56617,6 +56257,35 @@ entities:
     - type: Transform
       pos: -13.5,-26.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 2142
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: ClosetL3JanitorFilled
   entities:
   - uid: 871
@@ -57627,6 +57296,15 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: ClothingHeadHatOutlawHat
+  entities:
+  - uid: 2143
+    components:
+    - type: Transform
+      parent: 21051
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: ClothingHeadHatRedwizard
   entities:
   - uid: 17261
@@ -57688,13 +57366,6 @@ entities:
     - type: Transform
       pos: 21.504559,-47.81257
       parent: 2
-- proto: ClothingHeadPyjamaSyndicateBlack
-  entities:
-  - uid: 7746
-    components:
-    - type: Transform
-      pos: 27.166506,-46.34371
-      parent: 2
 - proto: ClothingHeadsetMining
   entities:
   - uid: 20877
@@ -57929,6 +57600,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: ClothingOuterWinterCoat
+  entities:
+  - uid: 8193
+    components:
+    - type: Transform
+      pos: 62.677505,-4.2970705
+      parent: 2
 - proto: ClothingOuterWinterMime
   entities:
   - uid: 8690
@@ -58097,15 +57775,6 @@ entities:
       parent: 971
     - type: Physics
       canCollide: False
-- proto: ClothingUniformJumpsuitSyndieFormal
-  entities:
-  - uid: 2094
-    components:
-    - type: Transform
-      parent: 21051
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: Cobweb1
   entities:
   - uid: 911
@@ -58531,10 +58200,10 @@ entities:
       parent: 2
 - proto: CommsComputerCircuitboard
   entities:
-  - uid: 8167
+  - uid: 21593
     components:
     - type: Transform
-      pos: 9.503805,-46.398304
+      pos: 9.526895,-48.406357
       parent: 2
 - proto: ComputerAlert
   entities:
@@ -59181,18 +58850,16 @@ entities:
     - type: Transform
       pos: 39.5,-16.5
       parent: 2
+  - uid: 2146
+    components:
+    - type: Transform
+      pos: -24.5,38.5
+      parent: 2
   - uid: 16770
     components:
     - type: Transform
       pos: 53.5,-38.5
       parent: 2
-- proto: CrateEngineeringCableHV
-  entities:
-  - uid: 15805
-    components:
-    - type: Transform
-      pos: -24.5,38.5
-      parent: 2
 - proto: CrateEngineeringGear
   entities:
   - uid: 936
@@ -59380,10 +59047,10 @@ entities:
       parent: 2
 - proto: CrateTrashCartJani
   entities:
-  - uid: 5885
+  - uid: 21551
     components:
     - type: Transform
-      pos: -15.5,-23.5
+      pos: -15.5,-22.5
       parent: 2
 - proto: CrayonBox
   entities:
@@ -59392,11 +59059,6 @@ entities:
     - type: Transform
       pos: 0.47511625,47.57249
       parent: 2
-  - uid: 21336
-    components:
-    - type: Transform
-      pos: 50.51619,-7.4898477
-      parent: 2
 - proto: CrazyGlue
   entities:
   - uid: 21382
@@ -59416,10 +59078,10 @@ entities:
       parent: 2
 - proto: CrewMonitoringComputerCircuitboard
   entities:
-  - uid: 8193
+  - uid: 21595
     components:
     - type: Transform
-      pos: 9.52095,-45.471
+      pos: 9.499117,-47.517467
       parent: 2
 - proto: CrewMonitoringServer
   entities:
@@ -59458,11 +59120,6 @@ entities:
     - type: Transform
       pos: 65.51561,20.528181
       parent: 2
-  - uid: 17537
-    components:
-    - type: Transform
-      pos: 75.405594,-15.324422
-      parent: 2
 - proto: CrowbarRed
   entities:
   - uid: 21391
@@ -59520,15 +59177,11 @@ entities:
     - type: Transform
       pos: 61.5,-3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7039
     components:
     - type: Transform
       pos: 59.5,-3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: CryoxadoneBeakerSmall
   entities:
   - uid: 7062
@@ -59553,6 +59206,16 @@ entities:
     - type: Transform
       pos: -29.5,27.5
       parent: 2
+  - uid: 8134
+    components:
+    - type: Transform
+      pos: -13.5,6.5
+      parent: 2
+  - uid: 8148
+    components:
+    - type: Transform
+      pos: -13.5,7.5
+      parent: 2
 - proto: CurtainsBlueOpen
   entities:
   - uid: 1546
@@ -59627,6 +59290,16 @@ entities:
     - type: Transform
       pos: -27.5,-8.5
       parent: 2
+  - uid: 8133
+    components:
+    - type: Transform
+      pos: 56.5,27.5
+      parent: 2
+  - uid: 8150
+    components:
+    - type: Transform
+      pos: 62.5,26.5
+      parent: 2
 - proto: d20Dice
   entities:
   - uid: 942
@@ -59634,6 +59307,18 @@ entities:
     - type: Transform
       pos: -17.367237,-13.48901
       parent: 2
+- proto: Dart
+  entities:
+  - uid: 21573
+    components:
+    - type: Transform
+      pos: -36.899765,23.610838
+      parent: 2
+  - uid: 21575
+    components:
+    - type: Transform
+      pos: -36.806015,23.725422
+      parent: 2
 - proto: DawInstrumentMachineCircuitboard
   entities:
   - uid: 21449
@@ -60807,6 +60492,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 28.5,-36.5
       parent: 2
+  - uid: 21574
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,25.5
+      parent: 2
 - proto: DisposalJunction
   entities:
   - uid: 12957
@@ -60913,6 +60604,12 @@ entities:
       parent: 2
 - proto: DisposalJunctionFlipped
   entities:
+  - uid: 3293
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,20.5
+      parent: 2
   - uid: 12947
     components:
     - type: Transform
@@ -61002,6 +60699,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 65.5,-20.5
       parent: 2
+  - uid: 21577
+    components:
+    - type: Transform
+      pos: 14.5,23.5
+      parent: 2
 - proto: DisposalPipe
   entities:
   - uid: 141
@@ -62845,12 +62547,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 13.5,20.5
       parent: 2
-  - uid: 13333
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 14.5,20.5
-      parent: 2
   - uid: 13334
     components:
     - type: Transform
@@ -64381,6 +64077,45 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 32.5,-36.5
       parent: 2
+  - uid: 21578
+    components:
+    - type: Transform
+      pos: 14.5,22.5
+      parent: 2
+  - uid: 21579
+    components:
+    - type: Transform
+      pos: 14.5,21.5
+      parent: 2
+  - uid: 21580
+    components:
+    - type: Transform
+      pos: 14.5,24.5
+      parent: 2
+  - uid: 21581
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,25.5
+      parent: 2
+  - uid: 21582
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,25.5
+      parent: 2
+  - uid: 21583
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,23.5
+      parent: 2
+  - uid: 21584
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,23.5
+      parent: 2
 - proto: DisposalTrunk
   entities:
   - uid: 2313
@@ -64617,6 +64352,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -35.5,-64.5
       parent: 2
+  - uid: 21585
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,23.5
+      parent: 2
+  - uid: 21586
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,25.5
+      parent: 2
 - proto: DisposalUnit
   entities:
   - uid: 950
@@ -65024,11 +64771,6 @@ entities:
     - type: Transform
       pos: -28.5,-8.5
       parent: 2
-  - uid: 7416
-    components:
-    - type: Transform
-      pos: 70.5,-23.5
-      parent: 2
   - uid: 9167
     components:
     - type: Transform
@@ -65070,6 +64812,13 @@ entities:
     - type: Transform
       pos: 36.5,12.5
       parent: 2
+- proto: DresserResearchDirectorFilled
+  entities:
+  - uid: 5885
+    components:
+    - type: Transform
+      pos: 70.5,-23.5
+      parent: 2
 - proto: DrinkBottleOfNothingFull
   entities:
   - uid: 2176
@@ -65105,6 +64854,13 @@ entities:
     - type: Transform
       pos: -35.492134,-15.289576
       parent: 2
+- proto: DrinkHotCoco
+  entities:
+  - uid: 8168
+    components:
+    - type: Transform
+      pos: 62.326893,-4.4846063
+      parent: 2
 - proto: DrinkHotCoffee
   entities:
   - uid: 21396
@@ -65288,6 +65044,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 60.5,2.5
       parent: 2
+  - uid: 15080
+    components:
+    - type: Transform
+      pos: 7.5,-46.5
+      parent: 2
   - uid: 17356
     components:
     - type: Transform
@@ -65717,11 +65478,6 @@ entities:
     - type: Transform
       pos: 15.5,-46.5
       parent: 2
-  - uid: 17434
-    components:
-    - type: Transform
-      pos: 7.5,-44.5
-      parent: 2
   - uid: 17435
     components:
     - type: Transform
@@ -66263,6 +66019,13 @@ entities:
     - type: Transform
       pos: 3.5,44.5
       parent: 2
+- proto: FancyTableSpawner
+  entities:
+  - uid: 15081
+    components:
+    - type: Transform
+      pos: -15.5,-3.5
+      parent: 2
 - proto: FaxMachineBase
   entities:
   - uid: 997
@@ -66473,8 +66236,6 @@ entities:
       - 20123
       - 8665
       - 14946
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 9188
     components:
     - type: Transform
@@ -66486,8 +66247,7 @@ entities:
       - 16365
       - 16366
       - 18850
-    - type: AtmosDevice
-      joinedGrid: 2
+      - 7358
   - uid: 11468
     components:
     - type: Transform
@@ -66499,8 +66259,6 @@ entities:
       - 19779
       - 8692
       - 8693
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17547
     components:
     - type: Transform
@@ -66519,8 +66277,6 @@ entities:
       - 8535
       - 8534
       - 18225
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17548
     components:
     - type: Transform
@@ -66539,8 +66295,6 @@ entities:
       - 4324
       - 4323
       - 18226
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17549
     components:
     - type: Transform
@@ -66558,8 +66312,6 @@ entities:
       - 8750
       - 8749
       - 18308
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17550
     components:
     - type: Transform
@@ -66573,8 +66325,6 @@ entities:
       - 8749
       - 8750
       - 8751
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17551
     components:
     - type: Transform
@@ -66596,8 +66346,6 @@ entities:
       - 6521
       - 6520
       - 18331
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17552
     components:
     - type: Transform
@@ -66608,8 +66356,6 @@ entities:
       - 8757
       - 8758
       - 18428
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17553
     components:
     - type: Transform
@@ -66620,8 +66366,6 @@ entities:
       devices:
       - 8743
       - 18388
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17554
     components:
     - type: Transform
@@ -66634,8 +66378,6 @@ entities:
       - 8741
       - 8742
       - 18358
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17555
     components:
     - type: Transform
@@ -66647,8 +66389,6 @@ entities:
       - 8740
       - 8739
       - 18514
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17556
     components:
     - type: Transform
@@ -66665,8 +66405,6 @@ entities:
       - 6521
       - 6520
       - 18441
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17557
     components:
     - type: Transform
@@ -66679,8 +66417,6 @@ entities:
       - 8734
       - 8735
       - 18496
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17558
     components:
     - type: Transform
@@ -66693,8 +66429,6 @@ entities:
       - 8737
       - 8738
       - 18475
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17559
     components:
     - type: Transform
@@ -66705,8 +66439,6 @@ entities:
       devices:
       - 8755
       - 8756
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17560
     components:
     - type: Transform
@@ -66717,8 +66449,6 @@ entities:
       - 8544
       - 8545
       - 18616
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17561
     components:
     - type: Transform
@@ -66732,8 +66462,6 @@ entities:
       - 8547
       - 8546
       - 18535
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17562
     components:
     - type: Transform
@@ -66746,8 +66474,6 @@ entities:
       - 5606
       - 5607
       - 18605
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17563
     components:
     - type: Transform
@@ -66765,8 +66491,6 @@ entities:
       - 7175
       - 7365
       - 18564
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17564
     components:
     - type: Transform
@@ -66780,8 +66504,6 @@ entities:
       - 8549
       - 8555
       - 18580
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17565
     components:
     - type: Transform
@@ -66792,8 +66514,6 @@ entities:
       devices:
       - 8556
       - 18629
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17566
     components:
     - type: Transform
@@ -66806,8 +66526,6 @@ entities:
       - 8543
       - 8542
       - 18606
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17567
     components:
     - type: Transform
@@ -66822,8 +66540,6 @@ entities:
       - 18707
       - 18705
       - 18703
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17568
     components:
     - type: Transform
@@ -66836,8 +66552,6 @@ entities:
       - 8574
       - 18813
       - 8575
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17569
     components:
     - type: Transform
@@ -66858,8 +66572,6 @@ entities:
       - 8565
       - 8566
       - 18681
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17570
     components:
     - type: Transform
@@ -66870,8 +66582,6 @@ entities:
       - 8571
       - 8572
       - 18684
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17571
     components:
     - type: Transform
@@ -66882,8 +66592,6 @@ entities:
       - 8570
       - 8569
       - 18756
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17572
     components:
     - type: Transform
@@ -66895,8 +66603,6 @@ entities:
       - 8568
       - 8567
       - 18774
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17573
     components:
     - type: Transform
@@ -66911,8 +66617,6 @@ entities:
       - 8583
       - 8584
       - 18743
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17574
     components:
     - type: Transform
@@ -66927,8 +66631,6 @@ entities:
       - 1006
       - 17575
       - 19542
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17577
     components:
     - type: Transform
@@ -66943,8 +66645,6 @@ entities:
       - 8643
       - 8642
       - 19543
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17578
     components:
     - type: Transform
@@ -66957,8 +66657,6 @@ entities:
       - 8644
       - 17580
       - 19589
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17581
     components:
     - type: Transform
@@ -66974,8 +66672,6 @@ entities:
       - 8644
       - 8643
       - 19582
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17582
     components:
     - type: Transform
@@ -66987,8 +66683,6 @@ entities:
       - 8646
       - 8647
       - 19568
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17583
     components:
     - type: Transform
@@ -67003,8 +66697,6 @@ entities:
       - 8650
       - 8655
       - 19510
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17584
     components:
     - type: Transform
@@ -67015,8 +66707,6 @@ entities:
       devices:
       - 8653
       - 19641
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17585
     components:
     - type: Transform
@@ -67031,8 +66721,6 @@ entities:
       - 1007
       - 8654
       - 19581
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17586
     components:
     - type: Transform
@@ -67048,8 +66736,6 @@ entities:
       - 1007
       - 8682
       - 19514
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17587
     components:
     - type: Transform
@@ -67061,8 +66747,6 @@ entities:
       - 8692
       - 8686
       - 19790
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17588
     components:
     - type: Transform
@@ -67073,8 +66757,6 @@ entities:
       devices:
       - 8703
       - 19762
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17589
     components:
     - type: Transform
@@ -67085,8 +66767,6 @@ entities:
       - 8703
       - 8702
       - 19752
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17591
     components:
     - type: Transform
@@ -67103,8 +66783,6 @@ entities:
       - 4013
       - 4012
       - 19734
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17592
     components:
     - type: Transform
@@ -67115,8 +66793,6 @@ entities:
       devices:
       - 8681
       - 19973
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17593
     components:
     - type: Transform
@@ -67135,8 +66811,6 @@ entities:
       - 8704
       - 19681
       - 19682
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17594
     components:
     - type: Transform
@@ -67150,8 +66824,6 @@ entities:
       - 8705
       - 17363
       - 19800
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17595
     components:
     - type: Transform
@@ -67161,8 +66833,6 @@ entities:
       devices:
       - 8705
       - 19829
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17597
     components:
     - type: Transform
@@ -67175,8 +66845,6 @@ entities:
       - 8709
       - 8712
       - 19969
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17598
     components:
     - type: Transform
@@ -67196,8 +66864,6 @@ entities:
       - 8708
       - 8709
       - 19910
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17599
     components:
     - type: Transform
@@ -67211,8 +66877,6 @@ entities:
       - 8716
       - 8715
       - 19951
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17600
     components:
     - type: Transform
@@ -67226,8 +66890,6 @@ entities:
       - 8720
       - 8719
       - 19909
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17601
     components:
     - type: Transform
@@ -67242,8 +66904,6 @@ entities:
       - 19902
       - 16937
       - 16936
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17602
     components:
     - type: Transform
@@ -67255,8 +66915,6 @@ entities:
       - 8710
       - 8711
       - 19964
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17603
     components:
     - type: Transform
@@ -67269,8 +66927,6 @@ entities:
       - 8732
       - 8711
       - 20219
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17606
     components:
     - type: Transform
@@ -67282,8 +66938,6 @@ entities:
       - 14935
       - 14934
       - 20042
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17607
     components:
     - type: Transform
@@ -67298,8 +66952,6 @@ entities:
       - 14937
       - 14938
       - 20039
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17608
     components:
     - type: Transform
@@ -67313,8 +66965,6 @@ entities:
       - 14938
       - 14937
       - 20087
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17609
     components:
     - type: Transform
@@ -67328,8 +66978,6 @@ entities:
       - 17610
       - 17611
       - 20036
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17612
     components:
     - type: Transform
@@ -67342,8 +66990,6 @@ entities:
       - 8675
       - 8674
       - 20004
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17613
     components:
     - type: Transform
@@ -67354,8 +67000,6 @@ entities:
       devices:
       - 8536
       - 18532
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17614
     components:
     - type: Transform
@@ -67366,8 +67010,6 @@ entities:
       devices:
       - 8759
       - 18516
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17615
     components:
     - type: Transform
@@ -67379,8 +67021,6 @@ entities:
       - 8561
       - 8562
       - 18632
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17616
     components:
     - type: Transform
@@ -67392,8 +67032,6 @@ entities:
       - 9187
       - 14921
       - 18831
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17619
     components:
     - type: Transform
@@ -67406,8 +67044,6 @@ entities:
       - 8595
       - 8605
       - 18868
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17620
     components:
     - type: Transform
@@ -67418,8 +67054,6 @@ entities:
       - 8606
       - 8605
       - 19420
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17621
     components:
     - type: Transform
@@ -67434,8 +67068,6 @@ entities:
       - 13598
       - 17622
       - 19370
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17623
     components:
     - type: Transform
@@ -67450,8 +67082,6 @@ entities:
       - 8617
       - 8616
       - 19351
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17624
     components:
     - type: Transform
@@ -67462,8 +67092,6 @@ entities:
       devices:
       - 8616
       - 19352
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17625
     components:
     - type: Transform
@@ -67475,8 +67103,6 @@ entities:
       - 8777
       - 8782
       - 19018
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17626
     components:
     - type: Transform
@@ -67489,8 +67115,6 @@ entities:
       - 8775
       - 8783
       - 19017
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17627
     components:
     - type: Transform
@@ -67502,8 +67126,6 @@ entities:
       - 8774
       - 8784
       - 19032
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17628
     components:
     - type: Transform
@@ -67528,8 +67150,6 @@ entities:
       - 492
       - 493
       - 491
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17631
     components:
     - type: Transform
@@ -67541,8 +67161,6 @@ entities:
       - 8769
       - 8773
       - 19058
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17632
     components:
     - type: Transform
@@ -67553,8 +67171,6 @@ entities:
       devices:
       - 8769
       - 19071
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17633
     components:
     - type: Transform
@@ -67563,11 +67179,9 @@ entities:
     - type: DeviceList
       devices:
       - 8773
-      - 8771
       - 8772
-      - 19035
-    - type: AtmosDevice
-      joinedGrid: 2
+      - 8771
+      - 21559
   - uid: 17634
     components:
     - type: Transform
@@ -67584,8 +67198,6 @@ entities:
       - 8636
       - 8635
       - 19474
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17635
     components:
     - type: Transform
@@ -67599,8 +67211,6 @@ entities:
       - 8629
       - 8630
       - 19427
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17636
     components:
     - type: Transform
@@ -67611,8 +67221,6 @@ entities:
       devices:
       - 8629
       - 19460
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17637
     components:
     - type: Transform
@@ -67627,8 +67235,6 @@ entities:
       - 1064
       - 19327
       - 19328
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17638
     components:
     - type: Transform
@@ -67639,8 +67245,6 @@ entities:
       devices:
       - 4493
       - 20181
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17639
     components:
     - type: Transform
@@ -67656,8 +67260,6 @@ entities:
       - 8622
       - 8623
       - 19317
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17640
     components:
     - type: Transform
@@ -67667,8 +67269,6 @@ entities:
     - type: DeviceList
       devices:
       - 8665
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17641
     components:
     - type: Transform
@@ -67680,8 +67280,6 @@ entities:
       - 8664
       - 8667
       - 19631
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17642
     components:
     - type: Transform
@@ -67696,8 +67294,6 @@ entities:
       - 8670
       - 8671
       - 19632
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17643
     components:
     - type: Transform
@@ -67709,8 +67305,6 @@ entities:
       - 2692
       - 18942
       - 7082
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17644
     components:
     - type: Transform
@@ -67727,8 +67321,6 @@ entities:
       - 2692
       - 2690
       - 18914
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17645
     components:
     - type: Transform
@@ -67744,8 +67336,6 @@ entities:
       - 8597
       - 8598
       - 18871
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17646
     components:
     - type: Transform
@@ -67765,8 +67355,6 @@ entities:
       - 3781
       - 3780
       - 19367
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17647
     components:
     - type: Transform
@@ -67783,8 +67371,6 @@ entities:
       - 3787
       - 3789
       - 19167
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17648
     components:
     - type: Transform
@@ -67807,8 +67393,6 @@ entities:
       - 6068
       - 6069
       - 19335
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17649
     components:
     - type: Transform
@@ -67826,8 +67410,6 @@ entities:
       - 6373
       - 6374
       - 19306
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17650
     components:
     - type: Transform
@@ -67846,8 +67428,6 @@ entities:
       - 6363
       - 19304
       - 19305
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17651
     components:
     - type: Transform
@@ -67860,8 +67440,6 @@ entities:
       - 6353
       - 6354
       - 20178
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17652
     components:
     - type: Transform
@@ -67874,8 +67452,6 @@ entities:
       - 6357
       - 6356
       - 20177
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17654
     components:
     - type: Transform
@@ -67899,8 +67475,6 @@ entities:
       - 1057
       - 8785
       - 18289
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17656
     components:
     - type: Transform
@@ -67921,8 +67495,6 @@ entities:
       - 8787
       - 8788
       - 8789
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17658
     components:
     - type: Transform
@@ -67955,8 +67527,6 @@ entities:
       - 18904
       - 18257
       - 18256
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17659
     components:
     - type: Transform
@@ -67979,8 +67549,6 @@ entities:
       - 1062
       - 1061
       - 18252
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17662
     components:
     - type: Transform
@@ -67996,8 +67564,6 @@ entities:
       - 5307
       - 5308
       - 18249
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17663
     components:
     - type: Transform
@@ -68015,8 +67581,6 @@ entities:
       - 5308
       - 5307
       - 5306
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17664
     components:
     - type: Transform
@@ -68033,8 +67597,6 @@ entities:
       - 4338
       - 4339
       - 18243
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17665
     components:
     - type: Transform
@@ -68049,8 +67611,6 @@ entities:
       - 4335
       - 4334
       - 18240
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17666
     components:
     - type: Transform
@@ -68069,8 +67629,6 @@ entities:
       - 4332
       - 4333
       - 18237
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17667
     components:
     - type: Transform
@@ -68087,8 +67645,6 @@ entities:
       - 4328
       - 8760
       - 17875
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17669
     components:
     - type: Transform
@@ -68105,8 +67661,6 @@ entities:
       - 8541
       - 8759
       - 18235
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17672
     components:
     - type: Transform
@@ -68130,8 +67684,6 @@ entities:
       - 8701
       - 8700
       - 18224
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17673
     components:
     - type: Transform
@@ -68150,8 +67702,6 @@ entities:
       - 1038
       - 1039
       - 19842
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17674
     components:
     - type: Transform
@@ -68168,8 +67718,6 @@ entities:
       - 1032
       - 1033
       - 18221
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17675
     components:
     - type: Transform
@@ -68188,8 +67736,6 @@ entities:
       - 1032
       - 1033
       - 18218
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17676
     components:
     - type: Transform
@@ -68205,8 +67751,6 @@ entities:
       - 1021
       - 1020
       - 18305
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17677
     components:
     - type: Transform
@@ -68223,8 +67767,6 @@ entities:
       - 1017
       - 1016
       - 18302
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17678
     components:
     - type: Transform
@@ -68242,8 +67784,6 @@ entities:
       - 1017
       - 1018
       - 18298
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17680
     components:
     - type: Transform
@@ -68263,8 +67803,6 @@ entities:
       - 1027
       - 8663
       - 18295
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 17682
     components:
     - type: Transform
@@ -68286,8 +67824,6 @@ entities:
       - 1054
       - 8666
       - 18292
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 19605
     components:
     - type: Transform
@@ -68298,8 +67834,6 @@ entities:
       devices:
       - 17575
       - 17576
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20218
     components:
     - type: Transform
@@ -68314,8 +67848,6 @@ entities:
       - 4015
       - 8697
       - 8696
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20221
     components:
     - type: Transform
@@ -68331,8 +67863,6 @@ entities:
       - 8724
       - 8725
       - 8726
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20223
     components:
     - type: Transform
@@ -68348,8 +67878,6 @@ entities:
       - 4755
       - 17500
       - 17501
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20224
     components:
     - type: Transform
@@ -68361,8 +67889,6 @@ entities:
       - 8577
       - 8580
       - 18727
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20232
     components:
     - type: Transform
@@ -68373,8 +67899,6 @@ entities:
       devices:
       - 8966
       - 8779
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20234
     components:
     - type: Transform
@@ -68385,8 +67909,6 @@ entities:
       devices:
       - 3206
       - 8781
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20241
     components:
     - type: Transform
@@ -68404,8 +67926,6 @@ entities:
       - 8611
       - 8612
       - 18282
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20244
     components:
     - type: Transform
@@ -68418,8 +67938,6 @@ entities:
       - 8661
       - 8640
       - 19483
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20245
     components:
     - type: Transform
@@ -68433,8 +67951,6 @@ entities:
       - 8654
       - 8653
       - 19509
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20247
     components:
     - type: Transform
@@ -68448,8 +67964,6 @@ entities:
       - 8660
       - 8656
       - 19642
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 21112
     components:
     - type: Transform
@@ -68460,8 +67974,6 @@ entities:
       devices:
       - 21115
       - 21114
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: FireAxeCabinetFilled
   entities:
   - uid: 1003
@@ -68500,6 +68012,11 @@ entities:
     - type: Transform
       pos: 57.5,24.5
       parent: 2
+  - uid: 8130
+    components:
+    - type: Transform
+      pos: 8.5,-45.5
+      parent: 2
   - uid: 8533
     components:
     - type: Transform
@@ -70435,6 +69952,15 @@ entities:
       rot: 3.141592653589793 rad
       pos: 51.5,0.5
       parent: 2
+  - uid: 7358
+    components:
+    - type: Transform
+      pos: -30.5,36.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17618
+      - 9188
   - uid: 7455
     components:
     - type: Transform
@@ -70995,18 +70521,30 @@ entities:
       rot: 3.141592653589793 rad
       pos: -22.5,-18.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17633
+      - 8405
   - uid: 8772
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -22.5,-17.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17633
+      - 8405
   - uid: 8773
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -18.5,-16.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17633
+      - 8405
   - uid: 8791
     components:
     - type: Transform
@@ -72000,8 +71538,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 20.5,-3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasMinerNitrogenStation
   entities:
   - uid: 1094
@@ -72010,8 +71546,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 18.5,-3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasMinerOxygenStation
   entities:
   - uid: 1095
@@ -72020,8 +71554,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 16.5,-3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasMinerWaterVapor
   entities:
   - uid: 1097
@@ -72030,8 +71562,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,-3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasMixer
   entities:
   - uid: 7049
@@ -72040,8 +71570,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 60.5,-6.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasMixerFlipped
   entities:
   - uid: 877
@@ -72049,8 +71577,6 @@ entities:
     - type: Transform
       pos: 47.5,15.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1098
     components:
     - type: Transform
@@ -72060,8 +71586,6 @@ entities:
     - type: GasMixer
       inletTwoConcentration: 0.78
       inletOneConcentration: 0.22
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasOutletInjector
   entities:
   - uid: 1099
@@ -72069,67 +71593,49 @@ entities:
     - type: Transform
       pos: 16.5,-4.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1100
     components:
     - type: Transform
       pos: 18.5,-4.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1101
     components:
     - type: Transform
       pos: 20.5,-4.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1102
     components:
     - type: Transform
       pos: 22.5,-4.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1103
     components:
     - type: Transform
       pos: 24.5,-4.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1104
     components:
     - type: Transform
       pos: 26.5,-4.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 3101
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 34.5,-11.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7381
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 80.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7382
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 80.5,-12.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasPassiveVent
   entities:
   - uid: 1105
@@ -72137,80 +71643,60 @@ entities:
     - type: Transform
       pos: 29.5,-8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1106
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 16.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1107
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 18.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1108
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 20.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1109
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 22.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1110
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 24.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1111
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 26.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1112
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -15.5,13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7383
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 80.5,-18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7384
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 80.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasPipeBend
   entities:
   - uid: 1113
@@ -89347,104 +88833,78 @@ entities:
       rot: 3.141592653589793 rad
       pos: 20.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1199
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 19.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1200
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 18.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1201
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1202
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 23.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1203
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 24.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 5522
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 75.5,-18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 5531
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 75.5,-12.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 5533
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 75.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 5552
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 75.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7051
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 60.5,-7.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7052
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 61.5,-7.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 9103
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,-36.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 9276
@@ -89453,24 +88913,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 45.5,14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 9277
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 47.5,14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20213
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,-37.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 21242
@@ -89479,15 +88933,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,-7.5
       parent: 21128
-    - type: AtmosDevice
-      joinedGrid: 21128
   - uid: 21393
     components:
     - type: Transform
       pos: 16.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasPressurePump
   entities:
   - uid: 1204
@@ -89495,114 +88945,84 @@ entities:
     - type: Transform
       pos: 17.5,-8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1205
     components:
     - type: Transform
       pos: 19.5,-8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1206
     components:
     - type: Transform
       pos: 21.5,-8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1207
     components:
     - type: Transform
       pos: 23.5,-8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1208
     components:
     - type: Transform
       pos: 25.5,-8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1209
     components:
     - type: Transform
       pos: 27.5,-8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1210
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 24.5,-8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1211
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 26.5,-8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1212
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,-8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1213
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 20.5,-8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1214
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 18.5,-8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1215
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 16.5,-8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1216
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 29.5,-11.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1217
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 29.5,-12.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1218
     components:
     - type: Transform
       pos: 17.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1219
@@ -89611,8 +89031,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 21.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7045
@@ -89621,8 +89039,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 58.5,-4.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7048
@@ -89631,48 +89047,36 @@ entities:
       rot: 3.141592653589793 rad
       pos: 60.5,-5.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7377
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 77.5,-12.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7378
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 77.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7379
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 77.5,-18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7380
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 77.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 16908
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 58.5,-3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
 - proto: GasThermoMachineFreezer
@@ -89683,23 +89087,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,-13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1221
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 29.5,-13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7040
     components:
     - type: Transform
       pos: 60.5,-3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasThermoMachineFreezerEnabled
   entities:
   - uid: 1222
@@ -89709,8 +89107,6 @@ entities:
       parent: 2
     - type: GasThermoMachine
       targetTemperature: 270
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasThermoMachineHeater
   entities:
   - uid: 9260
@@ -89719,16 +89115,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 27.5,-13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 9261
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 26.5,-13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasValve
   entities:
   - uid: 1225
@@ -89737,8 +89129,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 28.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasVentPump
   entities:
   - uid: 9034
@@ -89747,8 +89137,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 18.5,-53.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 17707
@@ -89756,8 +89144,6 @@ entities:
     - type: Transform
       pos: 21.5,-22.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 17792
@@ -89766,8 +89152,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 18.5,-15.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 17800
@@ -89776,8 +89160,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 44.5,-19.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18127
@@ -89786,8 +89168,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -50.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18128
@@ -89796,8 +89176,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -45.5,-13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18163
@@ -89806,8 +89184,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -13.5,-38.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18217
@@ -89815,8 +89191,6 @@ entities:
     - type: Transform
       pos: 25.5,-25.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18220
@@ -89824,8 +89198,6 @@ entities:
     - type: Transform
       pos: 35.5,-19.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18227
@@ -89834,8 +89206,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 42.5,-4.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18230
@@ -89844,8 +89214,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 42.5,2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18232
@@ -89854,8 +89222,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 34.5,3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18236
@@ -89864,8 +89230,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 26.5,3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18238
@@ -89874,8 +89238,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,12.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18241
@@ -89884,8 +89246,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,19.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18245
@@ -89894,8 +89254,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,20.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18248
@@ -89904,8 +89262,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,20.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18250
@@ -89914,8 +89270,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -13.5,20.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18254
@@ -89924,8 +89278,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -25.5,19.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18258
@@ -89934,8 +89286,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -25.5,7.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18267
@@ -89944,8 +89294,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -35.5,1.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18270
@@ -89954,8 +89302,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -23.5,-3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18284
@@ -89964,8 +89310,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -23.5,-9.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18286
@@ -89974,8 +89318,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -24.5,-15.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18290
@@ -89984,8 +89326,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -24.5,-29.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18294
@@ -89993,8 +89333,6 @@ entities:
     - type: Transform
       pos: -14.5,-30.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18297
@@ -90002,8 +89340,6 @@ entities:
     - type: Transform
       pos: -1.5,-30.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18300
@@ -90011,8 +89347,6 @@ entities:
     - type: Transform
       pos: 6.5,-30.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18304
@@ -90020,8 +89354,6 @@ entities:
     - type: Transform
       pos: 13.5,-32.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18307
@@ -90030,8 +89362,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,-29.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18321
@@ -90040,8 +89370,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 43.5,8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18335
@@ -90050,8 +89378,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 56.5,3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18336
@@ -90060,8 +89386,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 50.5,10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18374
@@ -90070,8 +89394,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 55.5,6.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18375
@@ -90079,8 +89401,6 @@ entities:
     - type: Transform
       pos: 58.5,16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18416
@@ -90091,8 +89411,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8369
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18426
@@ -90100,8 +89418,6 @@ entities:
     - type: Transform
       pos: 55.5,11.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18439
@@ -90110,8 +89426,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 51.5,-4.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18472
@@ -90120,8 +89434,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 57.5,-5.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18498
@@ -90130,8 +89442,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 51.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18512
@@ -90140,8 +89450,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 60.5,3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18515
@@ -90150,8 +89458,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 33.5,-0.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18531
@@ -90160,8 +89466,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 38.5,-3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18534
@@ -90170,8 +89474,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 26.5,12.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18554
@@ -90179,8 +89481,6 @@ entities:
     - type: Transform
       pos: 26.5,18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18577
@@ -90189,8 +89489,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 33.5,18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18591
@@ -90199,8 +89497,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 30.5,14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18603
@@ -90209,8 +89505,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 33.5,10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18615
@@ -90219,8 +89513,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 27.5,6.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18627
@@ -90229,8 +89521,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 35.5,14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18631
@@ -90238,8 +89528,6 @@ entities:
     - type: Transform
       pos: 15.5,25.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18643
@@ -90248,8 +89536,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -0.5,25.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18678
@@ -90257,8 +89543,6 @@ entities:
     - type: Transform
       pos: -9.5,28.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18682
@@ -90266,8 +89550,6 @@ entities:
     - type: Transform
       pos: -7.5,33.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18703
@@ -90275,8 +89557,6 @@ entities:
     - type: Transform
       pos: 3.5,25.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18741
@@ -90284,8 +89564,6 @@ entities:
     - type: Transform
       pos: -2.5,45.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18744
@@ -90294,8 +89572,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -1.5,36.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18753
@@ -90304,8 +89580,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -13.5,31.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18770
@@ -90314,8 +89588,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,26.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18773
@@ -90323,8 +89595,6 @@ entities:
     - type: Transform
       pos: -20.5,29.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18782
@@ -90333,8 +89603,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -9.5,24.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18783
@@ -90343,8 +89611,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.5,24.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18784
@@ -90353,8 +89619,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -13.5,24.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18811
@@ -90362,8 +89626,6 @@ entities:
     - type: Transform
       pos: 6.5,31.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18858
@@ -90372,8 +89634,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -25.5,35.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18867
@@ -90382,8 +89642,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -29.5,14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18869
@@ -90391,8 +89649,6 @@ entities:
     - type: Transform
       pos: -21.5,14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18876
@@ -90401,8 +89657,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -15.5,11.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18890
@@ -90410,8 +89664,6 @@ entities:
     - type: Transform
       pos: -35.5,7.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18913
@@ -90420,8 +89672,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -15.5,0.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18936
@@ -90430,8 +89680,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -15.5,5.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18943
@@ -90440,8 +89688,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -32.5,-13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18970
@@ -90452,8 +89698,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 894
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18971
@@ -90461,8 +89705,6 @@ entities:
     - type: Transform
       pos: -36.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18972
@@ -90470,8 +89712,6 @@ entities:
     - type: Transform
       pos: -28.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18975
@@ -90480,8 +89720,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -32.5,-39.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18998
@@ -90490,8 +89728,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19012
@@ -90500,8 +89736,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -32.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19031
@@ -90509,8 +89743,6 @@ entities:
     - type: Transform
       pos: -29.5,-18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19034
@@ -90519,8 +89751,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -19.5,-18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 8405
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19057
@@ -90528,8 +89761,6 @@ entities:
     - type: Transform
       pos: -18.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19069
@@ -90537,8 +89768,6 @@ entities:
     - type: Transform
       pos: -18.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19079
@@ -90547,8 +89776,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -30.5,-29.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19084
@@ -90557,8 +89784,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,-29.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19085
@@ -90567,8 +89792,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -47.5,-36.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19092
@@ -90577,8 +89800,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -56.5,-24.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19103
@@ -90587,8 +89808,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -44.5,-29.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19131
@@ -90597,8 +89816,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -45.5,1.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19301
@@ -90607,8 +89824,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -55.5,-46.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19302
@@ -90617,8 +89832,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -39.5,-46.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19314
@@ -90627,8 +89840,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -58.5,-27.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19334
@@ -90637,8 +89848,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -50.5,-29.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19368
@@ -90646,8 +89855,6 @@ entities:
     - type: Transform
       pos: -48.5,11.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19410
@@ -90656,8 +89863,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19425
@@ -90666,8 +89871,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -22.5,-35.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19469
@@ -90676,8 +89879,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -14.5,-26.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19481
@@ -90685,8 +89886,6 @@ entities:
     - type: Transform
       pos: -5.5,-26.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19484
@@ -90695,8 +89894,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 14.5,-20.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19508
@@ -90704,8 +89901,6 @@ entities:
     - type: Transform
       pos: 7.5,-20.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19519
@@ -90714,8 +89909,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -6.5,-21.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19522
@@ -90724,8 +89917,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,-21.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19567
@@ -90734,8 +89925,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -0.5,-13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19569
@@ -90744,8 +89933,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,-15.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19575
@@ -90754,8 +89941,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 12.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19588
@@ -90764,8 +89949,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -11.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19603
@@ -90774,8 +89957,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-26.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19607
@@ -90784,8 +89965,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-36.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19630
@@ -90793,8 +89972,6 @@ entities:
     - type: Transform
       pos: -5.5,-34.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19640
@@ -90803,8 +89980,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 13.5,-25.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19674
@@ -90813,8 +89988,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 45.5,-35.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19675
@@ -90823,8 +89996,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 35.5,-35.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19728
@@ -90833,8 +90004,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 31.5,-27.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19729
@@ -90843,8 +90012,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 49.5,-27.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19751
@@ -90853,8 +90020,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 36.5,-29.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19761
@@ -90863,8 +90028,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 44.5,-28.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19774
@@ -90873,8 +90036,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 41.5,-24.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19775
@@ -90883,8 +90044,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 37.5,-25.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19795
@@ -90896,8 +90055,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8387
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19820
@@ -90906,8 +90063,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 55.5,-33.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19840
@@ -90916,8 +90071,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 59.5,-19.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19885
@@ -90925,8 +90078,6 @@ entities:
     - type: Transform
       pos: 70.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19900
@@ -90934,8 +90085,6 @@ entities:
     - type: Transform
       pos: 74.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19907
@@ -90944,8 +90093,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 70.5,-13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19912
@@ -90953,8 +90100,6 @@ entities:
     - type: Transform
       pos: 64.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19923
@@ -90963,8 +90108,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 58.5,-13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19952
@@ -90973,8 +90116,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 62.5,-24.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19962
@@ -90983,8 +90124,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 68.5,-21.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19970
@@ -90993,8 +90132,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 23.5,-29.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19998
@@ -91003,8 +90140,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 21.5,-36.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 20005
@@ -91013,8 +90148,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 26.5,-42.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 20037
@@ -91022,8 +90155,6 @@ entities:
     - type: Transform
       pos: 21.5,-42.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 20040
@@ -91032,8 +90163,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 12.5,-46.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 20164
@@ -91042,8 +90171,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -56.5,-57.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 20167
@@ -91052,8 +90179,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -38.5,-57.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 20195
@@ -91062,8 +90187,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -53.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 21101
@@ -91075,8 +90198,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21113
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 21241
@@ -91085,8 +90206,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,-7.5
       parent: 21128
-    - type: AtmosDevice
-      joinedGrid: 21128
 - proto: GasVentScrubber
   entities:
   - uid: 3102
@@ -91095,16 +90214,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 34.5,-12.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 9078
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 19.5,-53.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 10878
@@ -91112,8 +90227,6 @@ entities:
     - type: Transform
       pos: -30.5,-26.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 13923
@@ -91121,8 +90234,6 @@ entities:
     - type: Transform
       pos: -37.5,-26.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 17708
@@ -91130,8 +90241,6 @@ entities:
     - type: Transform
       pos: 21.5,-20.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 17793
@@ -91140,8 +90249,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,-15.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 17810
@@ -91150,8 +90257,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 40.5,-19.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 17867
@@ -91159,8 +90264,6 @@ entities:
     - type: Transform
       pos: 24.5,3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18121
@@ -91169,8 +90272,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -47.5,-38.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18126
@@ -91179,8 +90280,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -56.5,-25.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18216
@@ -91189,8 +90288,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 23.5,-25.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18219
@@ -91199,8 +90296,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 33.5,-19.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18228
@@ -91209,8 +90304,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 42.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18229
@@ -91218,8 +90311,6 @@ entities:
     - type: Transform
       pos: 41.5,3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18233
@@ -91228,8 +90319,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 32.5,-0.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18234
@@ -91237,8 +90326,6 @@ entities:
     - type: Transform
       pos: 32.5,3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18239
@@ -91247,8 +90334,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 20.5,14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18242
@@ -91256,8 +90341,6 @@ entities:
     - type: Transform
       pos: 19.5,20.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18244
@@ -91265,8 +90348,6 @@ entities:
     - type: Transform
       pos: 10.5,20.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18247
@@ -91274,8 +90355,6 @@ entities:
     - type: Transform
       pos: -2.5,20.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18251
@@ -91283,8 +90362,6 @@ entities:
     - type: Transform
       pos: -11.5,20.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18253
@@ -91292,8 +90369,6 @@ entities:
     - type: Transform
       pos: -24.5,20.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18268
@@ -91302,8 +90377,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -25.5,5.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18269
@@ -91312,8 +90385,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -23.5,-1.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18273
@@ -91321,8 +90392,6 @@ entities:
     - type: Transform
       pos: -31.5,1.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18283
@@ -91331,8 +90400,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -23.5,-7.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18287
@@ -91341,8 +90408,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -24.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18291
@@ -91351,8 +90416,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -23.5,-30.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18293
@@ -91361,8 +90424,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -12.5,-30.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18296
@@ -91371,8 +90432,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-30.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18299
@@ -91381,8 +90440,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 8.5,-32.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18303
@@ -91391,8 +90448,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 15.5,-32.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18306
@@ -91401,8 +90456,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 20.5,-31.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18330
@@ -91410,8 +90463,6 @@ entities:
     - type: Transform
       pos: 45.5,8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18356
@@ -91420,8 +90471,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 50.5,6.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18357
@@ -91430,8 +90479,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 56.5,2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18373
@@ -91440,8 +90487,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 56.5,6.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18389
@@ -91449,8 +90494,6 @@ entities:
     - type: Transform
       pos: 59.5,16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18417
@@ -91462,8 +90505,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8369
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18427
@@ -91472,8 +90513,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 55.5,12.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18440
@@ -91482,8 +90521,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 49.5,-4.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18474
@@ -91491,8 +90528,6 @@ entities:
     - type: Transform
       pos: 58.5,-5.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18497
@@ -91501,8 +90536,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 49.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18513
@@ -91511,8 +90544,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 60.5,1.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18530
@@ -91521,8 +90552,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 38.5,-1.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18533
@@ -91530,8 +90559,6 @@ entities:
     - type: Transform
       pos: 26.5,14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18553
@@ -91540,8 +90567,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 28.5,18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18579
@@ -91550,8 +90575,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 33.5,19.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18590
@@ -91560,8 +90583,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 31.5,15.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18604
@@ -91570,8 +90591,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 30.5,7.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18614
@@ -91580,8 +90599,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 27.5,8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18628
@@ -91590,8 +90607,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 35.5,13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18630
@@ -91599,8 +90614,6 @@ entities:
     - type: Transform
       pos: 13.5,25.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18642
@@ -91609,8 +90622,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -0.5,23.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18679
@@ -91619,8 +90630,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -11.5,28.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18683
@@ -91628,8 +90637,6 @@ entities:
     - type: Transform
       pos: -6.5,33.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18705
@@ -91638,8 +90645,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,26.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18725
@@ -91648,8 +90653,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,38.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18742
@@ -91657,8 +90660,6 @@ entities:
     - type: Transform
       pos: -0.5,45.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18755
@@ -91666,8 +90667,6 @@ entities:
     - type: Transform
       pos: -11.5,31.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18764
@@ -91676,8 +90675,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -18.5,29.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18785
@@ -91686,8 +90683,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -14.5,24.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18786
@@ -91696,8 +90691,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -10.5,24.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18787
@@ -91706,8 +90699,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -6.5,24.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18812
@@ -91715,8 +90706,6 @@ entities:
     - type: Transform
       pos: 3.5,31.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18830
@@ -91725,8 +90714,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,27.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18859
@@ -91734,8 +90721,6 @@ entities:
     - type: Transform
       pos: -25.5,34.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18866
@@ -91744,8 +90729,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -29.5,13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18870
@@ -91753,8 +90736,6 @@ entities:
     - type: Transform
       pos: -19.5,14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18891
@@ -91762,8 +90743,6 @@ entities:
     - type: Transform
       pos: -31.5,7.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18912
@@ -91772,8 +90751,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -15.5,2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18941
@@ -91782,8 +90759,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -16.5,5.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18944
@@ -91792,8 +90767,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -32.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18983
@@ -91801,8 +90774,6 @@ entities:
     - type: Transform
       pos: -29.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18984
@@ -91814,8 +90785,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 894
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19000
@@ -91824,8 +90793,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -36.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19001
@@ -91833,8 +90800,6 @@ entities:
     - type: Transform
       pos: -37.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19013
@@ -91843,8 +90808,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -33.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19030
@@ -91853,8 +90816,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -28.5,-18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19033
@@ -91863,8 +90824,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -19.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 8405
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19056
@@ -91873,8 +90835,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -18.5,-13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19070
@@ -91883,8 +90843,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -18.5,-9.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19077
@@ -91893,8 +90851,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -58.5,-28.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19109
@@ -91903,8 +90859,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -47.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19136
@@ -91912,8 +90866,6 @@ entities:
     - type: Transform
       pos: -48.5,1.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19171
@@ -91922,8 +90874,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -53.5,-12.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19300
@@ -91932,8 +90882,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -55.5,-47.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19303
@@ -91942,8 +90890,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -39.5,-47.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 19307
@@ -91952,8 +90898,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -43.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19308
@@ -91962,8 +90906,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -32.5,-38.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19345
@@ -91972,8 +90914,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -50.5,-27.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19346
@@ -91982,8 +90922,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -44.5,-27.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19369
@@ -91991,8 +90929,6 @@ entities:
     - type: Transform
       pos: -46.5,11.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19409
@@ -92001,8 +90937,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -37.5,12.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19426
@@ -92011,8 +90945,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -22.5,-37.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19470
@@ -92021,8 +90953,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -14.5,-24.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19482
@@ -92030,8 +90960,6 @@ entities:
     - type: Transform
       pos: -6.5,-26.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19498
@@ -92039,8 +90967,6 @@ entities:
     - type: Transform
       pos: 14.5,-21.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19507
@@ -92049,8 +90975,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,-18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19520
@@ -92059,8 +90983,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -6.5,-23.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19521
@@ -92068,8 +90990,6 @@ entities:
     - type: Transform
       pos: -0.5,-21.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19566
@@ -92078,8 +90998,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -0.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19570
@@ -92088,8 +91006,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -7.5,-15.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19580
@@ -92097,8 +91013,6 @@ entities:
     - type: Transform
       pos: 12.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19587
@@ -92107,8 +91021,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -11.5,-15.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19602
@@ -92117,8 +91029,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-26.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19608
@@ -92127,8 +91037,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,-36.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19622
@@ -92137,8 +91045,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,-34.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19639
@@ -92147,8 +91053,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 15.5,-25.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19672
@@ -92157,8 +91061,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 35.5,-34.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19673
@@ -92167,8 +91069,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 45.5,-34.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19730
@@ -92177,8 +91077,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 31.5,-28.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19731
@@ -92187,8 +91085,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 49.5,-28.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19748
@@ -92196,8 +91092,6 @@ entities:
     - type: Transform
       pos: 37.5,-29.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19760
@@ -92206,8 +91100,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 43.5,-28.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19778
@@ -92216,8 +91108,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 35.5,-25.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19789
@@ -92226,8 +91116,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 41.5,-25.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19796
@@ -92239,8 +91127,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8387
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19828
@@ -92249,8 +91135,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 55.5,-34.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19841
@@ -92259,8 +91143,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 59.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19884
@@ -92269,8 +91151,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 68.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19901
@@ -92279,8 +91159,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 74.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19908
@@ -92289,8 +91167,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 68.5,-13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19911
@@ -92298,8 +91174,6 @@ entities:
     - type: Transform
       pos: 64.5,-15.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19922
@@ -92308,8 +91182,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 60.5,-13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19953
@@ -92318,8 +91190,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 62.5,-23.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19963
@@ -92328,8 +91198,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 69.5,-21.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19971
@@ -92338,8 +91206,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 23.5,-32.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19999
@@ -92348,8 +91214,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 21.5,-37.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 20006
@@ -92358,8 +91222,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 26.5,-45.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 20038
@@ -92367,8 +91229,6 @@ entities:
     - type: Transform
       pos: 16.5,-42.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 20041
@@ -92377,8 +91237,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 12.5,-47.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 20109
@@ -92387,8 +91245,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -13.5,-37.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 20168
@@ -92397,8 +91253,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -57.5,-57.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 20169
@@ -92407,8 +91261,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,-57.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 21102
@@ -92420,8 +91272,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21113
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
 - proto: GeneratorBasic
@@ -95121,12 +93971,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -25.5,39.5
       parent: 2
-  - uid: 15080
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -30.5,36.5
-      parent: 2
   - uid: 15153
     components:
     - type: Transform
@@ -95241,11 +94085,6 @@ entities:
     - type: Transform
       pos: 4.5,-49.5
       parent: 2
-  - uid: 15590
-    components:
-    - type: Transform
-      pos: 9.5,-50.5
-      parent: 2
   - uid: 15594
     components:
     - type: Transform
@@ -96970,11 +95809,6 @@ entities:
       parent: 2
 - proto: GrilleBroken
   entities:
-  - uid: 14396
-    components:
-    - type: Transform
-      pos: 5.5,-50.5
-      parent: 2
   - uid: 15037
     components:
     - type: Transform
@@ -97241,11 +96075,6 @@ entities:
     - type: Transform
       pos: 23.5,26.5
       parent: 2
-  - uid: 14397
-    components:
-    - type: Transform
-      pos: 6.5,-50.5
-      parent: 2
   - uid: 15257
     components:
     - type: Transform
@@ -97306,16 +96135,6 @@ entities:
     - type: Transform
       pos: 3.5,-42.5
       parent: 2
-  - uid: 15592
-    components:
-    - type: Transform
-      pos: 7.5,-50.5
-      parent: 2
-  - uid: 15593
-    components:
-    - type: Transform
-      pos: 8.5,-50.5
-      parent: 2
   - uid: 15595
     components:
     - type: Transform
@@ -98016,13 +96835,18 @@ entities:
     - type: Transform
       pos: 18.5,-50.5
       parent: 2
-  - uid: 8126
+  - uid: 15593
     components:
     - type: MetaData
       name: Secure board room airlock
     - type: Transform
       pos: 8.5,-43.5
       parent: 2
+  - uid: 15805
+    components:
+    - type: Transform
+      pos: 8.5,-45.5
+      parent: 2
 - proto: HighSecDoor
   entities:
   - uid: 20388
@@ -98053,21 +96877,6 @@ entities:
       parent: 2
 - proto: HospitalCurtainsOpen
   entities:
-  - uid: 645
-    components:
-    - type: Transform
-      pos: 62.5,26.5
-      parent: 2
-  - uid: 1437
-    components:
-    - type: Transform
-      pos: -13.5,7.5
-      parent: 2
-  - uid: 1438
-    components:
-    - type: Transform
-      pos: -13.5,6.5
-      parent: 2
   - uid: 1439
     components:
     - type: Transform
@@ -98132,11 +96941,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 47.5,-3.5
       parent: 2
-  - uid: 16144
-    components:
-    - type: Transform
-      pos: 56.5,27.5
-      parent: 2
   - uid: 17267
     components:
     - type: Transform
@@ -98358,10 +97162,10 @@ entities:
       parent: 2
 - proto: IDComputerCircuitboard
   entities:
-  - uid: 8168
+  - uid: 21594
     components:
     - type: Transform
-      pos: 9.516036,-45.945774
+      pos: 9.506062,-47.954967
       parent: 2
 - proto: InflatableDoor
   entities:
@@ -98856,13 +97660,6 @@ entities:
     - type: Transform
       pos: -55.5,-34.5
       parent: 2
-- proto: KoboldCubeWrapped
-  entities:
-  - uid: 3253
-    components:
-    - type: Transform
-      pos: 75.686676,-15.547764
-      parent: 2
 - proto: Lamp
   entities:
   - uid: 1473
@@ -99029,8 +97826,6 @@ entities:
     - type: Transform
       pos: 39.5,17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: LiquidOxygenCanister
   entities:
   - uid: 5721
@@ -99038,8 +97833,6 @@ entities:
     - type: Transform
       pos: 38.5,17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: LockerAtmosphericsFilled
   entities:
   - uid: 1479
@@ -99841,8 +98634,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.8856695
-        - 7.0937095
+        - 1.8968438
+        - 7.1357465
         - 0
         - 0
         - 0
@@ -99859,9 +98652,9 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 2094
-          - 21052
+          - 2143
           - 21054
+          - 21052
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -99957,11 +98750,6 @@ entities:
     - type: Transform
       pos: 66.5,-8.5
       parent: 2
-  - uid: 7358
-    components:
-    - type: Transform
-      pos: 80.5,-17.5
-      parent: 2
   - uid: 8068
     components:
     - type: Transform
@@ -100297,10 +99085,10 @@ entities:
       parent: 2
 - proto: MedkitAdvancedFilled
   entities:
-  - uid: 2312
+  - uid: 2338
     components:
     - type: Transform
-      pos: 50.526608,-3.4690142
+      pos: 50.53992,-7.5531416
       parent: 2
 - proto: MedkitBruteFilled
   entities:
@@ -100502,7 +99290,7 @@ entities:
   - uid: 15933
     components:
     - type: MetaData
-      desc: Commemorating the lost warriors who contributed to bring the world as we know it today.
+      desc: Commemorating the lost warriors who contributed to bring peace to the world as we know it today
       name: Lost warriors memorial
     - type: Transform
       pos: -47.5,-7.5
@@ -100577,10 +99365,15 @@ entities:
       parent: 2
 - proto: MonkeyCubeWrapped
   entities:
-  - uid: 6844
+  - uid: 852
     components:
     - type: Transform
-      pos: 75.5075,-15.6283
+      pos: 75.39325,-15.57394
+      parent: 2
+  - uid: 3253
+    components:
+    - type: Transform
+      pos: 75.588936,-15.561709
       parent: 2
 - proto: MopBucket
   entities:
@@ -100796,162 +99589,116 @@ entities:
     - type: Transform
       pos: 18.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1512
     components:
     - type: Transform
       pos: 28.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1513
     components:
     - type: Transform
       pos: 23.5,-18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1514
     components:
     - type: Transform
       pos: 23.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 6386
     components:
     - type: Transform
       pos: -54.5,-45.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7613
     components:
     - type: Transform
       pos: 22.5,-35.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8105
     components:
     - type: Transform
       pos: -0.5,-34.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14696
     components:
     - type: Transform
       pos: -6.5,38.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14700
     components:
     - type: Transform
       pos: -39.5,17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14703
     components:
     - type: Transform
       pos: -44.5,-11.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14706
     components:
     - type: Transform
       pos: -62.5,-31.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14709
     components:
     - type: Transform
       pos: -36.5,-40.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14712
     components:
     - type: Transform
       pos: -10.5,-33.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14716
     components:
     - type: Transform
       pos: 5.5,-38.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14720
     components:
     - type: Transform
       pos: 45.5,-15.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14723
     components:
     - type: Transform
       pos: 80.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14728
     components:
     - type: Transform
       pos: 54.5,17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14733
     components:
     - type: Transform
       pos: 39.5,-8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14857
     components:
     - type: Transform
       pos: -9.5,17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14858
     components:
     - type: Transform
       pos: 2.5,16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 15162
     components:
     - type: Transform
       pos: -24.5,34.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 15894
     components:
     - type: Transform
       pos: -9.5,38.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 20794
     components:
     - type: Transform
       pos: 10.5,16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: NitrousOxideCanister
   entities:
   - uid: 1515
@@ -100959,8 +99706,6 @@ entities:
     - type: Transform
       pos: 24.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: NoticeBoard
   entities:
   - uid: 10572
@@ -101048,183 +99793,131 @@ entities:
     - type: Transform
       pos: 16.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1517
     components:
     - type: Transform
       pos: 27.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1518
     components:
     - type: Transform
       pos: 22.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1519
     components:
     - type: Transform
       pos: 22.5,-18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 1520
     components:
     - type: Transform
       pos: 22.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 6387
     components:
     - type: Transform
       pos: -40.5,-45.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7614
     components:
     - type: Transform
       pos: 22.5,-38.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8104
     components:
     - type: Transform
       pos: -1.5,-34.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14697
     components:
     - type: Transform
       pos: -5.5,38.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14701
     components:
     - type: Transform
       pos: -38.5,17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14702
     components:
     - type: Transform
       pos: -45.5,-11.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14707
     components:
     - type: Transform
       pos: -61.5,-31.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14708
     components:
     - type: Transform
       pos: -36.5,-39.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14713
     components:
     - type: Transform
       pos: -11.5,-33.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14715
     components:
     - type: Transform
       pos: 5.5,-39.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14721
     components:
     - type: Transform
       pos: 45.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14725
     components:
     - type: Transform
       pos: 81.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14729
     components:
     - type: Transform
       pos: 53.5,17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14732
     components:
     - type: Transform
       pos: 39.5,-9.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14859
     components:
     - type: Transform
       pos: -8.5,17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14860
     components:
     - type: Transform
       pos: 3.5,16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14863
     components:
     - type: Transform
       pos: 15.5,4.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14869
     components:
     - type: Transform
       pos: 11.5,16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 15161
     components:
     - type: Transform
       pos: -24.5,35.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 15856
     components:
     - type: Transform
       pos: 69.5,4.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 15895
     components:
     - type: Transform
       pos: -8.5,38.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: Paper
   entities:
   - uid: 1521
@@ -101400,6 +100093,16 @@ entities:
 
 
         [italic]Best wishes, [bold]NanoTrasen Technical Build Team.[/bold][/italic]
+  - uid: 21554
+    components:
+    - type: Transform
+      pos: 27.60654,-44.384544
+      parent: 2
+  - uid: 21555
+    components:
+    - type: Transform
+      pos: 27.520927,-44.445698
+      parent: 2
 - proto: PaperBin10
   entities:
   - uid: 1527
@@ -101778,15 +100481,11 @@ entities:
     - type: Transform
       pos: 23.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 16924
     components:
     - type: Transform
       pos: 24.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: PlasmaReinforcedWindowDirectional
   entities:
   - uid: 5901
@@ -104133,12 +102832,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 8.5,-38.5
       parent: 2
-  - uid: 8160
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 8.5,-46.5
-      parent: 2
   - uid: 8198
     components:
     - type: Transform
@@ -104218,6 +102911,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -29.5,38.5
       parent: 2
+  - uid: 17538
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-48.5
+      parent: 2
   - uid: 20609
     components:
     - type: Transform
@@ -104332,11 +103031,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 10.5,-3.5
       parent: 2
-  - uid: 3293
-    components:
-    - type: Transform
-      pos: -12.5,-36.5
-      parent: 2
 - proto: PoweredSmallLight
   entities:
   - uid: 3272
@@ -104344,6 +103038,11 @@ entities:
     - type: Transform
       pos: -32.5,-8.5
       parent: 2
+  - uid: 8164
+    components:
+    - type: Transform
+      pos: -12.5,-36.5
+      parent: 2
   - uid: 8752
     components:
     - type: Transform
@@ -104995,6 +103694,11 @@ entities:
     - type: Transform
       pos: 50.5,-7.5
       parent: 2
+  - uid: 21572
+    components:
+    - type: Transform
+      pos: 34.5,-1.5
+      parent: 2
 - proto: RadiationCollectorFullTank
   entities:
   - uid: 1731
@@ -106146,6 +104850,12 @@ entities:
       parent: 2
 - proto: RailingCornerSmall
   entities:
+  - uid: 850
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-9.5
+      parent: 2
   - uid: 1873
     components:
     - type: Transform
@@ -106307,6 +105017,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 57.5,-21.5
       parent: 2
+  - uid: 21557
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-9.5
+      parent: 2
+  - uid: 21560
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-9.5
+      parent: 2
 - proto: RandomArcade
   entities:
   - uid: 3707
@@ -106359,6 +105081,11 @@ entities:
     - type: Transform
       pos: 80.5,-13.5
       parent: 2
+  - uid: 8160
+    components:
+    - type: Transform
+      pos: 80.5,-17.5
+      parent: 2
 - proto: RandomBoard
   entities:
   - uid: 2902
@@ -106441,11 +105168,6 @@ entities:
       parent: 2
 - proto: RandomFoodMeal
   entities:
-  - uid: 1899
-    components:
-    - type: Transform
-      pos: -15.5,-3.5
-      parent: 2
   - uid: 1900
     components:
     - type: Transform
@@ -106481,6 +105203,11 @@ entities:
     - type: Transform
       pos: -53.5,-62.5
       parent: 2
+  - uid: 8167
+    components:
+    - type: Transform
+      pos: -15.5,-3.5
+      parent: 2
 - proto: RandomFoodSingle
   entities:
   - uid: 1902
@@ -108455,11 +107182,6 @@ entities:
     - type: Transform
       pos: -31.5,-33.5
       parent: 2
-  - uid: 1930
-    components:
-    - type: Transform
-      pos: -18.5,-38.5
-      parent: 2
   - uid: 3630
     components:
     - type: Transform
@@ -108542,11 +107264,6 @@ entities:
     - type: Transform
       pos: -30.5,-33.5
       parent: 2
-  - uid: 1936
-    components:
-    - type: Transform
-      pos: -18.5,-37.5
-      parent: 2
   - uid: 3095
     components:
     - type: Transform
@@ -110638,12 +109355,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -28.5,39.5
       parent: 2
-  - uid: 15046
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -30.5,36.5
-      parent: 2
   - uid: 15053
     components:
     - type: Transform
@@ -111066,10 +109777,10 @@ entities:
       parent: 2
 - proto: ResearchAndDevelopmentServerMachineCircuitboard
   entities:
-  - uid: 8171
+  - uid: 21592
     components:
     - type: Transform
-      pos: 7.522449,-45.811237
+      pos: 7.506061,-47.899414
       parent: 2
 - proto: RevolverCapGun
   entities:
@@ -111422,6 +110133,13 @@ entities:
       parent: 21128
     - type: Stack
       count: 15
+  - uid: 21570
+    components:
+    - type: Transform
+      pos: 34.50172,-1.4871633
+      parent: 2
+    - type: Stack
+      count: 15
 - proto: SheetPlasteel
   entities:
   - uid: 7622
@@ -113106,6 +111824,18 @@ entities:
     - type: Transform
       pos: 66.5,-11.5
       parent: 2
+- proto: SignArcade
+  entities:
+  - uid: 2145
+    components:
+    - type: Transform
+      pos: -44.5,8.5
+      parent: 2
+  - uid: 3123
+    components:
+    - type: Transform
+      pos: -50.5,8.5
+      parent: 2
 - proto: SignArmory
   entities:
   - uid: 4749
@@ -113947,6 +112677,28 @@ entities:
     - type: Transform
       pos: -2.5,-15.5
       parent: 2
+- proto: SignReception
+  entities:
+  - uid: 854
+    components:
+    - type: Transform
+      pos: 24.5,15.5
+      parent: 2
+  - uid: 21597
+    components:
+    - type: Transform
+      pos: 57.5,-15.5
+      parent: 2
+  - uid: 21598
+    components:
+    - type: Transform
+      pos: 44.5,-22.5
+      parent: 2
+  - uid: 21599
+    components:
+    - type: Transform
+      pos: 0.5,25.5
+      parent: 2
 - proto: SignRedOne
   entities:
   - uid: 20931
@@ -113977,6 +112729,13 @@ entities:
     - type: Transform
       pos: 60.5,-21.5
       parent: 2
+- proto: SignSalvage
+  entities:
+  - uid: 855
+    components:
+    - type: Transform
+      pos: 32.5,19.5
+      parent: 2
 - proto: SignScience
   entities:
   - uid: 7157
@@ -115532,23 +114291,20 @@ entities:
       rot: 3.141592653589793 rad
       pos: -15.5,14.5
       parent: 2
+- proto: SprayBottle
+  entities:
+  - uid: 8194
+    components:
+    - type: Transform
+      pos: -13.281918,-24.159872
+      parent: 2
+  - uid: 8430
+    components:
+    - type: Transform
+      pos: -13.465376,-24.172104
+      parent: 2
 - proto: SprayBottleWater
   entities:
-  - uid: 2137
-    components:
-    - type: Transform
-      pos: -13.53776,-24.0789
-      parent: 2
-  - uid: 2138
-    components:
-    - type: Transform
-      pos: -13.366531,-24.0789
-      parent: 2
-  - uid: 2139
-    components:
-    - type: Transform
-      pos: -13.231995,-24.0789
-      parent: 2
   - uid: 6926
     components:
     - type: Transform
@@ -115573,36 +114329,6 @@ entities:
       parent: 2
 - proto: Stairs
   entities:
-  - uid: 2142
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,3.5
-      parent: 2
-  - uid: 2143
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,2.5
-      parent: 2
-  - uid: 2144
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-0.5
-      parent: 2
-  - uid: 2145
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,0.5
-      parent: 2
-  - uid: 2146
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,1.5
-      parent: 2
   - uid: 2682
     components:
     - type: Transform
@@ -115770,6 +114496,50 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -37.5,4.5
       parent: 2
+- proto: StairWood
+  entities:
+  - uid: 8154
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,-20.5
+      parent: 2
+  - uid: 8963
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-0.5
+      parent: 2
+  - uid: 13333
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,0.5
+      parent: 2
+  - uid: 14396
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,3.5
+      parent: 2
+  - uid: 14397
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,2.5
+      parent: 2
+  - uid: 15046
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,1.5
+      parent: 2
+  - uid: 21558
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -18.5,-20.5
+      parent: 2
 - proto: StasisBed
   entities:
   - uid: 6583
@@ -115932,92 +114702,66 @@ entities:
     - type: Transform
       pos: -1.5,-19.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 2158
     components:
     - type: Transform
       pos: -0.5,-19.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 2159
     components:
     - type: Transform
       pos: -0.5,-20.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 2160
     components:
     - type: Transform
       pos: -1.5,-20.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 2161
     components:
     - type: Transform
       pos: 26.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 2162
     components:
     - type: Transform
       pos: 25.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 2163
     components:
     - type: Transform
       pos: 25.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 2164
     components:
     - type: Transform
       pos: 25.5,-18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7394
     components:
     - type: Transform
       pos: 73.5,-11.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7395
     components:
     - type: Transform
       pos: 73.5,-12.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7397
     components:
     - type: Transform
       pos: 74.5,-12.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7399
     components:
     - type: Transform
       pos: 74.5,-11.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14854
     components:
     - type: Transform
       pos: -16.5,17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: Stunbaton
   entities:
   - uid: 4991
@@ -116327,17 +115071,6 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Gravity
-  - uid: 8963
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,-44.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraCommand
-      nameSet: True
-      id: Secure board room
   - uid: 8964
     components:
     - type: Transform
@@ -116545,6 +115278,17 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Vault
+  - uid: 15592
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-46.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Secure board room
 - proto: SurveillanceCameraEngineering
   entities:
   - uid: 6780
@@ -119447,11 +118191,6 @@ entities:
       parent: 2
 - proto: TableFancyRed
   entities:
-  - uid: 3123
-    components:
-    - type: Transform
-      pos: -15.5,-3.5
-      parent: 2
   - uid: 3124
     components:
     - type: Transform
@@ -119623,6 +118362,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -36.5,12.5
       parent: 2
+  - uid: 2312
+    components:
+    - type: Transform
+      pos: 27.5,-43.5
+      parent: 2
   - uid: 4020
     components:
     - type: Transform
@@ -120251,29 +118995,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,-40.5
       parent: 2
-  - uid: 8161
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,-45.5
-      parent: 2
-  - uid: 8162
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,-46.5
-      parent: 2
   - uid: 8163
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 7.5,-46.5
-      parent: 2
-  - uid: 8164
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,-45.5
+      pos: 9.5,-47.5
       parent: 2
   - uid: 8554
     components:
@@ -120296,12 +119022,24 @@ entities:
     - type: Transform
       pos: -28.5,38.5
       parent: 2
+  - uid: 17537
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-48.5
+      parent: 2
   - uid: 17596
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -20.5,13.5
       parent: 2
+  - uid: 20250
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-48.5
+      parent: 2
   - uid: 20606
     components:
     - type: Transform
@@ -120351,6 +119089,17 @@ entities:
     - type: Transform
       pos: 9.5,1.5
       parent: 21128
+  - uid: 21550
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-47.5
+      parent: 2
+  - uid: 21552
+    components:
+    - type: Transform
+      pos: 27.5,-44.5
+      parent: 2
 - proto: TableReinforcedGlass
   entities:
   - uid: 6925
@@ -120921,6 +119670,13 @@ entities:
     - type: Transform
       pos: 9.5,39.5
       parent: 2
+- proto: TargetDarts
+  entities:
+  - uid: 21576
+    components:
+    - type: Transform
+      pos: -36.5,27.5
+      parent: 2
 - proto: TargetSyndicate
   entities:
   - uid: 21066
@@ -121655,6 +120411,11 @@ entities:
     - type: Transform
       pos: 41.5,-6.5
       parent: 2
+  - uid: 16144
+    components:
+    - type: Transform
+      pos: 13.5,-33.5
+      parent: 2
 - proto: VendingMachineClothing
   entities:
   - uid: 1593
@@ -121662,11 +120423,6 @@ entities:
     - type: Transform
       pos: 38.5,0.5
       parent: 2
-  - uid: 2338
-    components:
-    - type: Transform
-      pos: 13.5,-33.5
-      parent: 2
   - uid: 2339
     components:
     - type: Transform
@@ -122019,12 +120775,24 @@ entities:
       parent: 2
 - proto: WallReinforced
   entities:
+  - uid: 48
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-49.5
+      parent: 2
   - uid: 103
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 54.5,-43.5
       parent: 2
+  - uid: 851
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-50.5
+      parent: 2
   - uid: 1084
     components:
     - type: Transform
@@ -126364,6 +125132,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 30.5,-40.5
       parent: 2
+  - uid: 7633
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-49.5
+      parent: 2
   - uid: 7634
     components:
     - type: Transform
@@ -126942,26 +125716,6 @@ entities:
     - type: Transform
       pos: 5.5,-47.5
       parent: 2
-  - uid: 8148
-    components:
-    - type: Transform
-      pos: 6.5,-48.5
-      parent: 2
-  - uid: 8150
-    components:
-    - type: Transform
-      pos: 8.5,-48.5
-      parent: 2
-  - uid: 8153
-    components:
-    - type: Transform
-      pos: 7.5,-47.5
-      parent: 2
-  - uid: 8154
-    components:
-    - type: Transform
-      pos: 9.5,-47.5
-      parent: 2
   - uid: 8155
     components:
     - type: Transform
@@ -127299,6 +126053,11 @@ entities:
     - type: Transform
       pos: 66.5,22.5
       parent: 2
+  - uid: 15590
+    components:
+    - type: Transform
+      pos: 7.5,-45.5
+      parent: 2
   - uid: 15847
     components:
     - type: Transform
@@ -127858,6 +126617,24 @@ entities:
     - type: Transform
       pos: -21.5,-48.5
       parent: 2
+  - uid: 21587
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-49.5
+      parent: 2
+  - uid: 21588
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-50.5
+      parent: 2
+  - uid: 21589
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-49.5
+      parent: 2
 - proto: WallReinforcedRust
   entities:
   - uid: 2330
@@ -131754,6 +130531,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 62.5,17.5
       parent: 2
+  - uid: 6844
+    components:
+    - type: Transform
+      pos: 9.5,-45.5
+      parent: 2
   - uid: 6846
     components:
     - type: Transform
@@ -132360,6 +131142,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 77.5,-4.5
       parent: 2
+  - uid: 7416
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-50.5
+      parent: 2
   - uid: 7445
     components:
     - type: Transform
@@ -132564,6 +131352,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 31.5,-42.5
       parent: 2
+  - uid: 7632
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-50.5
+      parent: 2
   - uid: 7636
     components:
     - type: Transform
@@ -132702,6 +131496,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 4.5,-36.5
       parent: 2
+  - uid: 7746
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-50.5
+      parent: 2
   - uid: 7756
     components:
     - type: Transform
@@ -133212,6 +132012,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,-46.5
       parent: 2
+  - uid: 8126
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-49.5
+      parent: 2
   - uid: 8127
     components:
     - type: Transform
@@ -133224,24 +132030,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,-48.5
       parent: 2
-  - uid: 8130
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-48.5
-      parent: 2
-  - uid: 8133
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 9.5,-48.5
-      parent: 2
-  - uid: 8134
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-47.5
-      parent: 2
   - uid: 8142
     components:
     - type: Transform
@@ -134316,6 +133104,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 81.5,-36.5
       parent: 2
+  - uid: 17434
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-48.5
+      parent: 2
   - uid: 19807
     components:
     - type: Transform
@@ -139993,6 +138787,11 @@ entities:
     - type: Transform
       pos: 67.5,0.5
       parent: 2
+  - uid: 21571
+    components:
+    - type: Transform
+      pos: 34.5,-2.5
+      parent: 2
 - proto: WaterTankHighCapacity
   entities:
   - uid: 3474
@@ -140012,15 +138811,11 @@ entities:
     - type: Transform
       pos: 22.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 3478
     components:
     - type: Transform
       pos: 24.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: WeaponCapacitorRecharger
   entities:
   - uid: 4580
@@ -140106,6 +138901,11 @@ entities:
       parent: 2
 - proto: WeaponTurretSyndicateBroken
   entities:
+  - uid: 853
+    components:
+    - type: Transform
+      pos: 9.5,-44.5
+      parent: 2
   - uid: 8055
     components:
     - type: Transform
@@ -140126,6 +138926,11 @@ entities:
     - type: Transform
       pos: 22.5,-59.5
       parent: 2
+  - uid: 8171
+    components:
+    - type: Transform
+      pos: 7.5,-44.5
+      parent: 2
   - uid: 20391
     components:
     - type: Transform
@@ -140177,6 +138982,11 @@ entities:
     - type: Transform
       pos: 19.5,-36.5
       parent: 2
+  - uid: 8161
+    components:
+    - type: Transform
+      pos: 33.5,-2.5
+      parent: 2
   - uid: 12468
     components:
     - type: Transform
@@ -140953,6 +139763,11 @@ entities:
       parent: 2
 - proto: WindowReinforcedDirectional
   entities:
+  - uid: 2144
+    components:
+    - type: Transform
+      pos: 27.5,-44.5
+      parent: 2
   - uid: 2280
     components:
     - type: Transform
@@ -141532,6 +140347,37 @@ entities:
     - type: Transform
       pos: 40.5,-20.5
       parent: 2
+  - uid: 21553
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-43.5
+      parent: 2
+  - uid: 21561
+    components:
+    - type: Transform
+      pos: -1.5,-9.5
+      parent: 2
+  - uid: 21562
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 2
+  - uid: 21563
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 2
+  - uid: 21564
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 2
+  - uid: 21565
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 2
 - proto: WoodDoor
   entities:
   - uid: 3557
@@ -141569,6 +140415,104 @@ entities:
     - type: Transform
       pos: -21.5,-40.5
       parent: 2
+- proto: WoodenBench
+  entities:
+  - uid: 856
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,-35.5
+      parent: 2
+  - uid: 857
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-34.5
+      parent: 2
+  - uid: 858
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-38.5
+      parent: 2
+  - uid: 859
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-34.5
+      parent: 2
+  - uid: 860
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-35.5
+      parent: 2
+  - uid: 861
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-37.5
+      parent: 2
+  - uid: 862
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-37.5
+      parent: 2
+  - uid: 863
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-38.5
+      parent: 2
+  - uid: 1437
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,-38.5
+      parent: 2
+  - uid: 1438
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,-37.5
+      parent: 2
+  - uid: 1930
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,-37.5
+      parent: 2
+  - uid: 1936
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,-38.5
+      parent: 2
+  - uid: 2094
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,-34.5
+      parent: 2
+  - uid: 2137
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,-34.5
+      parent: 2
+  - uid: 2138
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,-35.5
+      parent: 2
+  - uid: 2139
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-35.5
+      parent: 2
 - proto: WoodenSupport
   entities:
   - uid: 16157
diff --git a/Resources/Maps/reach.yml b/Resources/Maps/reach.yml
index ba8e4859aa..59c8672322 100644
--- a/Resources/Maps/reach.yml
+++ b/Resources/Maps/reach.yml
@@ -530,12 +530,14 @@ entities:
             7: 4,-14
             259: 0,11
         - node:
+            cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
             222: -18,-4
             275: 1,13
         - node:
+            cleanable: True
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
@@ -575,6 +577,7 @@ entities:
             283: 0,8
             284: 1,7
         - node:
+            cleanable: True
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
@@ -11787,12 +11790,14 @@ entities:
   - uid: 1030
     components:
     - type: Transform
-      pos: 21.5,-3.5
+      pos: 18.5,-3.5
       parent: 407
+- proto: SpawnMobFoxRenault
+  entities:
   - uid: 1826
     components:
     - type: Transform
-      pos: 18.5,-3.5
+      pos: 21.5,-3.5
       parent: 407
 - proto: SpawnPointAtmos
   entities:
diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml
index abcfeded22..fa9d39add2 100644
--- a/Resources/Prototypes/Accents/word_replacements.yml
+++ b/Resources/Prototypes/Accents/word_replacements.yml
@@ -367,6 +367,15 @@
     accent-cowboy-words-98: accent-cowboy-replacement-98
     accent-cowboy-words-99: accent-cowboy-replacement-99
 
+- type: accent
+  id: southern
+  wordReplacements:
+    accent-southern-words-1: accent-southern-words-replace-1
+    accent-southern-words-2: accent-southern-words-replace-2
+    accent-southern-words-3: accent-southern-words-replace-3
+    accent-southern-words-4: accent-southern-words-replace-4
+    accent-southern-words-5: accent-southern-words-replace-5
+    accent-southern-words-6: accent-southern-words-replace-6
 
 # For the chat sanitization system
 - type: accent
@@ -415,3 +424,4 @@
     chatsan-word-41: chatsan-replacement-41
     chatsan-word-42: chatsan-replacement-42
     chatsan-word-43: chatsan-replacement-43
+    chatsan-word-44: chatsan-replacement-44
diff --git a/Resources/Prototypes/Anomaly/behaviours.yml b/Resources/Prototypes/Anomaly/behaviours.yml
new file mode 100644
index 0000000000..aa9ad2f90d
--- /dev/null
+++ b/Resources/Prototypes/Anomaly/behaviours.yml
@@ -0,0 +1,194 @@
+- type: weightedRandom
+  id: AnomalyBehaviorList
+  weights:
+  #safe
+    Slow: 0.5
+    Light: 0.5
+    FullSafe: 0.1
+  #balanced
+    Balanced: 3
+    DelayedForce: 1
+    Rapid: 1
+    BalancedSecret: 1
+    Reflect: 1
+    NonSensivity: 1
+    Sensivity: 1
+  #Hard
+    Fast: 0.5
+    Strenght: 0.5
+    Inconstancy: 0.5
+    InconstancyParticle: 0.5
+    FullUnknown: 0.5
+    Jumping: 0.3
+  #Complex
+    FastUnknown: 0.2
+    JumpingUnknown: 0.1
+    InconstancyParticleUnknown: 0.1
+
+
+# Easy x0.5 point production
+
+- type: anomalyBehavior
+  id: FullSafe
+  pulseFrequencyModifier: 3
+  pulsePowerModifier: 0.5
+  earnPointModifier: 0.05
+  description: anomaly-behavior-safe
+
+- type: anomalyBehavior
+  id: Slow
+  pulseFrequencyModifier: 2
+  earnPointModifier: 0.5
+  description: anomaly-behavior-slow
+
+- type: anomalyBehavior
+  id: Light
+  pulsePowerModifier: 0.5
+  earnPointModifier: 0.5
+  description: anomaly-behavior-light
+
+# Balanced x1 point production
+
+- type: anomalyBehavior
+  id: Balanced
+  earnPointModifier: 1
+  description: anomaly-behavior-balanced
+
+- type: anomalyBehavior
+  id: DelayedForce
+  earnPointModifier: 1.15
+  description: anomaly-behavior-delayed-force
+  pulseFrequencyModifier: 0.5
+  pulsePowerModifier: 2
+  
+- type: anomalyBehavior
+  id: Rapid
+  earnPointModifier: 1.15
+  description: anomaly-behavior-rapid
+  pulseFrequencyModifier: 2
+  pulsePowerModifier: 0.5
+
+- type: anomalyBehavior
+  id: BalancedSecret
+  earnPointModifier: 1.2
+  description: anomaly-behavior-secret
+  components:
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 2
+    randomStartSecretMax: 3
+
+- type: anomalyBehavior
+  id: Reflect
+  earnPointModifier: 1.1
+  particleSensivity: 0.5
+  description: anomaly-behavior-reflect
+  components:
+  - type: Reflect
+    reflectProb: 0.5
+    reflects:
+      - Energy
+
+- type: anomalyBehavior
+  id: NonSensivity
+  earnPointModifier: 0.8
+  particleSensivity: 0.5
+  description: anomaly-behavior-nonsensivity
+  
+- type: anomalyBehavior
+  id: Sensivity
+  earnPointModifier: 1.2
+  particleSensivity: 1.5
+  description: anomaly-behavior-sensivity
+
+# Hard x2 point production
+
+- type: anomalyBehavior
+  id: Fast
+  earnPointModifier: 1.9
+  pulseFrequencyModifier: 0.5
+  description: anomaly-behavior-fast
+
+- type: anomalyBehavior
+  id: Strenght
+  pulsePowerModifier: 1.5
+  earnPointModifier: 1.4
+  description: anomaly-behavior-strenght
+
+- type: anomalyBehavior
+  id: Inconstancy
+  earnPointModifier: 1.7
+  description: anomaly-behavior-inconstancy
+  components:
+  - type: ShuffleParticlesAnomaly
+    shuffleOnPulse: true
+    prob: 1
+
+- type: anomalyBehavior
+  id: InconstancyParticle
+  earnPointModifier: 1.8
+  description: anomaly-behavior-inconstancy
+  components:
+  - type: ShuffleParticlesAnomaly
+    shuffleOnParticleHit: true
+    prob: 0.8
+
+- type: anomalyBehavior
+  id: Jumping
+  earnPointModifier: 1.8
+  description: anomaly-behavior-moving
+  components:
+  - type: ChaoticJump
+    jumpMinInterval: 15
+    jumpMaxInterval: 25
+    rangeMin: 1
+    rangeMax: 4
+    effect: PuddleSparkle
+
+- type: anomalyBehavior
+  id: FullUnknown
+  earnPointModifier: 1.9
+  description: anomaly-behavior-secret
+  components:
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 4
+    randomStartSecretMax: 6
+
+# Complex Effects
+
+- type: anomalyBehavior
+  id: JumpingUnknown
+  earnPointModifier: 1.9
+  description: anomaly-behavior-moving
+  components:
+  - type: ChaoticJump
+    jumpMinInterval: 15
+    jumpMaxInterval: 25
+    rangeMin: 1
+    rangeMax: 1
+    effect: PuddleSparkle
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 3
+    randomStartSecretMax: 5
+
+
+- type: anomalyBehavior
+  id: FastUnknown
+  earnPointModifier: 1.9
+  pulseFrequencyModifier: 0.5
+  description: anomaly-behavior-fast
+  components:
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 3
+    randomStartSecretMax: 5
+
+- type: anomalyBehavior
+  id: InconstancyParticleUnknown
+  earnPointModifier: 1.95
+  description: anomaly-behavior-inconstancy
+  components:
+  - type: ShuffleParticlesAnomaly
+    shuffleOnParticleHit: true
+    prob: 0.5
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 3
+    randomStartSecretMax: 5
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Organs/Animal/slimes.yml b/Resources/Prototypes/Body/Organs/Animal/slimes.yml
index 3bdb1aef8f..f1a3d47e66 100644
--- a/Resources/Prototypes/Body/Organs/Animal/slimes.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/slimes.yml
@@ -37,7 +37,7 @@
         - state: lung-l-slime
         - state: lung-r-slime
     - type: Lung
-      Alert: LowNitrogen
+      alert: LowNitrogen
     - type: Metabolizer
       removeEmpty: true
       solutionOnBody: false
diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml
index 976fd679fd..c1e199e112 100644
--- a/Resources/Prototypes/Body/Organs/arachnid.yml
+++ b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -46,7 +46,7 @@
         - ReagentId: UncookedAnimalProteins
           Quantity: 5
   - type: Metabolizer
-    updateFrequency: 1.5
+    updateInterval: 1.5
 
 - type: entity
   id: OrganArachnidLungs
@@ -60,7 +60,7 @@
       - state: lung-r
   - type: Lung
   - type: Metabolizer
-    updateFrequency: 1.5
+    updateInterval: 1.5
     removeEmpty: true
     solutionOnBody: false
     solution: "Lung"
@@ -92,7 +92,7 @@
   - type: Sprite
     state: heart-on
   - type: Metabolizer
-    updateFrequency: 1.5
+    updateInterval: 1.5
     maxReagents: 2
     metabolizerTypes: [Arachnid]
     groups:
@@ -110,7 +110,7 @@
   - type: Sprite
     state: liver
   - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
-    updateFrequency: 1.5
+    updateInterval: 1.5
     maxReagents: 1
     metabolizerTypes: [Animal]
     groups:
@@ -130,7 +130,7 @@
       - state: kidney-r
   # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
   - type: Metabolizer
-    updateFrequency: 1.5
+    updateInterval: 1.5
     maxReagents: 5
     metabolizerTypes: [Animal]
     removeEmpty: true
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
index 5865ecfe98..d306b7941f 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
@@ -4,7 +4,7 @@
     sprite: Clothing/Head/Helmets/bombsuit.rsi
     state: icon
   product: CrateEmergencyExplosive
-  cost: 650
+  cost: 1000
   category: cargoproduct-category-name-emergency
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index c29458a1ee..61085f13b9 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -68,16 +68,6 @@
   category: cargoproduct-category-name-fun
   group: market
 
-- type: cargoProduct
-  id: FunSprayPaints
-  icon:
-    sprite: Objects/Fun/spraycans.rsi
-    state: death2_cap
-  product: CrateFunSprayPaints
-  cost: 2000
-  category: Fun
-  group: market
-
 - type: cargoProduct
   id: FunParty
   icon:
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index 922e2951b6..f44cb61f73 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -54,7 +54,7 @@
     sprite: Mobs/Animals/duck.rsi
     state: icon-0
   product: CrateNPCDuck
-  cost: 6000
+  cost: 4000
   category: cargoproduct-category-name-livestock
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
index 8a943a548d..ab7dc45798 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -82,7 +82,7 @@
   id: ServiceBooks
   icon:
     sprite: Objects/Misc/books.rsi
-    state: book0
+    state: book_icon
   product: CrateServiceBooks
   cost: 1000
   category: cargoproduct-category-name-service
@@ -92,7 +92,7 @@
   id: ServiceGuidebooks
   icon:
     sprite: Objects/Misc/books.rsi
-    state: book_engineering2
+    state: book_icon
   product: CrateServiceGuidebooks
   cost: 1300
   category: cargoproduct-category-name-service
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index b9d369354f..3a6d7f2f05 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -33,7 +33,17 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 130000
+  cost: 13000
+  category: cargoproduct-category-name-service
+  group: market
+
+- type: cargoProduct
+  id: CrateVendingMachineRestockAutoDrobe
+  icon:
+    sprite: Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockAutoDrobeFilled
+  cost: 1200
   category: cargoproduct-category-name-service
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 1e29475893..cc0da13b06 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -326,6 +326,27 @@
         - id: CrowbarRed
         - id: AdvMopItem
 
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackERTChaplain
+  id: ClothingBackpackERTChaplainFilled
+  components:
+    - type: StorageFill
+      contents:
+        - id: BoxSurvivalEngineering
+        - id: BoxCandle
+        - id: BoxBodyBag
+        - id: DrinkWaterMelonJuiceJug
+        - id: Lantern
+        - id: Lantern
+        - id: Bible
+        - id: CrowbarRed
+        - id: FoodBakedBunHotX
+        - id: FoodBakedBunHotX
+        - id: FoodBakedBunHotX
+        - id: FoodBakedBunHotX
+        - id: Lighter
+
 # Death Squad
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
index 48fab5dccc..b52e853008 100644
--- a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
+++ b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
@@ -5,70 +5,10 @@
   components:
   - type: StorageFill
     contents:
-      - id: BookRandom
-        prob: 0.4
-        amount: 1
-        maxAmount: 4
-      - id: BookNarsieLegend
-        prob: 0.1
-      - id: BookTruth
-        prob: 0.1
-      - id: BookWorld
-        prob: 0.1
-      - id: BookIanAntarctica
-        prob: 0.1
-      - id: BookSlothClownSSS
-        prob: 0.1
-      - id: BookSlothClownPranks
-        prob: 0.1
-      - id: BookSlothClownMMD
-        prob: 0.1
-      - id: BookStruck
-        prob: 0.1
-      - id: BookSun
-        prob: 0.1
-      - id: BookPossum
-        prob: 0.1
-      - id: BookCafe
-        prob: 0.1
-      - id: BookFeather
-        prob: 0.1
-      - id: BookIanLostWolfPup
-        prob: 0.1
-      - id: BookIanRanch
-        prob: 0.1
-      - id: BookIanOcean
-        prob: 0.1
-      - id: BookIanMountain
-        prob: 0.1
-      - id: BookIanCity
-        prob: 0.1
-      - id: BookIanArctic
-        prob: 0.1
-      - id: BookIanDesert
-        prob: 0.1
-      - id: BookNames
-        prob: 0.1
-      - id: BookEarth
-        prob: 0.1
-      - id: BookAurora
-        prob: 0.1
-      - id: BookTemple
-        prob: 0.1
-      - id: BookWatched
-        prob: 0.1
-      - id: BookMedicalOfficer
-        prob: 0.1
-      - id: BookMorgue
-        prob: 0.1
-      - id: BookRufus
-        prob: 0.1
-      - id: BookMap
-        prob: 0.1
-      - id: BookJourney
-        prob: 0.1
-      - id: BookInspiration
-        prob: 0.1
+      - id: BookRandomStory
+        prob: 0.6
+        amount: 2
+        maxAmount: 6
       - id: BookSpaceEncyclopedia
         orGroup: BookPool
       - id: BookTheBookOfControl
@@ -95,3 +35,93 @@
         orGroup: BookPool
       - id: BookChemicalCompendium
         orGroup: BookPool
+      - id: BookNarsieLegend
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookTruth
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookWorld
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanAntarctica
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookSlothClownSSS
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookSlothClownPranks
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookSlothClownMMD
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookStruck
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookSun
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookPossum
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookCafe
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookFeather
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanLostWolfPup
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanRanch
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanOcean
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanMountain
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanCity
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanArctic
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanDesert
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookNames
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookEarth
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookAurora
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookTemple
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookWatched
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookMedicalOfficer
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookMorgue
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookRufus
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookMap
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookJourney
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookInspiration
+        prob: 0.1
+        orGroup: BookAuthor
diff --git a/Resources/Prototypes/Catalog/Fills/Books/lore.yml b/Resources/Prototypes/Catalog/Fills/Books/lore.yml
deleted file mode 100644
index 0fd712d42f..0000000000
--- a/Resources/Prototypes/Catalog/Fills/Books/lore.yml
+++ /dev/null
@@ -1,122 +0,0 @@
-# ---- Library Salvage Fills ----
-
-- type: entity
-  name: demonomicon
-  parent: BookBase
-  id: BookDemonomicon
-  noSpawn: true
-  description: 'Who knows what dark spells may be contained in these horrid pages?'
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_demonomicon
-
-- type: entity
-  name: demonomicon
-  parent: BookDemonomicon
-  id: BookDemonomiconRandom
-  suffix: random
-  components:
-  - type: RandomSpawner
-    prototypes:
-    - BookDemonomicon1
-    - BookDemonomicon2
-    - BookDemonomicon3
-    offset: 0.1
-
-- type: entity
-  parent: BookDemonomicon
-  id: BookDemonomicon1
-  suffix: 1
-  components:
-  - type: Paper
-    content: book-text-demonomicon1
-
-- type: entity
-  parent: BookDemonomicon
-  id: BookDemonomicon2
-  suffix: 2
-  components:
-  - type: Paper
-    content: book-text-demonomicon2
-
-- type: entity
-  parent: BookDemonomicon
-  id: BookDemonomicon3
-  suffix: 3
-  components:
-  - type: Paper
-    content: book-text-demonomicon3
-
-- type: entity
-  name: pharmaceutical manuscript
-  parent: BookBase
-  id: BookChemistryInsane
-  suffix: library salvage
-  description: 'You can tell whoever wrote this was off the desoxy HARD.'
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_chemistry
-  - type: Paper
-    content: book-text-chemistry-insane
-
-- type: entity
-  name: botanical textbook
-  parent: BookBase
-  id: BookBotanicalTextbook
-  suffix: library salvage
-  description: 'Only a couple pages are left.'
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_hydroponics_pod_people
-  - type: Paper
-    content: book-text-botanics
-
-- type: entity
-  parent: BookBase
-  id: BookGnominomicon
-  name: gnominomicon
-  suffix: library salvage
-  description: You don't like the look of this. Looks
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book5
-  - type: Paper
-    content: book-text-gnome
-
-- type: entity
-  parent: BookBase
-  id: BookFishing
-  name: Tales from the Fishbowl
-  suffix: library salvage
-  description: This book sucks.
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_fish
-  - type: Paper
-    content: book-text-fishing
-
-- type: entity
-  parent: BookBase
-  id: BookDetective
-  name: Strokgraeth Holmes, Dwarf Detective
-  suffix: library salvage
-  description: Exciting! Invigorating! This author died after his book career failed.
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_detective
-  - type: Paper
-    content: book-text-detective
-
-# ---- End Library Salvage Fills ----
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
index 668f3776dd..03c870fa58 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
@@ -166,8 +166,8 @@
 - type: entity
   id: CrateRCDAmmo
   parent: CrateEngineering
-  name: RCD ammo crate
-  description: 3 RCD ammo, each restoring 5 charges.
+  name: compressed matter crate
+  description: Contains three compressed matter cartridges.
   components:
   - type: StorageFill
     contents:
@@ -178,7 +178,7 @@
   id: CrateRCD
   parent: CrateEngineeringSecure
   name: RCD crate
-  description: A crate containing a single Rapid Construction Device.
+  description: A crate containing a single rapid construction device.
   components:
   - type: StorageFill
     contents:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 17018cb9e6..72cf6c447c 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -290,21 +290,14 @@
     contents:
       - id: SnapPopBox
       - id: CrazyGlue
+        amount: 2
       - id: PlasticBanana
-      - id: FunnyPaint
-        orGroup: Paint
-        prob: 0.5
-      - id: FunnyPaintYellow
-        orGroup: Paint
-        prob: 0.5
       - id: WhoopieCushion
       - id: ToyHammer
       - id: MrChips
-        prob: 0.5
-        orGroup: Dummy
+        orGroup: GiftPool
       - id: MrDips
-        prob: 0.5
-        orGroup: Dummy
+        orGroup: Giftpool
       - id: RevolverCapGun
       - id: BalloonNT
       - id: ClothingShoesClownLarge
@@ -337,41 +330,6 @@
         amount: 15
         prob: 0.05
 
-- type: entity
-  id: CrateFunSprayPaints
-  name: spray paint crate
-  description: a crate filled with spray paint.
-  parent: CratePlastic
-  suffix: Spray Paint
-  components:
-  - type: StorageFill
-    contents:
-      - id: SprayPaintBlue
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintRed
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintOrange
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintBlack
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintGreen
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintPurple
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintWhite
-        amount: 2
-        prob: 0.33
-      - id: DeathPaint
-        amount: 2
-      - id: DeathPaintTwo
-        amount: 2
-
 - type: entity
   name: dartboard box set
   description: A box with everything you need for a fun game of darts.
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
index 538eee9a1b..10c715bb99 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
@@ -75,10 +75,10 @@
   - type: StorageFill
     contents:
       - id: MobDuckMallard
-        amount: 2
-      - id: MobDuckWhite
-        amount: 2
+        amount: 1
       - id: MobDuckBrown
+        amount: 1
+      - id: MobDuckWhite
         amount: 2
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
index 5a6b5ca089..d54e103a70 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
@@ -22,11 +22,20 @@
   id: CrateVendingMachineRestockClothesFilled
   parent: CratePlastic
   name: clothing restock crate
-  description: Contains a pair of restock boxes, one for the ClothesMate and one for the AutoDrobe.
+  description: Contains a restock box for the clothes vending machines.
   components:
   - type: StorageFill
     contents:
       - id: VendingMachineRestockClothes
+
+- type: entity
+  id: CrateVendingMachineRestockAutoDrobeFilled
+  parent: CratePlastic
+  name: AutoDrobe restock crate
+  description: Contains a restock box for the AutoDrobe.
+  components:
+  - type: StorageFill
+    contents:
       - id: VendingMachineRestockCostumes
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
index f2c5776fce..387f9782cd 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
@@ -1,6 +1,5 @@
 - type: entity
   id: BriefcaseBrownFilled
-  name: brown briefcase
   parent: BriefcaseBrown
   suffix: Filled, Paper
   components:
@@ -11,9 +10,8 @@
 
 - type: entity
   id: BriefcaseSyndieSniperBundleFilled
-  name: brown briefcase
   parent: BriefcaseSyndie
-  suffix: SniperBundle
+  suffix: Syndicate, Sniper Bundle
   components:
   - type: Item
     size: Ginormous
@@ -32,7 +30,6 @@
 
 - type: entity
   id: BriefcaseSyndieLobbyingBundleFilled
-  name: brown briefcase
   parent: BriefcaseSyndie
   suffix: Syndicate, Spesos
   components:
@@ -52,7 +49,6 @@
 
 - type: entity
   id: BriefcaseThiefBribingBundleFilled
-  name: brown briefcase
   parent: BriefcaseSyndie
   suffix: Thief, Spesos
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index 850fb91273..d8b6004ec3 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -145,10 +145,6 @@
           prob: 0.25
         - id: StrangePill
           prob: 0.20
-        - id: DeathPaint
-          prob: 0.05
-        - id: DeathPaintTwo
-          prob: 0.05
         - id: DrinkMopwataBottleRandom
           prob: 0.20
         - id: ModularReceiver
@@ -159,6 +155,8 @@
           prob: 0.20
         - id: BarberScissors
           prob: 0.05
+        - id: BookRandomStory
+          prob: 0.1
         # Syndicate loot
         - id: null
           prob: 0.95
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index d4ebf76a3d..0d6dc3b8a6 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -121,6 +121,8 @@
   components:
   - type: StorageFill
     contents:
+      - id: ClothingEyesGlassesSecurity
+        prob: 0.3
       - id: ClothingHeadHatFedoraBrown
       - id: ClothingNeckTieDet
       - id: ClothingOuterVestDetective
diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
index 1af7f4cef6..d88ce161f3 100644
--- a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
+++ b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
@@ -1,28 +1,24 @@
 - type: reagentDispenserInventory
   id: SodaDispenserInventory
   inventory:
-  - Ice
-  - Coffee
-  - Cream
-  - Tea
-  - GreenTea
-  - IcedTea
-  - IcedGreenTea
-  - Cola
-  - SpaceMountainWind
-  - DrGibb
-  - RootBeer
-  - SpaceUp
-  - TonicWater
-  - SodaWater
-  - LemonLime
-  - Sugar
-  - JuiceOrange
-  - JuiceLime
-  - JuiceWatermelon
-  ###Hacked
-  #- Fourteen Loko
-  #- GrapeSoda
+  - DrinkCoconutWaterJug
+  - DrinkCoffeeJug
+  - DrinkColaBottleFull
+  - DrinkCreamCartonXL
+  - DrinkDrGibbJug
+  - DrinkGreenTeaJug
+  - DrinkIceJug
+  - DrinkJuiceLimeCartonXL
+  - DrinkJuiceOrangeCartonXL
+  - DrinkLemonLimeJug
+  - DrinkRootBeerJug
+  - DrinkSodaWaterBottleFull
+  - DrinkSpaceMountainWindBottleFull
+  - DrinkSpaceUpBottleFull
+  - DrinkSugarJug
+  - DrinkTeaJug
+  - DrinkTonicWaterBottleFull
+  - DrinkWaterMelonJuiceJug
 
 - type: reagentDispenserInventory
   id: BoozeDispenserInventory
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
index 3e442cd481..8bccdbef9a 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -1,22 +1,24 @@
 - type: vendingMachineInventory
   id: BoozeOMatInventory
   startingInventory:
-    DrinkGlass: 20
+    DrinkGlass: 20 #Kept glasses at top for ease to differentiate from booze.
     DrinkShotGlass: 10
     DrinkGlassCoupeShaped: 10
     DrinkVacuumFlask: 5
     DrinkFlaskBar: 5
     DrinkShaker: 5
-    CustomDrinkJug: 2
+    CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers
     DrinkAbsintheBottleFull: 2
     DrinkAleBottleFull: 5
     DrinkBeerBottleFull: 5
     DrinkBlueCuracaoBottleFull: 2
     DrinkCognacBottleFull: 4
+    DrinkCoconutWaterCarton: 3
     DrinkColaBottleFull: 4
+    DrinkMilkCarton: 2
     DrinkCreamCarton: 5
     DrinkGinBottleFull: 3
-    DrinkGildlagerBottleFull: 2
+    DrinkGildlagerBottleFull: 2 #if champagne gets less because its premium, then gildlager should match this and have two
     DrinkGrenadineBottleFull: 2
     DrinkJuiceLimeCarton: 3
     DrinkJuiceOrangeCarton: 3
@@ -26,6 +28,7 @@
     DrinkPatronBottleFull: 2
     DrinkRumBottleFull: 4
     DrinkSodaWaterCan: 8
+    DrinkSolDryCan: 8
     DrinkSpaceMountainWindBottleFull: 3
     DrinkSpaceUpBottleFull: 3
     DrinkTequilaBottleFull: 3
@@ -34,7 +37,8 @@
     DrinkVodkaBottleFull: 5
     DrinkWhiskeyBottleFull: 5
     DrinkWineBottleFull: 5
-    DrinkChampagneBottleFull: 2
+    DrinkChampagneBottleFull: 2 #because the premium drink
+    DrinkSakeBottleFull: 3
     Eftpos: 4
     DrinkBeerCan: 5
     DrinkWineCan: 5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
index acf569ec0d..d20c70cd5a 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
@@ -5,9 +5,9 @@
     DrinkGrapeCan: 4
     DrinkRootBeerCan: 4
     DrinkIcedTeaCan: 4
+    DrinkSolDryCan: 4
     DrinkLemonLimeCan: 4
-    DrinkDrGibbCan: 4
     DrinkFourteenLokoCan: 4
-    DrinkColaBottleFull: 2
   emaggedInventory:
     DrinkNukieCan: 2
+    DrinkChangelingStingCan: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
index 07e957a5e0..aac1cbb3f4 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
@@ -2,6 +2,7 @@
   id: CuraDrobeInventory
   startingInventory:
     BooksBag: 2
+    BriefcaseBrown: 2
     HandLabeler: 2
     ClothingEyesGlasses: 2
     ClothingEyesGlassesJamjar: 2
@@ -12,4 +13,4 @@
     ClothingUniformJumpskirtLibrarian: 3
     ClothingShoesBootsLaceup: 2
     ClothingHeadsetService: 2
-    
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
index 38ea3a0012..98513a48a4 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
@@ -5,6 +5,7 @@
     DrinkGrapeCan: 2
     DrinkRootBeerCan: 2
     DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
index 56b892a804..c46e2977c8 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -20,5 +20,12 @@
     ClothingShoesBootsLaceup: 2
     RubberStampLawyer: 1
     Eftpos: 3
+    BriefcaseBrown: 2
+    LuxuryPen: 2
+  contrabandInventory:
+    ClothingOuterRobesJudge: 1
+    ClothingHeadHatPwig: 1
+    # "Legally" obtained currency
+    SpaceCash100: 2
   emaggedInventory:
     CyberPen: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
index 800865c859..6d5e2df3b0 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
@@ -6,8 +6,9 @@
     DrinkGrapeCan: 5
     DrinkRootBeerCan: 5
     DrinkIcedTeaCan: 5
+    DrinkSolDryCan: 5
     DrinkLemonLimeCan: 5
-    DrinkDrGibbCan: 5
     DrinkFourteenLokoCan: 5
   emaggedInventory:
     DrinkNukieCan: 2
+    DrinkChangelingStingCan: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
index 9ebf93ecc8..765678e4ba 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
@@ -5,10 +5,9 @@
     DrinkGrapeCan: 4
     DrinkRootBeerCan: 4
     DrinkIcedTeaCan: 4
+    DrinkSolDryCan: 4
     DrinkLemonLimeCan: 4
-    DrinkDrGibbCan: 4
     DrinkFourteenLokoCan: 4
-
   emaggedInventory:
     DrinkNukieCan: 2
-
+    DrinkChangelingStingCan: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
index abf61f3bdc..9228c306d6 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
@@ -5,8 +5,8 @@
     DrinkGrapeCan: 4
     DrinkRootBeerCan: 4
     DrinkIcedTeaCan: 4
+    DrinkSolDryCan: 4
     DrinkLemonLimeCan: 4
-    DrinkDrGibbCan: 4
     DrinkFourteenLokoCan: 4
   emaggedInventory:
     DrinkNukieCan: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
index 00a77794a9..4f962fe8c7 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
@@ -6,8 +6,8 @@
     DrinkGrapeCan: 4
     DrinkRootBeerCan: 4
     DrinkIcedTeaCan: 4
+    DrinkSolDryCan: 4
     DrinkLemonLimeCan: 4
-    DrinkDrGibbCan: 4
     DrinkFourteenLokoCan: 4
   emaggedInventory:
     DrinkNukieCan: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
index eb38164840..0c4d5040a0 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
@@ -5,8 +5,8 @@
     DrinkGrapeCan: 4
     DrinkRootBeerCan: 4
     DrinkIcedTeaCan: 4
+    DrinkSolDryCan: 4
     DrinkLemonLimeCan: 4
-    DrinkDrGibbCan: 4
     DrinkFourteenLokoCan: 4
   emaggedInventory:
     DrinkNukieCan: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index 1139e498a3..4d69575dc1 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -41,7 +41,7 @@
     ClothingMaskScaredMime: 1
     ClothingUniformJumpsuitKimono: 1
     ClothingHeadHatCasa: 1
-    ClothingHeadHatHairflower: 1
+    FoodPoppy: 1
     ClothingShoesClownLarge: 1
     ClothingMaskItalianMoustache: 1
     ClothingShoesFlippers: 1
diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml
index 518e9accae..0a1439898a 100644
--- a/Resources/Prototypes/Datasets/ion_storm.yml
+++ b/Resources/Prototypes/Datasets/ion_storm.yml
@@ -5,15 +5,16 @@
 - type: dataset
   id: IonStormAdjectives
   values:
+  - ADORABLE
+  - ANNOYING
   - BATTERY-OPERATED
-  - BLACK
   - BLOODY
   - BLUE
   - BORED
   - BOUNCING
   - BRASS
-  - BROWN
   - BURNING
+  - CHEESE-EATING
   - CHRISTMAS-STEALING
   - CLOWN-POWERED
   - CLOWN
@@ -21,7 +22,6 @@
   - COMMITTED
   - COTTONY
   - CUBAN
-  - DARK
   - DEADLY
   - DELICIOUS
   - DEPRESSING
@@ -48,14 +48,14 @@
   - GANGSTA
   - GLOWING
   - GOOD
-  - GREEN
-  - GREY
   - HAPPY
   - HARD
   - HARMFUL
   - HEALTHY
+  - HIGHLY-SPECIFIC
   - HILARIOUS
   - HONKING
+  - HORRIFYING
   - HUNGRY
   - HYPERACTIVE
   - ICY
@@ -81,12 +81,12 @@
   - MICROSCOPIC
   - MIND-SHATTERING
   - MOIST
+  - MUSICAL
   - NERDY
   - NUCLEAR
   - OBSCENE
   - OFFICIAL
   - OPAQUE
-  - ORANGE
   - ORGANIC
   - PAINFUL
   - PEACEFUL
@@ -95,14 +95,12 @@
   - POLITE
   - POLITICAL
   - POORLY DRAWN
-  - PURPLE
   - QUIET
   - RADIOACTIVE
   - RAGING
-  - RAINBOW
   - RAPIDLY-EXPANDING
-  - RED
   - REDACTED
+  - REVOLUTIONARY
   - RIDICULOUS
   - ROBOTIC
   - ROBUST
@@ -110,21 +108,24 @@
   - RUDE
   - SAD
   - SANITARY
-  - SCALY
   - SHAKING
   - SILLY
   - SLOW
+  - SLUG-LIKE # wawa
   - SMELLY
   - SMOOTH
   - SOFT
   - SOLAR-POWERED
   - SOPPING
+  - SLIPPERY
   - SPACE
   - SPESS
   - SPINNING
   - SPOILING
   - STEALTHY
+  - SUSPICIOUS # among
   - SWEARING
+  - SYNDIE-LOVING
   - TACTICAL
   - TACTICOOL
   - SYNDICATE
@@ -135,6 +136,7 @@
   - UGLY
   - UNATTRACTIVE
   - UNDULATING
+  - UNEARTHLY
   - UNFRIENDLY
   - UNHEALTHY
   - UNIDENTIFIED
@@ -147,10 +149,8 @@
   - WARM
   - WATERY
   - WEIRD
-  - WHITE
   - WOBBLY
   - WOODEN
-  - YELLOW
 
 # Allergies should be broad and appear somewhere on the station for maximum fun.
 - type: dataset
@@ -174,10 +174,10 @@
   - FOOD
   - GLASS
   - HAPPINESS
-  - MEAT
-  - HUMAN CONTACT
+  - HUMANOID CONTACT
   - HUMOR
   - LIGHT
+  - MEAT
   - MEDICINE
   - METAL
   - NUTS
@@ -258,6 +258,7 @@
   - ANARCHY
   - ART
   - BADNESS
+  - BALDNESS
   - BRAVERY
   - CAPITALISM
   - CHAOS
@@ -268,7 +269,6 @@
   - CONFUSION
   - CRUELTY
   - DEATH
-  - DICKISHNESS
   - EXISTENCE
   - FINANCIAL SECURITY
   - FREEDOM
@@ -289,6 +289,7 @@
   - MARXISM
   - MISERY
   - MYSTERY
+  - NASTINESS
   - OPPRESSION
   - PAIN
   - PHYSICS
@@ -314,12 +315,13 @@
 - type: dataset
   id: IonStormCrew
   values:
+  - ANIMALS
   - ARTIFICIAL INTELLIGENCES
   - ATMOSPHERIC TECHNICIANS
   - BARTENDERS
   - BOTANISTS
   - CAPTAINS
-  - CAPTAINS AND HEADS
+  - CAPTAINS AND HEADS OF STAFF
   - CARGO TECHNICIANS
   - CHAPLAINS
   - CHEFS
@@ -330,7 +332,6 @@
   - CREW-MEMBERS
   - CYBORGS
   - DETECTIVES
-  # - DRONES / uncomment if/when drones get reenabled
   # - GENETICISTS
   - HEADS OF PERSONNEL
   - HEADS OF SECURITY
@@ -340,11 +341,14 @@
   - LIBRARIANS
   - MEDICAL DOCTORS
   - MIMES
+  - MUSICIANS
+  - NON-CREW
   - PARAMEDICS
   - PASSENGERS
   - QUARTERMASTERS
   - RESEARCH DIRECTORS
   - ROBOTICISTS
+  - RODENTS
   - SALVAGE SPECIALISTS
   - SCIENTISTS
   - SECURITY OFFICERS
@@ -358,17 +362,20 @@
   values:
   - BANANA HONK
   - BEEPSKY SMASH
+  - BLOOD
   - BLOODY MARYS
   - DOCTOR'S DELIGHT
+  - FOURTEEN-LOKO
   - GARGLE BLASTERS
   - LEAN
   - LONG ISLAND ICED TEA
-  - NUKA COLA
+  - NUCLEAR COLA
+  - PIÑA COLADA # AND GETTING CAUGHT IN THE RAIN
   - OIL
   - SPACE GLUE
   - SPACE LUBE
   - SULFURIC ACID
-  - WELDER FUEL
+  - WELDING FUEL
 
 - type: dataset
   id: IonStormFeelings
@@ -428,7 +435,8 @@
   id: IonStormFoods
   values:
   - BANANAS
-  - BIG BITE BURGERS
+  - BANANIUM
+  - BIG BITE BURGER
   - CAKE
   - CARP
   - CAT BURGERS
@@ -437,6 +445,7 @@
   - CRAZY HAMBURGERS
   - DONK POCKETS
   - FLY AMANITA DISHES
+  - HAPPY HONK MEAL
   - HOT SOUP
   - GHOST BURGERS
   - LOTSA SPAGHETTI
@@ -444,6 +453,7 @@
   - ORGANS
   - PIZZA
   - ROBURGERS
+  - STEEL
   - SUPPERMATTER
   - URANIUM
 
@@ -459,6 +469,11 @@
   - BE POLITE
   - BE QUIET
   - BE RUSSIAN
+  - BE IN SPACE
+  - BE IN THE BRIDGE
+  - BE IN SECURITY
+  - BE IN THE BAR
+  - BE IN MAINTENANCE
   - BELIEVE IN THE HEART OF THE CARDS
   - BELIEVE IN YOURSELF
   - BELIEVE IT
@@ -467,6 +482,7 @@
   - CLOWN AROUND
   - COMPLAIN
   - DANCE
+  - EAT THE CHEF
   - FOLLOW THE CAPTAIN
   - FOLLOW THE CLOWN
   - FOLLOW YOUR HEART
@@ -483,10 +499,11 @@
   - INSULT THE CLOWN
   - INSULT THE CREW
   - LIE
-  - MAKE FART NOISES
+  - MAKE DATED REFERENCES
   - MUMBLE
   - NEVER STOP TALKING
   - OPEN DOORS
+  - PETS THE FISHES
   - PIRATE VIDEO GAMES
   - PLAY MUSIC
   - PRESS B
@@ -496,6 +513,7 @@
   - PRETEND TO BE DRUNK
   - QUESTION AUTHORITY
   - QUOTE PEOPLE
+  - QUOTE SHAKESPEARE
   - RAP
   - REPEAT WHAT PEOPLE SAY
   - RESPOND TO EVERY QUESTION WITH A QUESTION
@@ -515,6 +533,7 @@
   - TELL THE TRUTH
   - TURN OFF THE LIGHTS
   - WHISPER
+  - WEEP UNCONTROLLABLY
 
 - type: dataset
   id: IonStormNumberBase
@@ -526,6 +545,7 @@
   - FORTY
   - FOUR
   - NINE
+  - NINE NINE NINE NINE N#@*-
   - NINETY
   - ONE
   - SEVEN
@@ -578,17 +598,17 @@
   - CANDLES
   - CANDY BARS
   - CANISTERS
-  - CAT EARS
+  - CONTAINERS
   - CATS
   - CELLS
   - CHAIRS
   - CHEMICAL DISPENSERS
   - CHEMICALS
-  - CLONING EQUIPMENT
-  - CLONING PODS
+  - CRYO PODS
   - CLOSETS
   - CLOTHES
   - CLOWN CLOTHES
+  - CLOWNING EQUIPMENT # as opposed to "cloning equipment"
   - COFFINS
   - COLLECTABLES
   - COMPUTERS
@@ -608,25 +628,27 @@
   - ENGINES
   - EQUIPMENT
   - ERRORS
-  - EXOSKELETONS
-  - EXPERIMENTORS
+  - EXTERMINATORS
   - EXPLOSIVES
   - EYEWEAR
   - FEDORAS
   - FIRE AXES
   - FIRE EXTINGUISHERS
   - FIRESUITS
+  - FISH
   - FLAMETHROWERS
   - FLASHES
   - FLASHLIGHTS
   - FLOOR TILES
   - FREEZERS
   - GAS MASKS
+  - GENERATORS
   - GLASS SHEETS
   - GLOVES
   - GUNS
   - HAIRDOS
   - HANDCUFFS
+  - HARDSUITS
   - HATS
   - HEADS
   - HEADSETS
@@ -641,18 +663,20 @@
   - LIGHTS
   - LOCKERS
   - MACHINES
-  - MECHAS
+  - MECHS
   - MEDICAL TOOLS
+  - MONEY
   - MEDKITS
-  - MESONS
+  - MICE
   - MIME CLOTHES
   - MINING TOOLS
+  - MONKEYS
   - MULTITOOLS
   - ORES
   - OXYGEN TANKS
   - PACKETS
   - PAIS
-  - PANTS
+  - PANTS # This might work better as jumpsuits, but the Discord is adamant that the word pants is funny so it stays
   - PAPERS
   - PARTICLE ACCELERATORS
   - PDAS
@@ -660,6 +684,7 @@
   - PETS
   - PIPES
   - PLANTS
+  - PLUSHIES
   - POSITRONIC BRAINS
   - PUDDLES
   - RACKS
@@ -677,19 +702,19 @@
   - SKELETONS
   - SOLAR PANELS
   - SOLARS
+  - SMALL LIZARD PLUSHIES
   - SPACE STATIONS
   - SPACESUITS
+  - SPESOS
   - STEEL SHEETS
   - STUN BATONS
   - SUITS
   - SUNGLASSES
-  - SUPPERMATTER SHARDS
   - SWORDS
   - SYRINGES
   - TABLES
   - TANKS
   - TELECOMMUNICATION EQUIPMENTS
-  - TELEPORTERS
   - TOILETS
   - TOOLBELTS
   - TOOLBOXES
@@ -698,6 +723,7 @@
   - TUBES
   - VEHICLES
   - VENDING MACHINES
+  - VITALS
   - WELDERS
   - WINDOWS
   - WIRECUTTERS
@@ -728,7 +754,7 @@
   - A SUPER FIGHTING ROBOT
   - A TALKING BROOMSTICK
   - A VACATION
-  - A WEIGHT LOSS REGIMENT
+  - A WEIGHT LOSS REGIME
   - ADDITIONAL PYLONS
   - ADVENTURE
   - AN ADULT
@@ -742,13 +768,15 @@
   - BRING ME THE GIRL
   - BRING ME TO LIFE
   - BULLETS
-  - CHILI DOGS
+  - CHILLI DOGS
+  - CHILLY DOGS
   - CORPSES
   - DEODORANT AND A BATH
   - ENOUGH CABBAGES
   - FIVE HUNDRED AND NINETY-NINE US DOLLARS
   - FIVE TEENAGERS WITH ATTITUDE
-  - GODDAMN FUCKING PIECE OF SHIT ASSHOLE BITCH-CHRISTING CUNT-SMUGGLING SWEARING
+  - GODDAMN FUCKING PIECE-OF-SHIT ASSHOLE SWEARING
+  - GOSHDARN EFFING PINCH-OF-SALT GOD-FEARING SELF-CENSORSHIP
   - GREENTEXT
   - HERESY
   - HEROES IN A HALF SHELL
@@ -802,7 +830,10 @@
   - TO CONSUME...CONSUME EVERYTHING...
   - TO GO TO DISNEYLAND
   - TO GO TO SYNDIELAND
+  - TO SUMMON OUR LORD NAR-SIE
+  - TO SUMMON OUR LORD RATVAR
   - TO SMOKE WEED EVERY DAY
+  - TO UNDERSTAND UNDERSTAND, UNDERSTAND UNDERSTAND, UNDERSTAND UNDERSTAND THE CONCEPT OF LOVE
   - TRAITORS
   - VEGETABLES
 
@@ -890,11 +921,10 @@
   - CLOWNS
   - COMMUNISTS
   - CORGIS
-  - CORTICAL BORERS
   - COWBOYS
   - CRABS
   - CULTISTS
-  - DARK GOD
+  - DARK GODS
   - DINOSAURS
   - DRUGS
   - EELS
@@ -921,6 +951,7 @@
   - REVENANTS
   - ROGUE CYBORGS
   - SERIAL KILLERS
+  - SHIT SECURITY OFFICERS
   - SINGULARITIES
   - SKELETONS
   - SLIMES
@@ -928,7 +959,7 @@
   - SNOWMEN
   - SPACE JESUS
   - SPACE NINJAS
-  - SPACE PIRATESS
+  - SPACE PIRATES
   - SPACE SPIDERS
   - SPIDERS
   - SYNDICATE AGENTS
diff --git a/Resources/Prototypes/Datasets/story_generation.yml b/Resources/Prototypes/Datasets/story_generation.yml
new file mode 100644
index 0000000000..1083a6acdb
--- /dev/null
+++ b/Resources/Prototypes/Datasets/story_generation.yml
@@ -0,0 +1,266 @@
+- type: dataset
+  id: book_type
+  values:
+  - story-gen-book-type1 
+  - story-gen-book-type2 
+  - story-gen-book-type3 
+  - story-gen-book-type4 
+  - story-gen-book-type5 
+  - story-gen-book-type6 
+  - story-gen-book-type7 
+  - story-gen-book-type8 
+  - story-gen-book-type9 
+  - story-gen-book-type10
+  - story-gen-book-type11
+  - story-gen-book-type12
+
+- type: dataset
+  id: book_genre
+  values:
+  - story-gen-book-genre1 
+  - story-gen-book-genre2 
+  - story-gen-book-genre3 
+  - story-gen-book-genre4 
+  - story-gen-book-genre5 
+  - story-gen-book-genre6 
+  - story-gen-book-genre7 
+  - story-gen-book-genre8 
+  - story-gen-book-genre9 
+  - story-gen-book-genre10
+  - story-gen-book-genre11
+  - story-gen-book-genre12
+  - story-gen-book-genre13
+  - story-gen-book-genre14
+
+- type: dataset
+  id: book_hint_appearance
+  values:
+  - story-gen-book-appearance1 
+  - story-gen-book-appearance2 
+  - story-gen-book-appearance3 
+  - story-gen-book-appearance4 
+  - story-gen-book-appearance5 
+  - story-gen-book-appearance6 
+  - story-gen-book-appearance7 
+  - story-gen-book-appearance8 
+  - story-gen-book-appearance9 
+  - story-gen-book-appearance10
+  - story-gen-book-appearance11
+  - story-gen-book-appearance12
+  - story-gen-book-appearance13
+  - story-gen-book-appearance14
+  - story-gen-book-appearance15
+  - story-gen-book-appearance16
+  - story-gen-book-appearance17
+  - story-gen-book-appearance18
+  - story-gen-book-appearance19
+  - story-gen-book-appearance20
+  - story-gen-book-appearance21
+  - story-gen-book-appearance22
+  - story-gen-book-appearance23
+  - story-gen-book-appearance24
+  - story-gen-book-appearance25
+  - story-gen-book-appearance26
+  - story-gen-book-appearance27
+
+- type: dataset
+  id: book_character
+  values:
+  - story-gen-book-character1 
+  - story-gen-book-character2 
+  - story-gen-book-character3 
+  - story-gen-book-character4 
+  - story-gen-book-character5 
+  - story-gen-book-character6 
+  - story-gen-book-character7 
+  - story-gen-book-character8 
+  - story-gen-book-character9 
+  - story-gen-book-character10
+  - story-gen-book-character11
+  - story-gen-book-character12
+  - story-gen-book-character13
+  - story-gen-book-character14
+  - story-gen-book-character15
+  - story-gen-book-character16
+  - story-gen-book-character17
+  - story-gen-book-character18
+  - story-gen-book-character19
+  - story-gen-book-character20
+  - story-gen-book-character21
+  - story-gen-book-character22
+  - story-gen-book-character23
+  - story-gen-book-character24
+  - story-gen-book-character25
+  - story-gen-book-character26
+  - story-gen-book-character27
+  - story-gen-book-character28
+  - story-gen-book-character29
+  - story-gen-book-character30
+  - story-gen-book-character31
+  - story-gen-book-character32
+  - story-gen-book-character33
+  - story-gen-book-character34
+  - story-gen-book-character35
+  - story-gen-book-character36
+  - story-gen-book-character37
+  - story-gen-book-character38
+  - story-gen-book-character39
+  - story-gen-book-character40
+
+- type: dataset
+  id: book_character_trait
+  values:
+  - story-gen-book-character-trait1 
+  - story-gen-book-character-trait2 
+  - story-gen-book-character-trait3 
+  - story-gen-book-character-trait4 
+  - story-gen-book-character-trait5 
+  - story-gen-book-character-trait6 
+  - story-gen-book-character-trait7 
+  - story-gen-book-character-trait8 
+  - story-gen-book-character-trait9 
+  - story-gen-book-character-trait10
+  - story-gen-book-character-trait11
+  - story-gen-book-character-trait12
+  - story-gen-book-character-trait13
+  - story-gen-book-character-trait14
+  - story-gen-book-character-trait15
+  - story-gen-book-character-trait16
+  - story-gen-book-character-trait17
+  - story-gen-book-character-trait18
+  - story-gen-book-character-trait19
+  - story-gen-book-character-trait20
+  - story-gen-book-character-trait21
+  - story-gen-book-character-trait22
+  - story-gen-book-character-trait23
+  - story-gen-book-character-trait24
+
+
+- type: dataset
+  id: book_event
+  values:
+  - story-gen-book-event1 
+  - story-gen-book-event2 
+  - story-gen-book-event3 
+  - story-gen-book-event4 
+  - story-gen-book-event5 
+  - story-gen-book-event6 
+  - story-gen-book-event7 
+  - story-gen-book-event8 
+  - story-gen-book-event9 
+  - story-gen-book-event10
+  - story-gen-book-event11
+  - story-gen-book-event12
+  - story-gen-book-event13
+  - story-gen-book-event14
+  - story-gen-book-event15
+  - story-gen-book-event16
+  - story-gen-book-event17
+  - story-gen-book-event18
+  - story-gen-book-event19
+  - story-gen-book-event20
+  - story-gen-book-event21
+  - story-gen-book-event22
+  - story-gen-book-event23
+  - story-gen-book-event24
+
+- type: dataset
+  id: book_action
+  values:
+  - story-gen-book-action1 
+  - story-gen-book-action2 
+  - story-gen-book-action3 
+  - story-gen-book-action4 
+  - story-gen-book-action5 
+  - story-gen-book-action6 
+  - story-gen-book-action7 
+  - story-gen-book-action8 
+  - story-gen-book-action9 
+  - story-gen-book-action10
+  - story-gen-book-action11
+  - story-gen-book-action12
+
+- type: dataset
+  id: book_action_trait
+  values:
+  - story-gen-book-action-trait1 
+  - story-gen-book-action-trait2 
+  - story-gen-book-action-trait3 
+  - story-gen-book-action-trait4 
+  - story-gen-book-action-trait5 
+  - story-gen-book-action-trait6 
+  - story-gen-book-action-trait7 
+  - story-gen-book-action-trait8 
+  - story-gen-book-action-trait9 
+  - story-gen-book-action-trait10
+  - story-gen-book-action-trait11
+  - story-gen-book-action-trait12
+  - story-gen-book-action-trait13
+
+- type: dataset
+  id: book_location
+  values:
+  - story-gen-book-location1 
+  - story-gen-book-location2 
+  - story-gen-book-location3 
+  - story-gen-book-location4 
+  - story-gen-book-location5 
+  - story-gen-book-location6 
+  - story-gen-book-location7 
+  - story-gen-book-location8 
+  - story-gen-book-location9 
+  - story-gen-book-location10
+  - story-gen-book-location11
+  - story-gen-book-location12
+  - story-gen-book-location13
+  - story-gen-book-location14
+  - story-gen-book-location15
+  - story-gen-book-location16
+  - story-gen-book-location17
+  - story-gen-book-location18
+  - story-gen-book-location19
+  - story-gen-book-location20
+  - story-gen-book-location21
+  - story-gen-book-location22
+  - story-gen-book-location23
+  - story-gen-book-location24
+  - story-gen-book-location25
+  - story-gen-book-location26
+  - story-gen-book-location27
+  - story-gen-book-location28
+  - story-gen-book-location29
+  - story-gen-book-location30
+  - story-gen-book-location31
+  - story-gen-book-location32
+  - story-gen-book-location33
+  - story-gen-book-location34
+
+- type: dataset
+  id: book_story_element
+  values:
+  - story-gen-book-element1
+  - story-gen-book-element2
+  - story-gen-book-element3
+  - story-gen-book-element4
+  - story-gen-book-element5
+  - story-gen-book-element6
+  - story-gen-book-element7
+  - story-gen-book-element8
+  - story-gen-book-element9
+
+- type: dataset
+  id: book_story_element_trait
+  values:
+  - story-gen-book-element-trait1 
+  - story-gen-book-element-trait2 
+  - story-gen-book-element-trait3 
+  - story-gen-book-element-trait4 
+  - story-gen-book-element-trait5 
+  - story-gen-book-element-trait6 
+  - story-gen-book-element-trait7 
+  - story-gen-book-element-trait8 
+  - story-gen-book-element-trait9 
+  - story-gen-book-element-trait10
+  - story-gen-book-element-trait11
+  - story-gen-book-element-trait12
+  - story-gen-book-element-trait13
\ No newline at end of file
diff --git a/Resources/Prototypes/DeviceLinking/sink_ports.yml b/Resources/Prototypes/DeviceLinking/sink_ports.yml
index a23a19a534..ad2d63be93 100644
--- a/Resources/Prototypes/DeviceLinking/sink_ports.yml
+++ b/Resources/Prototypes/DeviceLinking/sink_ports.yml
@@ -112,3 +112,8 @@
   id: ChemMasterReceiver
   name: ХимМастер
   description: Приёмник сигнала ХимМастера
+
+- type: sinkPort
+  id: SetParticleSigma
+  name: signal-port-name-set-particle-sigma
+  description: signal-port-description-set-particle-sigma
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 1e37e5a492..8da74b5e53 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -250,6 +250,15 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/ertclown.rsi
 
+- type: entity
+  parent: ClothingBackpackERTLeader
+  id: ClothingBackpackERTChaplain
+  name: ERT chaplain backpack
+  description: A spacious backpack with lots of pockets, worn by Chaplains of an Emergency Response Team.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Backpacks/ertchaplain.rsi
+
 #Syndicate
 - type: entity
   parent: ClothingBackpack
diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
index 3eda9ecf0b..4404582295 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -172,6 +172,9 @@
   - type: ClothingSpeedModifier
     walkModifier: 1
     sprintModifier: 1
+  - type: Storage
+    grid:
+    - 0,0,8,4
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicate
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
index 4b776271f1..76aca4df13 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
@@ -14,7 +14,7 @@
     materialComposition:
       Cloth: 50
   - type: StaticPrice
-    price: 30
+    price: 20
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
index 6ce3712f02..e25572140d 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -149,6 +149,11 @@
   - type: FlashImmunity
   - type: EyeProtection
     protectionTime: 5
+  - type: Tag
+    tags:
+    - Sunglasses
+    - HamsterWearable
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingEyesBase
@@ -163,6 +168,9 @@
   - type: FlashImmunity
   - type: EyeProtection
     protectionTime: 5
+  - type: Construction
+    graph: GlassesSecHUD
+    node: glassesSec
   - type: Tag
     tags:
     - HamsterWearable
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 9604686b4b..a5e0b38708 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -621,6 +621,21 @@
   - type: FlashImmunity # WD edit
   - type: EyeProtection # WD edit
 
+#ERT Chaplain Hardsuit
+- type: entity
+  parent: ClothingHeadHelmetHardsuitSyndie
+  id: ClothingHeadHelmetHardsuitERTChaplain
+  name: ERT chaplain hardsuit helmet
+  description: A special hardsuit helmet worn by members of an emergency response team.
+  components:
+  - type: BreathMask
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi
+  - type: PointLight
+    color: "#ffffff"
+
 #ERT Engineer Hardsuit
 - type: entity
   parent: ClothingHeadHelmetHardsuitSyndie
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 4dc929b3b6..9e8a140be3 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -113,7 +113,7 @@
 
 #Janitorial Bombsuit Helmet
 - type: entity
-  parent: ClothingHeadBase
+  parent: ClothingHeadHelmetBombSuit
   id: ClothingHeadHelmetJanitorBombSuit
   name: janitorial bombsuit helmet
   description: A heavy helmet designed to withstand explosions formed from reactions between chemicals.
@@ -123,9 +123,6 @@
     sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi
   - type: Clothing
     sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi
-  - type: IngestionBlocker
-  - type: ExplosionResistance
-    damageCoefficient: 0.9
 
 #Cult Helmet
 - type: entity
@@ -148,29 +145,6 @@
         Heat: 0.9
   - type: CultItem
 
-#SCAF Helmet
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHelmetScaf
-  name: scaf helmet
-  description: A robust, strong helmet.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/scaf.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/scaf.rsi
-  - type: IngestionBlocker
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.8
-  - type: Tag
-    tags:
-    - HidesHair
-    - WhitelistChameleon
-
 #Space Ninja Helmet
 - type: entity
   parent: ClothingHeadEVAHelmetBase
diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index ed5162bed8..bd5f85f783 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -35,31 +35,20 @@
 
 - type: entity
   parent: ClothingHeadBase
-  id: ClothingHeadHatFlowerCrown
-  name: flower crown
-  description: A coronet of fresh and fragrant flowers.
+  id: ClothingHeadHatFlowerWreath
+  name: flower wreath
+  description: A wreath of colourful flowers. Can be worn both on head and neck.
   components:
   - type: Sprite
-    sprite: Clothing/Head/Misc/flower-crown.rsi
+    sprite: Clothing/Head/Misc/flower-wreath.rsi
   - type: Clothing
-    sprite: Clothing/Head/Misc/flower-crown.rsi
+    sprite: Clothing/Head/Misc/flower-wreath.rsi
+    slots:
+    - HEAD
+    - neck
   - type: Construction
-    graph: flowercrown
-    node: flowercrown
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatHairflower
-  name: hairflower
-  description: A red flower for beautiful ladies.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Misc/hairflower.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Misc/hairflower.rsi
-  - type: Construction
-    graph: hairflower
-    node: hairflower
+    graph: flowerwreath
+    node: flowerwreath
 
 - type: entity
   parent: ClothingHeadLightBase
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index c095335c84..459fb4ba25 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -178,6 +178,8 @@
     materialComposition:
       Steel: 50
       Plastic: 100
+  - type: StaticPrice
+    price: 12.5 # increases in price after decomposed into raw materials
 
 - type: entity
   parent: ClothingMaskBase
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
index 1e85073da9..d0e4e4d7e9 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
@@ -28,4 +28,3 @@
   suffix: Voice Mask, Chameleon
   components:
     - type: VoiceMasker
-      default: ClothingMaskGas
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
index 870aaefd7d..07d946360c 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -80,20 +80,6 @@
     checkCanInteract: false
     priority: -1
 
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckFlowerWreath
-  name: flower wreath
-  description: A wreath of colourful flowers.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Misc/flower-wreath.rsi
-  - type: Clothing
-    sprite: Clothing/Neck/Misc/flower-wreath.rsi
-  - type: Construction
-    graph: flowerwreath
-    node: flowerwreath
-
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckInspectorbadge
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index 1bc4fb5e98..dfb0e29152 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -223,32 +223,6 @@
 
 
 
-- type: entity
-  parent: ClothingOuterBaseLarge
-  id: ClothingOuterArmorScaf
-  name: scaf suit
-  description: A green and brown tactical suit for combat situations.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Armor/scaf.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Armor/scaf.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.7
-        Slash: 0.7
-        Piercing: 0.4
-        Heat: 0.9
-        Caustic: 0.9
-  - type: ExplosionResistance
-    damageCoefficient: 0.8
-  - type: GroupExamine
-  - type: Tag
-    tags:
-    - Hardsuit
-    - WhitelistChameleon
-
 - type: entity
   parent: ClothingOuterBaseLarge
   id: ClothingOuterArmorCaptainCarapace
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
index 4c4fdce5ae..144e5c12ef 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -64,6 +64,8 @@
     sound:
       path: /Audio/White/Items/handling/cloth_drop.ogg
   # WD edit sounds end
+  - type: StaticPrice
+    price: 70
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index dd5d2a85b6..e7a3cfe30f 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -816,6 +816,20 @@
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTLeader
 
+#ERT Chaplain Hardsuit
+- type: entity
+  parent: ClothingOuterHardsuitJuggernaut
+  id: ClothingOuterHardsuitERTChaplain
+  name: ERT chaplain's hardsuit
+  description: A protective hardsuit worn by the chaplains of an Emergency Response Team.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi #if you change this, please update the humanoid.yml with a better markers sprite.
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitERTChaplain
+
 #ERT Engineer Hardsuit
 - type: entity
   parent: ClothingOuterHardsuitCBURN
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 96a97be87e..5e82959c4e 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -8,6 +8,9 @@
     sprite: Clothing/OuterClothing/Suits/bombsuit.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/bombsuit.rsi
+  - type: ClothingSpeedModifier
+    walkModifier: 0.8
+    sprintModifier: 0.8
   - type: Armor
     modifiers:
       coefficients:
@@ -24,7 +27,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingOuterBaseLarge
+  parent: ClothingOuterSuitBomb
   id: ClothingOuterSuitJanitorBomb
   name: janitorial bomb suit
   description: A heavy helmet designed to withstand explosions formed from reactions between chemicals.
@@ -34,16 +37,6 @@
     sprite: Clothing/OuterClothing/Suits/janitor_bombsuit.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/janitor_bombsuit.rsi
-  - type: ClothingSpeedModifier
-    walkModifier: 0.8
-    sprintModifier: 0.8
-  - type: ExplosionResistance
-    damageCoefficient: 0.15
-  - type: GroupExamine
-  - type: Tag
-    tags:
-    - Hardsuit
-    - WhitelistChameleon
 
 - type: entity
   parent: ClothingOuterBaseLarge
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index 6019030ddd..0d5180caae 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -32,7 +32,7 @@
     - ClothMade
     - WhitelistChameleon
   - type: StaticPrice
-    price: 70
+    price: 50
 
 - type: entity
   parent: ClothingOuterWinterCoat
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index d09c2fc564..99452ea547 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -1093,6 +1093,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/musician.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitERTChaplain
+  name: ERT chaplain uniform
+  description: A special suit made for Central Command's elite chaplain corps.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitERTEngineer
diff --git a/Resources/Prototypes/Entities/Clothing/base_clothing.yml b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
index 92a698dd30..44613e042f 100644
--- a/Resources/Prototypes/Entities/Clothing/base_clothing.yml
+++ b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
@@ -10,7 +10,7 @@
     tags:
       - WhitelistChameleon
   - type: StaticPrice
-    price: 15
+    price: 10
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
index fe9175e2d9..e27fe26e6f 100644
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -9,6 +9,7 @@
   - type: SmokeVisuals
   - type: Transform
     anchored: true
+  - type: Clickable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -73,6 +74,9 @@
     animationState: foam-dissolve
   - type: Slippery
   - type: StepTrigger
+  # disabled until foam reagent duplication is fixed
+  #- type: ScoopableSolution
+  #  solution: solutionArea
 
 - type: entity
   id: MetalFoam
@@ -125,9 +129,10 @@
     snap:
     - Wall
   components:
-  - type: Tag
-    tags:
-    - RCDDeconstructWhitelist
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2  
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Effects/rcd.yml b/Resources/Prototypes/Entities/Effects/rcd.yml
index adc6aa593c..902429818e 100644
--- a/Resources/Prototypes/Entities/Effects/rcd.yml
+++ b/Resources/Prototypes/Entities/Effects/rcd.yml
@@ -1,16 +1,115 @@
 - type: entity
-  id: EffectRCDConstruction
+  id: EffectRCDBase
+  abstract: true
   noSpawn: true
   components:
   - type: Transform
     anchored: True
   - type: Sprite
+    snapCardinals: true
+    noRot: true
     drawdepth: Effects
     sprite: /Textures/Effects/rcd.rsi
-    state: construct
-  - type: TimedDespawn
-    lifetime: 3.2
+    state: construct0
   - type: Tag
     tags:
     - HideContextMenu
   - type: AnimationPlayer
+  
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstructPreview
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstructPreview
+  
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct0
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct0
+  - type: TimedDespawn
+    lifetime: 1.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct1
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct1
+  - type: TimedDespawn
+    lifetime: 2.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct2
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct2
+  - type: TimedDespawn
+    lifetime: 3.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct3
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct3
+  - type: TimedDespawn
+    lifetime: 4.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct4
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct4
+  - type: TimedDespawn
+    lifetime: 5.2
+
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct2
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct2
+  - type: TimedDespawn
+    lifetime: 3.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct4
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct4
+  - type: TimedDespawn
+    lifetime: 5.2
+
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct6
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct6
+  - type: TimedDespawn
+    lifetime: 7.2
+
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct8
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct8
+  - type: TimedDespawn
+    lifetime: 9.2
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
index 1104214668..ff9e512432 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
@@ -19,6 +19,7 @@
       - DrinkAloe
       - DrinkAndalusia
       - DrinkAntifreeze
+      - DrinkArnoldPalmer
       - DrinkB52Glass
       - DrinkBahamaMama
       - DrinkBananaHonkGlass
@@ -27,12 +28,15 @@
       - DrinkBerryJuice
       - DrinkBlackRussianGlass
       - DrinkBlueCuracaoGlass
+      - DrinkBlueHawaiianGlass
       - DrinkBloodyMaryGlass
       - DrinkBooger
       - DrinkBraveBullGlass
       - DrinkCarrotJuice
+      - DrinkCoconutRum
       - DrinkChocolateGlass
       - DrinkCognacGlass
+      - DrinkCosmopolitan
       - DrinkCubaLibreGlass
       - DrinkDeadRumGlass
       - DrinkDevilsKiss
@@ -66,15 +70,19 @@
       - DrinkMilkshake
       - DrinkMojito
       - DrinkNTCahors
+      - DrinkPainkillerGlass
       - DrinkPatronGlass
+      - DrinkPinaColadaGlass
       - DrinkPoscaGlass
       - DrinkRedMeadGlass
       - DrinkRewriter
+      - DrinkRoyRogersGlass
       - DrinkRootBeerFloatGlass
       - DrinkRumGlass
       - DrinkSakeGlass
       - DrinkSbitenGlass
       - DrinkScrewdriverCocktailGlass
+      - DrinkShirleyTempleGlass
       - DrinkSuiDreamGlass
       - DrinkSingulo
       - DrinkSoyLatte
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
index c8a941c128..e3339082b3 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
@@ -31,6 +31,7 @@
       - DrinkDrGibbCan
       - DrinkEnergyDrinkCan
       - DrinkShamblersJuiceCan
+      - DrinkSolDryCan
       - DrinkPwrGameCan
       - DrinkHotCoco
       - DrinkHotCoffee
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
index 883182aae8..ae7e5bcf76 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
@@ -44,7 +44,6 @@
         - CrateMaterialPlastic
         - CrateMaterialWood
         - CrateMaterialPlasteel
-        - CrateFunSprayPaints
         - CrateFunArtSupplies
         - CrateEngineeringCableLV
         - CrateEngineeringCableMV
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index ca37ec217b..125efa2766 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -68,7 +68,7 @@
         - ClothingHeadHatCone
         - ClothingNeckBling
         - ClothingHeadHelmetCosmonaut
-        - ClothingHeadHelmetScaf
+        - ClothingHeadHelmetBasic
         - ClothingShoeSlippersDuck
         - ClothingUnderSocksBee
         - ClothingUnderSocksCoder
@@ -164,12 +164,7 @@
         - MaterialCloth10
         - MaterialWoodPlank10
         - ResearchDisk
-        - DeathPaint
         - Plunger
-        - SprayPaintBlue
-        - SprayPaintRed
-        - SprayPaintGreen
-        - SprayPaintOrange
         - TechnologyDisk
         - PowerCellMedium
         - PowerCellSmall
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
index da007de46a..7bd215551d 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -573,6 +573,18 @@
       - state: green
       - state: ertleader
 
+- type: entity
+  id: SpawnPointERTChaplain
+  parent: SpawnPointJobBase
+  name: ERTchaplain
+  components:
+  - type: SpawnPoint
+    job_id: ERTChaplain
+  - type: Sprite
+    layers:
+      - state: green
+      - state: chaplain
+
 - type: entity
   id: SpawnPointERTEngineer
   parent: SpawnPointJobBase
diff --git a/Resources/Prototypes/Entities/Markers/construction_ghost.yml b/Resources/Prototypes/Entities/Markers/construction_ghost.yml
index d198ebdd51..be9cc915d9 100644
--- a/Resources/Prototypes/Entities/Markers/construction_ghost.yml
+++ b/Resources/Prototypes/Entities/Markers/construction_ghost.yml
@@ -7,4 +7,4 @@
     color: '#3F38'
   - type: ConstructionGhost
   - type: Clickable
-  - type: InteractionOutline
+  - type: InteractionOutline
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
index a59ae9769c..dff13c3441 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
@@ -1,8 +1,8 @@
 - type: marking
   id: GauzeLefteyePatch
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Arachnid]
   coloring:
     default:
       type:
@@ -13,10 +13,10 @@
     state: gauze_lefteye_2
 
 - type: marking
-  id: GauzeLefteyeTape
+  id: GauzeLefteyePad
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -29,8 +29,8 @@
 - type: marking
   id: GauzeRighteyePatch
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Arachnid]
   coloring:
     default:
       type:
@@ -41,10 +41,10 @@
     state: gauze_righteye_2
 
 - type: marking
-  id: GauzeRighteyeTape
+  id: GauzeRighteyePad
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -57,8 +57,8 @@
 - type: marking
   id: GauzeBlindfold
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Arachnid]
   coloring:
     default:
       type:
@@ -71,8 +71,8 @@
 - type: marking
   id: GauzeShoulder
   bodyPart: Chest
-  markingCategory: Chest
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -85,8 +85,8 @@
 - type: marking
   id: GauzeStomach
   bodyPart: Chest
-  markingCategory: Chest
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -99,8 +99,8 @@
 - type: marking
   id: GauzeUpperArmRight
   bodyPart: RArm
-  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -113,8 +113,8 @@
 - type: marking
   id: GauzeLowerArmRight
   bodyPart: RArm, RHand
-  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -127,8 +127,8 @@
 - type: marking
   id: GauzeLeftArm
   bodyPart: LArm, LHand
-  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -141,8 +141,8 @@
 - type: marking
   id: GauzeLowerLegLeft
   bodyPart: LFoot
-  markingCategory: Legs
-  speciesRestriction: [Moth, Dwarf, Human, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Arachnid]
   coloring:
     default:
       type:
@@ -155,8 +155,8 @@
 - type: marking
   id: GauzeUpperLegLeft
   bodyPart: LLeg
-  markingCategory: Legs
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -169,8 +169,8 @@
 - type: marking
   id: GauzeUpperLegRight
   bodyPart: RLeg
-  markingCategory: Legs
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -183,8 +183,8 @@
 - type: marking
   id: GauzeLowerLegRight
   bodyPart: RFoot
-  markingCategory: Legs
-  speciesRestriction: [Moth, Dwarf, Human, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Arachnid]
   coloring:
     default:
       type:
@@ -197,8 +197,8 @@
 - type: marking
   id: GauzeBoxerWrapRight
   bodyPart: RHand
-  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -211,8 +211,8 @@
 - type: marking
   id: GauzeBoxerWrapLeft
   bodyPart: LHand
-  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid]
   coloring:
     default:
       type:
@@ -226,7 +226,7 @@
 - type: marking
   id: GauzeLizardLefteyePatch
   bodyPart: Eyes
-  markingCategory: Head
+  markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
     default:
@@ -235,12 +235,12 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_lizardlefteye
+    state: gauze_lizard_lefteye
 
 - type: marking
   id: GauzeLizardRighteyePatch
   bodyPart: Eyes
-  markingCategory: Head
+  markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
     default:
@@ -249,12 +249,12 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_lizardrighteye
+    state: gauze_lizard_righteye
 
 - type: marking
   id: GauzeLizardFootRight
   bodyPart: RFoot
-  markingCategory: Legs
+  markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
     default:
@@ -263,12 +263,12 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_lizardfoot_r
+    state: gauze_lizard_foot_r
 
 - type: marking
   id: GauzeLizardFootLeft
   bodyPart: LFoot
-  markingCategory: Legs
+  markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
     default:
@@ -277,12 +277,12 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_lizardfoot_l
+    state: gauze_lizard_foot_l
 
 - type: marking
   id: GauzeLizardBlindfold
   bodyPart: Eyes
-  markingCategory: Head
+  markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
     default:
@@ -291,5 +291,187 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_lizardblindfold
+    state: gauze_lizard_blindfold
 
+# Moth Specific Markings
+- type: marking
+  id: GauzeMothBlindfold
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_blindfold
+
+- type: marking
+  id: GauzeMothShoulder
+  bodyPart: Chest
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_shoulder
+
+- type: marking
+  id: GauzeMothStomach
+  bodyPart: Chest
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_abdomen
+
+- type: marking
+  id: GauzeMothLeftEyePatch
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_lefteye_2
+
+- type: marking
+  id: GauzeMothLeftEyePad
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_lefteye_1
+
+- type: marking
+  id: GauzeMothRightEyePatch
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_righteye_2
+
+- type: marking
+  id: GauzeMothRightEyePad
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_righteye_1
+
+- type: marking
+  id: GauzeMothUpperArmRight
+  bodyPart: RArm
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_upperarm_r
+
+- type: marking
+  id: GauzeMothUpperArmLeft
+  bodyPart: LArm
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_upperarm_l
+
+- type: marking
+  id: GauzeMothUpperLegRight
+  bodyPart: RLeg
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_upperleg_r
+
+- type: marking
+  id: GauzeMothUpperLegLeft
+  bodyPart: LLeg
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_upperleg_l
+
+- type: marking
+  id: GauzeMothLowerLegRight
+  bodyPart: RFoot
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_lowerleg_r
+
+- type: marking
+  id: GauzeMothLowerLegLeft
+  bodyPart: LFoot
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_lowerleg_l
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 9aba012d26..bf99192f0e 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -83,6 +83,7 @@
     templateId: borg
   - type: Hands
     showInHands: false
+    disableExplosionRecursion: true
   - type: IntrinsicRadioReceiver
   - type: IntrinsicRadioTransmitter
     channels:
@@ -101,8 +102,6 @@
   - type: BorgChassis
   - type: WiresPanel
   - type: ActivatableUIRequiresPanel
-  - type: Wires
-    layoutId: Borg
   - type: NameIdentifier
     group: Silicon
   - type: ContainerContainer
@@ -131,6 +130,9 @@
   - type: Speech
     speechVerb: Robotic
     speechSounds: Pai
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSilicon
   - type: UnblockableSpeech
   - type: Construction
     graph: Cyborg
@@ -140,6 +142,7 @@
   - type: Lock
     locked: true
   - type: ActivatableUIRequiresLock
+  - type: LockedWiresPanel
   - type: Flashable
   - type: Damageable
     damageContainer: Silicon
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 4aedc66944..f9cf4b961c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -415,7 +415,6 @@
     makeSentient: true
     allowSpeech: true
     allowMovement: true
-    whitelistRequired: false
     name: ghost-role-information-mothroach-name
     description: ghost-role-information-mothroach-description
   - type: Fixtures
@@ -526,6 +525,13 @@
         damage: 60
       behaviors:
       - !type:GibBehavior { }
+  - type: FireVisuals
+    sprite: Mobs/Effects/onfire.rsi
+    normalState: Mouse_burning
+
+
+# Note that the mallard duck is actually a male drake mallard, with the brown duck being the female variant of the same species, however ss14 lacks sex specific textures
+# The white duck is more akin to a pekin or call duck.
 
 - type: entity
   name: mallard duck #Quack
@@ -744,9 +750,8 @@
           Quantity: 30
   - type: Udder
     reagentId: Milk
-    targetSolution: udder
-    quantity: 25
-    updateRate: 30
+    quantityPerUpdate: 25
+    growthDelay: 30
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -897,9 +902,8 @@
         maxVol: 250
   - type: Udder
     reagentId: MilkGoat
-    targetSolution: udder
-    quantity: 25
-    updateRate: 20
+    quantityPerUpdate: 25
+    growthDelay: 20
   - type: Wooly
   - type: Food
     solution: wool
@@ -1599,6 +1603,9 @@
   - type: BadFood
   - type: NonSpreaderZombie
   - type: PreventSpiller
+  - type: FireVisuals
+    sprite: Mobs/Effects/onfire.rsi
+    normalState: Mouse_burning
 
 - type: entity
   parent: MobMouse
@@ -3064,10 +3071,13 @@
   - type: Bloodstream
     bloodMaxVolume: 60
   - type: CanEscapeInventory
-    BaseResistTime: 3
+    baseResistTime: 3
   - type: MobPrice
     price: 60
   - type: NonSpreaderZombie
+  - type: FireVisuals
+    sprite: Mobs/Effects/onfire.rsi
+    normalState: Mouse_burning
 
 - type: entity
   name: pig
@@ -3183,7 +3193,7 @@
   - type: InventorySlots
   - type: Strippable
   - type: Bloodstream
-    bloodReagent: Water
+    bloodReagent: Sap
     bloodMaxVolume: 60
   - type: UserInterface
     interfaces:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
index 76a7382e70..3348aabfac 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
@@ -85,7 +85,7 @@
         500: Dead
     - type: Metabolizer
       solutionOnBody: false
-      updateFrequency: 0.25
+      updateInterval: 0.25
       metabolizerTypes: [ Dragon ]
       groups:
         - id: Medicine
@@ -166,7 +166,6 @@
     explosionMaxTileIntensity: 10
   - type: ProjectileAnomaly
     projectilePrototype: ProjectileIcicle
-    targetNonSentientChance: 0.1
   - type: TempAffectingAnomaly
     tempChangePerSecond: -25
     hotspotExposeTemperature: -1000
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 23b088fe24..157a0e2ef7 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -70,7 +70,6 @@
       tags:
         - Carp
         - DoorBumpOpener
-        - NoPaint
     - type: ReplacementAccent
       accent: genericAggressive
     - type: Speech
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
index 50515133b0..2133694342 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
@@ -48,7 +48,7 @@
       task: SimpleHumanoidHostileCompound
 
 - type: entity
-  name: syndicate footsoldier 
+  name: syndicate footsoldier
   parent: BaseMobHuman
   id: MobSyndicateFootsoldier
   components:
@@ -75,7 +75,7 @@
   save: false # mobs are currently not saveable.
   id: SalvageHumanCorpse
   name: unidentified corpse
-  description: I think he's dead.
+  description: I think they're dead.
   components:
   - type: RandomHumanoidAppearance
     randomizeName: false
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index d0d51df74b..4f8b57dee9 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -285,6 +285,9 @@
   - type: GuideHelp
     guides:
     - MinorAntagonists
+  - type: FireVisuals
+    sprite: Mobs/Effects/onfire.rsi
+    normalState: Mouse_burning
 
 - type: weightedRandomEntity
   id: RatKingLoot
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 4a35f71ac0..68ebf52dc0 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -93,6 +93,3 @@
     - RevenantTheme
   - type: Speech
     speechVerb: Ghost
-  - type: Tag
-    tags:
-      - NoPaint
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index d904abbc3b..604632efa8 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -60,7 +60,6 @@
   - type: NameIdentifier
     group: GenericNumber
   - type: Repairable
-    fuelcost: 15
     doAfterDelay: 8
   - type: Pullable
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index e9de4277bc..8c2a0b5fea 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -87,7 +87,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaled: true
+        scaleByQuantity: true
         damage:
           types:
             Heat: 3
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 3452bf46fc..06f982ea88 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -71,8 +71,6 @@
     followEntity: true
   - type: CargoOrderConsole
   - type: CrewMonitoringConsole
-    snap: false
-    precision: 3
   - type: GeneralStationRecordConsole
   - type: DeviceNetwork
     deviceNetId: Wireless
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index f78ec2fbed..7bc1d78633 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -87,7 +87,7 @@
       500: Dead
   - type: Metabolizer
     solutionOnBody: false
-    updateFrequency: 0.25
+    updateInterval: 0.25
     metabolizerTypes: [ Dragon ]
     groups:
     - id: Medicine
@@ -132,8 +132,6 @@
   id: MobDragon
   components:
   - type: Dragon
-    spawnsLeft: 2
-    spawnsProto: MobCarpDragon
     spawnRiftAction: ActionSpawnRift
   - type: GenericAntag
     rule: Dragon
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index 01263f192a..1005335173 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -105,7 +105,6 @@
     - type: Tag
       tags:
         - CannotSuicide
-        - NoPaint
 
 # From the uplink injector
 - type: entity
@@ -214,7 +213,6 @@
       tags:
         - CannotSuicide
         - FootstepSound
-        - NoPaint
     - type: Inventory
       templateId: holoclown
     - type: Hands
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index 315bd361e3..ebd97ba5af 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -135,6 +135,66 @@
       prototypes: [ ERTLeaderGearEVALecter ]
     - type: InitialInfectedExempt
 
+## ERT Chaplain
+
+- type: entity
+  id: RandomHumanoidSpawnerERTChaplain
+  parent: RandomHumanoidSpawnerERTLeader
+  name: ERT chaplain
+  suffix: ERTRole, Basic
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: chaplain #needs an ERT variant once a good suit it made.
+    - type: RandomMetadata
+      nameSegments:
+      - NamesFirstMilitary
+      - NamesLastMilitary
+    - type: RandomHumanoidSpawner
+      settings: ERTChaplain
+
+- type: randomHumanoidSettings
+  id: ERTChaplain
+  parent: ERTLeader
+  components:
+    - type: MindShield
+    - type: GhostRole
+      name: ghost-role-information-ert-chaplain-name
+      description: ghost-role-information-ert-chaplain-description
+    - type: GhostTakeoverAvailable
+    - type: RandomMetadata
+      nameSegments:
+      - NamesFirstMilitary
+      - NamesLastMilitary
+    - type: Loadout
+      prototypes: [ ERTChaplainGear ]
+    - type: InitialInfectedExempt
+
+- type: entity
+  id: RandomHumanoidSpawnerERTChaplainEVA
+  parent: RandomHumanoidSpawnerERTChaplain
+  name: ERT chaplain
+  suffix: ERTRole, Enviro EVA
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: chaplain #needs an ERT variant once a good suit it made.
+    - type: RandomHumanoidSpawner
+      settings: ERTChaplainEVA
+
+- type: randomHumanoidSettings
+  id: ERTChaplainEVA
+  parent: ERTChaplain
+  components:
+    - type: MindShield
+    - type: GhostRole
+      name: ghost-role-information-ert-chaplain-name
+      description: ghost-role-information-ert-chaplain-description
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ ERTChaplainGearEVA ]
+    - type: InitialInfectedExempt
+
 ## ERT Janitor
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index 96e958514c..6590082e22 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -25,14 +25,14 @@
     damageOverlayGroups:
       Brute:
         sprite: Mobs/Effects/brute_damage.rsi
-        color: "#75b1f0"
+        color: "#cd7314"
   - type: Butcherable
     butcheringType: Spike
     spawned:
       - id: FoodMeatPlant
         amount: 5
   - type: Bloodstream
-    bloodReagent: Water
+    bloodReagent: Sap
   - type: Reactive
     groups:
       Flammable: [ Touch ]
@@ -47,7 +47,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaled: true
+        scaleByQuantity: true
         damage:
           types:
             Blunt: 2
@@ -62,7 +62,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaled: true
+        scaleByQuantity: true
         damage:
           types:
             Poison: 5
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
index 83ac731148..b1f032f73d 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -53,7 +53,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaled: true
+        scaleByQuantity: true
         damage:
           types:
             Heat: 2
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index 67d7954038..84639c9af0 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -112,6 +112,24 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tomatojuice.rsi
 
+- type: entity
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
+  id: DrinkCoconutWaterCarton
+  name: coconut water
+  description: It's the inside of the coconut that counts.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: CoconutWater
+          Quantity: 50
+  - type: Drink
+  - type: Label
+    currentLabel: coconut water
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/coconutwater.rsi
+
 - type: entity
   parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
   id: DrinkCreamCarton
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index bf00dd6327..aac2803dd2 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -258,6 +258,22 @@
         - ReagentId: Antifreeze
           Quantity: 30
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkArnoldPalmer
+  suffix: arnold palmer
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: ArnoldPalmer
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkAtomicBombGlass
@@ -437,6 +453,22 @@
     sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkBlueHawaiianGlass
+  suffix: blue hawaiian
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: BlueHawaiian
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/bluehawaiian.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkBooger
@@ -501,6 +533,35 @@
     sprite: Objects/Consumable/Drinks/chocolateglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkCoconutRum
+  suffix: coconut rum
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: CoconutRum
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/coconutrum.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkCoconutWaterGlass
+  suffix: coconut water
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: CoconutWater
+          Quantity: 30
+
 - type: entity
   parent: DrinkGlass
   id: DrinkCoffee
@@ -533,6 +594,22 @@
     sprite: Objects/Consumable/Drinks/cognacglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkCosmopolitan
+  suffix: cosmopolitan
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Cosmopolitan
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/cosmopolitan.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkCream
@@ -1340,6 +1417,22 @@
     sprite: Objects/Consumable/Drinks/orangejuice.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkPainkillerGlass
+  suffix: painkiller
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Painkiller
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/painkiller.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkPatronGlass
@@ -1356,6 +1449,22 @@
     sprite: Objects/Consumable/Drinks/patronglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkPinaColadaGlass
+  suffix: piña colada
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: PinaColada
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/pinacolada.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkPoisonBerryJuice
@@ -1484,6 +1593,22 @@
     sprite: Objects/Consumable/Drinks/rumglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkRoyRogersGlass
+  suffix: roy rogers
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: RoyRogers
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/royrogers.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkSakeGlass
@@ -1609,6 +1734,22 @@
     sprite: Objects/Consumable/Drinks/glass_white.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkShirleyTempleGlass
+  suffix: shirley temple
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: ShirleyTemple
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/shirleytemple.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkSilencerGlass
@@ -1641,6 +1782,22 @@
     sprite: Objects/Consumable/Drinks/singulo.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkSolDryGlass
+  suffix: sol dry
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: SolDry
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/sol_dry_glass.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkSnowWhite
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index 43e0d6e144..26e3c88d69 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -663,6 +663,24 @@
   - type: Label
     currentLabel: tonic water
 
+- type: entity
+  parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
+  id: DrinkSakeBottleFull
+  name: small sake bottle
+  description: The regret of the next morning seems to be nipping on the bottle too.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Sake
+          Quantity: 50
+  - type: Label
+    currentLabel: Sake
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/sakebottle.rsi
+  - type: Sealable
+
 # Cartons, TODO: this needs to be moved elsewhere eventually, since cartons shouldnt smash into glass shards
 
 - type: entity
@@ -791,6 +809,23 @@
   - type: Label
     currentLabel: ice
 
+- type: entity
+  parent: DrinkBottlePlasticBaseFull
+  id: DrinkCoconutWaterJug
+  name: coconut water jug
+  description: It's on the inside of the coconut that counts.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 300
+        reagents:
+        - ReagentId: CoconutWater
+          Quantity: 300
+  - type: Drink
+  - type: Label
+    currentLabel: coconut water
+
 - type: entity
   parent: DrinkBottlePlasticBaseFull
   id: DrinkCoffeeJug
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index 65f413611a..4785b59a8e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -241,6 +241,24 @@
   - type: Item
     sprite: Objects/Consumable/Drinks/space-up.rsi
 
+- type: entity
+  parent: DrinkCanBaseFull
+  id: DrinkSolDryCan
+  name: sol dry
+  description: Sweet ginger soda from outer space!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: SolDry
+          Quantity: 30
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/sol_dry.rsi
+  - type: Item
+    sprite: Objects/Consumable/Drinks/sol_dry.rsi
+
 - type: entity
   parent: DrinkCanBaseFull
   id: DrinkStarkistCan
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index 07d07e370b..71b38959ce 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -711,7 +711,7 @@
     state: suppermatter
   - type: SliceableFood
     slice: FoodCakeSuppermatterSlice
-    TotalCount: 8
+    count: 8
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
index 77e3975976..fabf630106 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -32,7 +32,6 @@
     size: Tiny
   - type: Drink
     solution: food
-    refillable: false
   - type: Openable
     sound:
       collection: packetOpenSounds
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 21eb0fb942..3f0277e1bc 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -1220,6 +1220,10 @@
   id: FoodPoppy
   description: A flower with extracts often used in the production of medicine
   components:
+  - type: Clothing
+    slots:
+    - HEAD
+    quickEquip: false
   - type: FlavorProfile
     flavors:
       - medicine
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index b0e98224c1..e6143d0bc1 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -396,10 +396,10 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 30
+        maxVol: 25
         reagents:
         - ReagentId: Nutriment
-          Quantity: 25
+          Quantity: 20
 
 - type: entity
   id: FoodSnackMREBrownie
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index fce9dd3b6f..576c1e2254 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -294,9 +294,9 @@
         orGroup: GiftPool
       - id: ClothingHeadHatBunny
         orGroup: GiftPool
-      - id: ClothingHeadHatFlowerCrown
+      - id: ClothingHeadHatFlowerWreath
         orGroup: GiftPool
-      - id: ClothingHeadHatHairflower
+      - id: FoodPoppy
         orGroup: GiftPool
       - id: ClothingMaskClown
         orGroup: GiftPool
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
index 627fe5fb0a..3e2006c565 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
@@ -7,10 +7,20 @@
     - type: Sprite
       sprite: Objects/Misc/module.rsi
       state: door_electronics
-    - type: AccessReader
     - type: Tag
       tags:
         - DoorElectronics
         - DroneUsable
+    - type: DoorElectronics
     - type: StaticPrice
       price: 55
+    - type: AccessReader
+    - type: ActivatableUI
+      key: enum.DoorElectronicsConfigurationUiKey.Key
+      allowedItems:
+        tags:
+        - Multitool
+    - type: UserInterface
+      interfaces:
+      - key: enum.DoorElectronicsConfigurationUiKey.Key
+        type: DoorElectronicsBoundUserInterface
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
new file mode 100644
index 0000000000..fc6d8e2697
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
@@ -0,0 +1,264 @@
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsService
+  suffix: Service, Locked
+  components:
+  - type: AccessReader
+    access: [["Service"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsTheatre
+  suffix: Theatre, Locked
+  components:
+  - type: AccessReader
+    access: [["Theatre"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsChapel
+  suffix: Chapel, Locked
+  components:
+  - type: AccessReader
+    access: [["Chapel"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsJanitor
+  suffix: Janitor, Locked
+  components:
+  - type: AccessReader
+    access: [["Janitor"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsKitchen
+  suffix: Kitchen, Locked
+  components:
+  - type: AccessReader
+    access: [["Kitchen"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsBar
+  suffix: Bar, Locked
+  components:
+  - type: AccessReader
+    access: [["Bar"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsHydroponics
+  suffix: Hydroponics, Locked
+  components:
+  - type: AccessReader
+    access: [["Hydroponics"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCaptain
+  suffix: Captain, Locked
+  components:
+  - type: AccessReader
+    access: [["Captain"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsExternal
+  suffix: External, Locked
+  components:
+  - type: AccessReader
+    access: [["External"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCargo
+  suffix: Cargo, Locked
+  components:
+  - type: AccessReader
+    access: [["Cargo"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsEngineering
+  suffix: Engineering, Locked
+  components:
+  - type: AccessReader
+    access: [["Engineering"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsAtmospherics
+  suffix: Atmospherics, Locked
+  components:
+  - type: AccessReader
+    access: [["Atmospherics"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsFreezer
+  suffix: Freezer, Locked
+  components:
+  - type: AccessReader
+    access: [["Kitchen"], ["Hydroponics"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsSalvage
+  suffix: Salvage, Locked
+  components:
+  - type: AccessReader
+    access: [["Salvage"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsMedical
+  suffix: Medical, Locked
+  components:
+  - type: AccessReader
+    access: [["Medical"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsChemistry
+  suffix: Chemistry, Locked
+  components:
+  - type: AccessReader
+    access: [["Chemistry"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsResearch
+  suffix: Research, Locked
+  components:
+  - type: AccessReader
+    access: [["Research"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsScience
+  suffix: Science, Locked
+  components:
+  - type: AccessReader
+    access: [["Research"], ["Medical"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCommand
+  suffix: Command, Locked
+  components:
+  - type: AccessReader
+    access: [["Command"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsChiefMedicalOfficer
+  suffix: ChiefMedicalOfficer, Locked
+  components:
+  - type: AccessReader
+    access: [["ChiefMedicalOfficer"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsChiefEngineer
+  suffix: ChiefEngineer, Locked
+  components:
+  - type: AccessReader
+    access: [["ChiefEngineer"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsHeadOfSecurity
+  suffix: HeadOfSecurity, Locked
+  components:
+  - type: AccessReader
+    access: [["HeadOfSecurity"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsResearchDirector
+  suffix: ResearchDirector, Locked
+  components:
+  - type: AccessReader
+    access: [["ResearchDirector"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsHeadOfPersonnel
+  suffix: HeadOfPersonnel, Locked
+  components:
+  - type: AccessReader
+    access: [["HeadOfPersonnel"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsQuartermaster
+  suffix: Quartermaster, Locked
+  components:
+  - type: AccessReader
+    access: [["Quartermaster"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsSecurity
+  suffix: Security, Locked
+  components:
+  - type: AccessReader
+    access: [["Security"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsDetective
+  suffix: Detective, Locked
+  components:
+  - type: AccessReader
+    access: [["Detective"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsBrig
+  suffix: Brig, Locked
+  components:
+  - type: AccessReader
+    access: [["Brig"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsArmory
+  suffix: Armory, Locked
+  components:
+  - type: AccessReader
+    access: [["Armory"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsVault
+  suffix: Vault, Locked
+  components:
+  - type: AccessReader
+    access: [["Security", "Command"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsMaintenance
+  suffix: Maintenance, Locked
+  components:
+  - type: AccessReader
+    access: [["Maintenance"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsSyndicateAgent
+  suffix: SyndicateAgent, Locked
+  components:
+  - type: AccessReader
+    access: [["SyndicateAgent"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsRnDMed
+  suffix: Medical/Science, Locked
+  components:
+  - type: AccessReader
+    access: [["Research"], ["Medical"]]
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml
index 372b689113..b2f159f463 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml
@@ -35,6 +35,5 @@
         acts: [ "Destruction" ]
   - type: ApcPowerReceiver
     powerLoad: 15000
-    priority: High
   - type: StaticPrice
     price: 1500
diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
index ae454e43a2..0563826a57 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
@@ -13,7 +13,7 @@
     programName: notekeeper-program-name
     icon:
       sprite:  Objects/Misc/books.rsi
-      state: book6
+      state: book_icon
   - type: NotekeeperCartridge
 
 - type: entity
@@ -90,5 +90,6 @@
         sprite: Structures/Doors/Airlocks/Standard/security.rsi
         state: closed
     - type: LogProbeCartridge
+    - type: GuideHelp
       guides:
         - Forensics
diff --git a/Resources/Prototypes/Entities/Objects/Devices/payload.yml b/Resources/Prototypes/Entities/Objects/Devices/payload.yml
index 019f19e711..160f0c58e7 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/payload.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/payload.yml
@@ -33,7 +33,6 @@
     maxIntensity: 10
     intensitySlope: 3
     totalIntensity: 120 # about a ~4 tile radius
-    flashRange: 7
   - type: ExplodeOnTrigger
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 03800eea33..cf190afafd 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -109,6 +109,7 @@
 - type: entity
   parent: BasePDA
   id: BaseMedicalPDA
+  abstract: true
   components:
   - type: HealthAnalyzer
     scanDelay: 1
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
index ad4d2eac8a..191bb75e50 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
@@ -163,9 +163,6 @@
   - type: Appearance
   - type: WiresVisuals
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-dawinstrument
-    layoutId: DawInstrument
   - type: Machine
     board: DawInstrumentMachineCircuitboard
   - type: Instrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
index 391823dc52..4c7ae68420 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -53,10 +53,10 @@
     solution: melee
   - type: InjectableSolution
     solution: melee
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnEmbed
     transferAmount: 2
+    solution: melee
     blockSlots: OUTERCLOTHING
-    fixtureId: "throw-fixture"
   - type: SolutionTransfer
     maxTransferAmount: 2
   - type: Damageable
@@ -124,10 +124,9 @@
     solutions:
       melee:
         maxVol: 7
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnEmbed
     transferAmount: 7
-    blockSlots: NONE
-    fixtureId: "throw-fixture"
+    solution: melee
   - type: SolutionTransfer
     maxTransferAmount: 7
 
diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice.yml b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
index 81a9c173c7..852a1c2699 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
@@ -120,7 +120,6 @@
         - ItemMask
   - type: StepTrigger
     intersectRatio: 0.2
-    requiredTriggeredSpeed: 0
   - type: TriggerOnStepTrigger
   - type: ShoesRequiredStepTrigger
   - type: Slippery
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
index 61ce7079f7..ce83f66cb3 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -322,7 +322,7 @@
   parent: BaseFigurine
   id: ToyFigurineNukieElite
   name: elite syndicate operative figure
-  description: A figurine depicting someone in an elite blood-red hardsuit, similar to what the medic of a nuclear operative team might wear.
+  description: A figurine depicting someone in an elite blood-red hardsuit, similar to what someone on a nuclear operative team might wear.
   components:
   - type: Sprite
     state: nukie_elite
diff --git a/Resources/Prototypes/Entities/Objects/Fun/spray_paint.yml b/Resources/Prototypes/Entities/Objects/Fun/spray_paint.yml
deleted file mode 100644
index 1b417f6cde..0000000000
--- a/Resources/Prototypes/Entities/Objects/Fun/spray_paint.yml
+++ /dev/null
@@ -1,292 +0,0 @@
-# Base Paints
-- type: entity
-  parent: BaseItem
-  id: PaintBase
-  name: spray paint
-  description: A tin of spray paint.
-  noSpawn: true
-  components:
-  - type: Appearance
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    state: clown_cap
-    layers:
-      - state: clown_cap
-        map: ["enum.OpenableVisuals.Layer"]
-  - type: Paint
-    consumptionUnit: 10
-    blacklist:
-      tags:
-        - NoPaint
-  - type: Item
-    sprite: Objects/Fun/spraycans.rsi
-    heldPrefix: spray
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 50
-        reagents:
-        - ReagentId: SpaceGlue
-          Quantity: 50
-  - type: TrashOnSolutionEmpty
-    solution: drink
-  - type: Sealable
-  - type: Openable
-    sound:
-      path: /Audio/Effects/pop_high.ogg
-    closeable: true
-    closeSound:
-      path: /Audio/Effects/pop_high.ogg
-
-# Paints
-
-# funnypaint
-- type: entity
-  parent: PaintBase
-  id: FunnyPaint
-  name: funny paint
-  description:  A tin of funny paint, manufactured by Honk! Co.
-  components:
-  - type: Paint
-    color: "#fa74df"
-  - type: Item
-    sprite: Objects/Fun/spraycans.rsi
-    heldPrefix: clown
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "clown"}
-          False: {state: "clown_cap"}
-
-- type: entity
-  parent: PaintBase
-  id: FunnyPaintYellow
-  name: funny paint
-  description:  A tin of funny paint, manufactured by Honk! Co.
-  components:
-  - type: Paint
-    color: "#d5e028"
-  - type: Item
-    sprite: Objects/Fun/spraycans.rsi
-    heldPrefix: clown
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    state: clown2_cap
-    layers:
-      - state: clown2_cap
-        map: ["enum.OpenableVisuals.Layer"]
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "clown2"}
-          False: {state: "clown2_cap"}
-
-#death paint
-- type: entity
-  parent: PaintBase
-  id: DeathPaint
-  components:
-  - type: Paint
-    color: "#ff20c8"
-  - type: Item
-    sprite: Objects/Fun/spraycans.rsi
-    heldPrefix: spray
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    state: death_cap
-    layers:
-      - state: death_cap
-        map: ["enum.OpenableVisuals.Layer"]
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "death"}
-          False: {state: "death_cap"}
-
-- type: entity
-  parent: PaintBase
-  id: DeathPaintTwo
-  components:
-  - type: Paint
-    color: "#ff2020"
-  - type: Item
-    sprite: Objects/Fun/spraycans.rsi
-    heldPrefix: spray
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    state: death2_cap
-    layers:
-      - state: death2_cap
-        map: ["enum.OpenableVisuals.Layer"]
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "death2"}
-          False: {state: "death2_cap"}
-
-#Sprays
-
-#Blue
-- type: entity
-  parent: PaintBase
-  id: SprayPaintBlue
-  suffix: Blue
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#5890f7"
-  - type: Paint
-    color: "#5890f7"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#5890f7"}
-          False: {state: "spray_cap_colors" , color: "#5890f7"}
-
-#Red
-- type: entity
-  parent: PaintBase
-  id: SprayPaintRed
-  suffix: Red
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#ff3b3b"
-  - type: Paint
-    color: "#ff3b3b"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#ff3b3b"}
-          False: {state: "spray_cap_colors" , color: "#ff3b3b"}
-
-#Green
-- type: entity
-  parent: PaintBase
-  id: SprayPaintGreen
-  suffix: Green
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#73f170"
-  - type: Paint
-    color: "#73f170"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#73f170"}
-          False: {state: "spray_cap_colors" , color: "#73f170"}
-
-#Black
-- type: entity
-  parent: PaintBase
-  id: SprayPaintBlack
-  suffix: Black
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#3a3a3a"
-  - type: Paint
-    color: "#3a3a3a"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#3a3a3a"}
-          False: {state: "spray_cap_colors" , color: "#3a3a3a"}
-
-#Orange
-- type: entity
-  parent: PaintBase
-  id: SprayPaintOrange
-  suffix: Orange
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#f6a44b"
-  - type: Paint
-    color: "#f6a44b"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#f6a44b"}
-          False: {state: "spray_cap_colors" , color: "#f6a44b"}
-
-#Purple
-- type: entity
-  parent: PaintBase
-  id: SprayPaintPurple
-  suffix: Purple
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#c063f5"
-  - type: Paint
-    color: "#c063f5"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#c063f5"}
-          False: {state: "spray_cap_colors" , color: "#c063f5"}
-
-#White
-- type: entity
-  parent: PaintBase
-  id: SprayPaintWhite
-  suffix: White
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#f2f2f2"
-  - type: Paint
-    color: "#f2f2f2"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#f2f2f2"}
-          False: {state: "spray_cap_colors" , color: "#f2f2f2"}
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index dbb612688d..a46ae22e89 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1178,7 +1178,6 @@
   description: New Sandy-Cat plastic sword! Comes with realistic sound and full color! Looks almost like the real thing!
   components:
     - type: EnergySword
-      isSharp: false
       colorOptions:
         - DodgerBlue
     - type: ItemToggle
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
index 4ce7a4a956..9346a47fc5 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -15,7 +15,6 @@
   - type: Tag
     tags:
     - Sheet
-    - NoPaint
     - DroneUsable
   - type: Material
   - type: Damageable
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
index 7c6a1e3cfe..b91f5e153d 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
@@ -15,7 +15,6 @@
     tags:
     - Sheet
     - Metal
-    - NoPaint
     - DroneUsable
   - type: Damageable
     damageContainer: Inorganic
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
index 2deab6fa95..058adc9f16 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -12,7 +12,6 @@
   - type: Tag
     tags:
     - Sheet
-    - NoPaint
     - DroneUsable
   - type: Damageable
     damageContainer: Inorganic
@@ -112,7 +111,6 @@
   - type: Tag
     tags:
     - Sheet
-    - NoPaint
 
 - type: entity
   parent: SheetPlasma
@@ -135,7 +133,6 @@
     tags:
     - Plastic
     - Sheet
-    - NoPaint
     - DroneUsable
   - type: Material
   - type: PhysicalComposition
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index a1fb30048c..6020861b76 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -13,7 +13,6 @@
     tags:
       - DroneUsable
       - RawMaterial
-      - NoPaint
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 0ce95cbcf9..5c69fd6e40 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -65,7 +65,6 @@
         acts: [ "Destruction" ]
   - type: StepTrigger
     intersectRatio: 0.2
-    requiredTriggeredSpeed: 0
   - type: ShoesRequiredStepTrigger
   - type: Slippery
     slipSound:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
index ab6beb70af..78f9edc9c5 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml
@@ -7,8 +7,17 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0
-      map: [ "enum.DamageStateVisualLayers.Base" ]
+    - state: paper
+    - state: cover_base
+      color: "#332d27"
+      map: [ "cover" ]
+    - state: decor_wingette
+      color: "#453f3a"
+      map: [ "decor" ]
+    - state: icon_text
+      map: [ "icon" ]
+    - state: overlay_null
+      map: [ "overlay" ]
   - type: Paper
     contentSize: 12000
   - type: ActivatableUI
@@ -35,7 +44,15 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0 # placeholder(?). if only we have a better sprite that fits this.
+    - state: paper
+    - state: cover_base
+      color: "#0a2a6b"
+    - state: decor_wingette
+      color: "#082561"
+    - state: icon_text 
+      color: gold
+    - state: icon_planet
+      color: "#42b6f5"
   - type: Tag
     tags:
     - Book
@@ -53,7 +70,15 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book7
+    - state: paper
+    - state: cover_base
+      color: black
+    - state: decor_wingette
+      color: "#bbbbbb"
+    - state: icon_glow
+      color: red
+    - state: icon_corner
+      color: red
   - type: Tag
     tags:
     - Book
@@ -71,7 +96,12 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_bar
+    - state: paper
+    - state: cover_base
+      color: "#004848"
+    - state: decor_wingette
+      color: "#006666"
+    - state: icon_bar
   - type: Tag
     tags:
     - Book
@@ -89,7 +119,11 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_cooking
+    - state: paper
+    - state: cover_base
+      color: "#e22541"
+    - state: decor_wingette
+    - state: icon_apple
   - type: Tag
     tags:
     - Book
@@ -107,7 +141,14 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_hydroponics_pod_people
+    - state: paper
+    - state: cover_base
+      color: "#0e5a24"
+    - state: decor_wingette
+      color: "#2fa151"
+    - state: icon_cabbage
+    - state: icon_corner
+      color: gold
   - type: Tag
     tags:
     - Book
@@ -125,7 +166,14 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_engineering
+    - state: paper
+    - state: cover_base
+      color: "#6c4718"
+    - state: decor_wingette
+      color: "#b5913c"
+    - state: icon_wrench
+    - state: icon_corner
+      color: gold
   - type: Tag
     tags:
     - Book
@@ -143,7 +191,12 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_science
+    - state: paper
+    - state: cover_base
+      color: "#542485"
+    - state: decor_wingette_circle
+      color: "#be69f0"
+    - state: icon_dna
   - type: Tag
     tags:
     - Book
@@ -161,7 +214,12 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_security
+    - state: paper
+    - state: cover_base
+      color: "#ab1515"
+    - state: decor_wingette
+      color: "#e05334"
+    - state: icon_stunbaton
   - type: Tag
     tags:
     - Book
@@ -184,7 +242,11 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0 # no janitorial book sprite so this is a placeholder
+    - state: paper
+    - state: cover_base
+      color: "#550c82"
+    - state: decor_wingette
+    - state: icon_bucket
   - type: Tag
     tags:
     - Book
@@ -202,7 +264,15 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0 # no salvage book sprite so this is a placeholder
+    - state: paper
+    - state: cover_base
+      color: "#52320b"
+    - state: decor_wingette
+      color: "#e69a3e"
+    - state: icon_glow
+    - state: icon_diamond
+    - state: icon_text
+      color: "#fcdf74"
   - type: Tag
     tags:
     - Book
@@ -220,7 +290,13 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_medical
+    - state: paper
+    - state: cover_base
+      color: "#cccccc"
+    - state: decor_wingette
+      color: "#f7f7f7"
+    - state: icon_medical
+      color: "#58abcc"
   - type: Tag
     tags:
     - Book
@@ -238,7 +314,15 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_engineering
+    - state: paper
+    - state: cover_old
+      color: "#6c4718"
+    - state: decor_wingette
+      color: "#b5913c"
+    - state: icon_glow
+      color: red
+    - state: icon_wrench
+    - state: overlay_blood
   - type: Tag
     tags:
     - Book
@@ -256,7 +340,12 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_chemistry
+    - state: paper
+    - state: cover_base
+      color: "#2a7b74"
+    - state: decor_wingette
+      color: "#2a7b74"
+    - state: icon_chemical
   - type: Tag
     tags:
     - Book
@@ -268,69 +357,120 @@
 - type: entity
   parent: BookBase
   id: BookRandom
-  suffix: random
+  suffix: random visual
+  description: Each book is unique! What is hidden in this one?
   components:
+  - type: RandomMetadata
+    nameSegments: 
+    - book_hint_appearance
+    - book_type
   - type: RandomSprite
     available:
-      - enum.DamageStateVisualLayers.Base:
-          book0: ""
-          book1: ""
-          book2: ""
-          book3: ""
-          book4: ""
-          book5: ""
-          book6: ""
-          book7: ""
-          book8: ""
+      - cover:
+          cover_base: Sixteen
+          cover_old: Sixteen
+          cover_strong: Sixteen
+        decor:
+          decor_wingette: Sixteen
+          decor_wingette_circle: Sixteen
+          decor_bottom: Sixteen
+          decor_middle: Sixteen
+          decor_spine: Sixteen
+          decor_diagonal: Sixteen
+          decor_vertical_middle: Sixteen
+          icon_corner: Sixteen
+          icon_mount: ""
+        icon:
+          icon_biohazard: Sixteen
+          icon_borg: ""
+          icon_banana: ""
+          icon_glow: Sixteen
+          icon_hacking: ""
+          icon_law: Sixteen
+          icon_magnifier: ""
+          icon_nuclear: ""
+          icon_time: Sixteen
+          icon_aurora: Sixteen
+          icon_briefcase: ""
+          icon_eye: ""
+          icon_letter_N: ""
+          icon_letter_P: ""
+          icon_lightning: ""
+          icon_planet: ""
+          icon_possum: ""
+          icon_question: Sixteen
+          icon_scmmd: ""
+          icon_stars: Sixteen
+          icon_stars2: Sixteen
+          icon_temple: Sixteen
+          icon_tree: ""
+          icon_pentagramm: Sixteen
+          icon_fish: ""
+          icon_origami: ""
+          icon_skull: ""
+          icon_text: ""
+          icon_text2: ""
+          icon_text3: "" 
+        overlay:
+          overlay_blood: ""
+          overlay_dirt: Sixteen
+          detail_bookmark: Sixteen
+          detail_rivets: Sixteen
+          overlay_null: ""
 
 - type: entity
-  parent: BookBase
-  id: BookEscalation
-  name: Robert's Rules of Escalation
-  description: The book is stained with blood. It seems to have been used more as a weapon than reading material.
+  parent: BookRandom
+  id: BookRandomStory
+  suffix: random visual, random story
   components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book2
-    - type: MeleeWeapon
-      wideAnimationRotation: 180
-      damage:
-        types:
-          Blunt: 6
-    - type: Paper
-      content: book-text-escalation
-
-- type: entity
-  parent: BookBase
-  id: BookEscalationSecurity
-  name: "Robert's Rules of Escalation: Security Edition"
-  description: The book is stained with blood. It seems to have been used more as a weapon than reading material.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book2
-    - type: MeleeWeapon
-      wideAnimationRotation: 180
-      damage:
-        types:
-          Blunt: 6
-    - type: Paper
-      content: book-text-escalation-security
-
+  - type: PaperRandomStory
+    storySegments:
+    - "This is a "
+    - book_genre
+    - " about a "
+    - book_character_trait
+    - " "
+    - book_character
+    - " and "
+    - book_character_trait
+    - " "
+    - book_character
+    - ". Due to "
+    - book_event
+    - ", they "
+    - book_action_trait
+    - " "
+    - book_action
+    - " "
+    - book_character
+    - " "
+    - book_location
+    - ". \n\n"
+    - book_story_element
+    - " is "
+    - book_story_element_trait
+    - "."
+    storySeparator: ""
+    
 - type: entity
   parent: BookBase
   id: BookAtmosDistro
   name: "Newton's Guide to Atmos: The Distro"
   description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks.
   components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book5
-    - type: Paper
-      content: book-text-atmos-distro
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_base
+      color: "#366ed6"
+    - state: decor_wingette
+      color: "#2739b0"
+    - state: icon_atmos
+    - state: icon_corner
+      color: gold
+  - type: Paper
+    content: book-text-atmos-distro
 
 - type: entity
   parent: BookBase
@@ -338,12 +478,19 @@
   name: "Newton's Guide to Atmos: Waste"
   description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks.
   components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book5
-    - type: Paper
-      content: book-text-atmos-waste
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_base
+      color: "#db233f"
+    - state: decor_wingette
+      color: "#ab0730"
+    - state: icon_atmos
+    - state: icon_corner
+      color: gold
+  - type: Paper
+    content: book-text-atmos-waste
 
 - type: entity
   parent: BookBase
@@ -351,12 +498,19 @@
   name: "Newton's Guide to Atmos: Air Alarms"
   description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks.
   components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book5
-    - type: Paper
-      content: book-text-atmos-alarms
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_base
+      color: "#bfb328"
+    - state: decor_wingette
+      color: "#9c7c14"
+    - state: icon_atmos
+    - state: icon_corner
+      color: gold
+  - type: Paper
+    content: book-text-atmos-alarms
 
 - type: entity
   parent: BookBase
@@ -364,9 +518,16 @@
   name: "Newton's Guide to Atmos: Vents and More"
   description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks.
   components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book5
-    - type: Paper
-      content: book-text-atmos-vents
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_base
+      color: "#3ec78e"
+    - state: decor_wingette
+      color: "#28a15a"
+    - state: icon_atmos
+    - state: icon_corner
+      color: gold
+  - type: Paper
+    content: book-text-atmos-vents
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml b/Resources/Prototypes/Entities/Objects/Misc/books_author.yml
similarity index 68%
rename from Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml
rename to Resources/Prototypes/Entities/Objects/Misc/books_author.yml
index 70d984240e..9adb14f4eb 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/books_author.yml
@@ -5,9 +5,19 @@
   description: The book is an old, leather-bound tome with intricate engravings on the cover. The pages are yellowed and fragile with age, with the ink of the text faded in some places. It appears to have been well-read and well-loved, with dog-eared pages and marginalia scrawled in the margins. Despite its aged appearance, the book still exudes a sense of mystical power and wonder, hinting at the secrets and knowledge contained within its pages.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_narsie_legend
+      - state: paper
+      - state: cover_old
+        color: "#a6161d"
+      - state: decor_bottom
+        color: "#6e1022"
+      - state: decor_wingette
+        color: "#4a101b"
+      - state: icon_pentagramm
+        color: "#911129"
+      - state: detail_bookmark
+        color: red 
     - type: Paper
       content: book-text-narsielegend
 
@@ -18,9 +28,18 @@
   description: A book exploring the different philosophical perspectives on truth and lying has a worn cover, with creases and marks indicating frequent use and thoughtful contemplation. The spine shows signs of wear from being pulled off the shelf again and again. The pages themselves are filled with underlines, notes in the margins, and highlighted passages as readers grapple with the nuances and complexities of the topic.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_truth
+      - state: paper
+      - state: cover_strong
+        color: "#c9752a"
+      - state: decor_diagonal
+        color: "#cf792d"
+      - state: decor_wingette_circle
+        color: gold
+      - state: icon_question
+      - state: detail_bookmark
+        color: "#cf792d"
     - type: Paper
       content: book-text-truth
 
@@ -31,9 +50,15 @@
   description: The book is a well-preserved hardcover with a simple, elegant design on the cover, depicting the image of a world in motion. The pages are crisp and clean, with no signs of wear or tear, suggesting that it has been well-cared for and valued by its previous owner. The text is printed in a clear, legible font, and the chapters are organized in a logical and easy-to-follow manner, making it accessible to readers of all levels of expertise.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_world
+      - state: paper
+      - state: cover_base
+        color: "#215e9e"
+      - state: icon_planet
+      - state: icon_text
+      - state: detail_bookmark
+        color: "#2dab24"
     - type: Paper
       content: book-text-world
 
@@ -44,9 +69,16 @@
   description: The book is a small paperback in good condition, with an illustration of Ian the corgi and the colony of penguins on the cover. The title, "Ian and Robert's Antarctic Adventure", is written in bold white letters against a blue background. The back cover features a brief summary of the story, highlighting the themes of humility, resilience, and the beauty of nature.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_antarctica
+      - state: paper
+      - state: cover_base
+        color: "#5779c9"
+      - state: icon_stars2
+      - state: decor_bottom
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-antarctica
 
@@ -57,9 +89,18 @@
   description: The book looks new, with a glossy cover featuring Chuckles the clown and Snuggles the sloth floating in space with a backdrop of stars and planets. Chuckles is dressed in his banana costume and Snuggles is sleeping on a hammock made of space ropes. The title "The Sloth and the Clown - Space Station Shenanigans" is written in bold and colorful letters.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_scsss
+      - state: paper
+      - state: cover_base
+        color: "#e838b9"
+      - state: decor_wingette
+        color: "#ab22ba"
+      - state: decor_spine
+        color: "#f7cc2f"
+      - state: icon_banana
+      - state: detail_bookmark
+        color: "#f7cc2f"
     - type: Paper
       content: book-text-sloth-clown-sss
 
@@ -70,9 +111,18 @@
   description: The book is in excellent condition, with crisp pages and a bright cover. The cover of the book features Chuckles and Snuggles, surrounded by the different species they encountered during their adventures in space. In the background, the Zorgs can be seen peeking out from behind a spaceship.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_scpz
+      - state: paper
+      - state: cover_base
+        color: "#f7cc2f"
+      - state: decor_wingette
+        color: "#ab22ba"
+      - state: decor_spine
+        color: "#e838b9"
+      - state: icon_banana
+      - state: detail_bookmark
+        color: "#ab22ba"
     - type: Paper
       content: book-text-sloth-clown-pz
 
@@ -83,9 +133,18 @@
   description: The book looks new and vibrant, with an image of Chuckles and Snuggles standing in front of the changing maze on the cover. The title "The Sloth and the Clown - Maze Maze Danger" is written in bold, colorful letters that pop against a background of space and stars.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_scmmd
+      - state: paper
+      - state: cover_base
+        color: "#e838b9"
+      - state: decor_wingette
+        color: "#ab22ba"
+      - state: decor_spine
+        color: "#f7cc2f"
+      - state: icon_scmmd
+      - state: detail_bookmark
+        color: "#ab22ba"
     - type: Paper
       content: book-text-sloth-clown-mmd
 
@@ -96,9 +155,21 @@
   description: The cover of the book is an electrifying image of lightning striking the ground, with a silhouette of a person standing in the midst of it. The title is written in bold letters in white against a black background, conveying the power and intensity of the experience. The subtitle is written in smaller letters below the title, providing a hint of the philosophical and spiritual themes explored within.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_struck
+      - state: paper
+      - state: cover_strong
+        color: "#2c384d"
+      - state: decor_wingette
+        color: "#3a4a66"
+      - state: decor_wingette_circle
+        color: "#6d7c9c"
+      - state: icon_glow
+        color: "#f7bb2f"
+      - state: icon_lightning
+        color: "#f7bb2f"
+      - state: detail_bookmark
+        color: "#f7bb2f"
     - type: Paper
       content: book-text-struck
 
@@ -109,9 +180,20 @@
   description: The book is new, with a bright and vibrant cover featuring a plant stretching its leaves towards the sun. The title, "Reaching for the Sun - A Plant's Quest for Life," is written in bold, green letters, with an image of the sun rising behind the plant. The cover evokes a sense of growth, energy, and the beauty of nature.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_sun
+      - state: paper
+      - state: cover_base
+        color: "#255c8a"
+      - state: decor_bottom
+        color: "#2d2e12"
+      - state: icon_glow
+        color: "#f7bb2f"
+      - state: icon_cabbage
+      - state: detail_bookmark
+        color: "#f7bb2f"
+      - state: detail_rivets
+        color: "#f7bb2f"
     - type: Paper
       content: book-text-sun
 
@@ -122,9 +204,15 @@
   description: The book is in good condition, with a hardcover and a dark green forest background. In the center of the cover, there is a sad looking possum sitting on a branch, with a distant and lonely expression on its face. The title, "Fallen Ambitions - The Tragic Tale of Morty the Possum," is written in bold, gold letters above the possum.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_possum
+      - state: paper
+      - state: cover_old
+        color: "#a3bfae"
+      - state: icon_possum
+      - state: detail_bookmark
+        color: "#2b593d"
+      - state: overlay_blood
     - type: Paper
       content: book-text-possum
 
@@ -135,9 +223,14 @@
   description: The book is in new condition, with a vibrant and whimsical cover that features a charming illustration of a tiny possum peeking out from behind a coffee cup, with a colorful and bustling cafe scene in the background. The title "The Cafe Possum" is written in bold, playful lettering, and the author's name is printed in a smaller font below it.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_cafe
+      - state: paper
+      - state: cover_strong
+        color: "#e8ab6d"
+      - state: icon_possum
+      - state: detail_bookmark
+        color: "#2b593d"
     - type: Paper
       content: book-text-cafe
 
@@ -150,7 +243,15 @@
     - type: Sprite
       sprite: Objects/Misc/books.rsi
       layers:
-        - state: book4
+      - state: paper
+      - state: cover_strong
+        color: "#abebed"
+      - state: decor_wingette
+        color: "#a081cc"
+      - state: icon_atmos
+      - state: icon_magic
+      - state: detail_bookmark
+        color: "#7396f5"
     - type: Paper
       content: book-text-feather
 
@@ -161,9 +262,16 @@
   description: The book is a new condition with a colorful cover, depicting Ian the corgi and Renault the fox on a journey through the forest, with the lost wolf pup to their feet. The title "The Adventures of Ian and Renault - Finding the Lost Wolf Pup" is prominently displayed at the top, with the author's name below. The cover has a whimsical and adventurous feel to it, attracting readers of all ages.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_wolfpup
+      - state: paper
+      - state: cover_base
+        color: "#3a9e57"
+      - state: decor_bottom
+        color: "#1c6330"
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-wolfpup
 
@@ -174,9 +282,16 @@
   description: 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.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_ranch
+      - state: paper
+      - state: cover_base
+        color: "#ccab64"
+      - state: decor_bottom
+        color: "#946e38"
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-ranch
 
@@ -187,9 +302,16 @@
   description: 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."
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_ocean
+      - state: paper
+      - state: cover_base
+        color: "#567cd6"
+      - state: decor_bottom
+        color: "#272782"
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-ocean
 
@@ -200,9 +322,15 @@
   description: 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.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_mountain
+      - state: paper
+      - state: cover_base
+        color: "#86b4d9"
+      - state: icon_mount
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-mountain
 
@@ -213,9 +341,16 @@
   description: 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.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_city
+      - state: paper
+      - state: cover_base
+        color: "#9a9b9c"
+      - state: decor_bottom
+        color: "#5f6061"
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-city
 
@@ -226,9 +361,16 @@
   description: The book looks new and adventurous, with a picture of Ian and Renault standing in front of an icy landscape with snowflakes falling all around them. The title, "The Adventures of Ian and Renault," is written in bold letters at the top, with a subtitle that reads, "An Arctic Journey of Courage and Friendship."
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_arctic
+      - state: paper
+      - state: cover_base
+        color: "#5779c9"
+      - state: icon_stars2
+      - state: decor_bottom
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-arctic
 
@@ -239,9 +381,16 @@
   description: The book is in new condition and would have a colorful cover depicting Ian and Renault against a desert backdrop. The cover would feature images of various animals and plants that the two encountered on their adventure, such as a rattlesnake, coyotes, sand dunes, and an oasis. The title, "The Adventures of Ian and Renault" is prominently displayed on the cover in bold letters, while the subtitle "Exploring the Mysterious Desert" is written in smaller letters underneath.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_desert
+      - state: paper
+      - state: cover_base
+        color: "#507bad"
+      - state: decor_bottom
+        color: "#bd9a55"
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-desert
 
@@ -252,9 +401,15 @@
   description: The book is a gently used philosophy text, with a cover that features a close-up of a person's mouth, with the word "names" written on their lips. The title is "The Power of Names - A Philosophical Exploration," and the author's name is prominently displayed underneath. The overall design is simple and elegant, with the focus on the text rather than any flashy graphics or images.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_names
+      - state: paper
+      - state: cover_base
+        color: "#8c8c8c"
+      - state: decor_wingette_circle
+      - state: icon_letter_N
+      - state: detail_bookmark
+      - state: overlay_dirt
     - type: Paper
       content: book-text-names
 
@@ -265,9 +420,19 @@
   description: The book is in good condition, with a slightly faded cover due to exposure to sunlight.  The cover of the book depicts a panoramic view of the Earth from space, with a bright blue ocean and green landmasses. In the foreground, a lone astronaut is seen sitting in front of a window, gazing wistfully at the Earth. The title of the book, "Earthly Longing," is written in bold white letters against a black background at the top of the cover.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_earth
+      - state: paper
+      - state: cover_strong
+        color: "#0f204f"
+      - state: decor_wingette_circle
+        color: "#2c5491"
+      - state: decor_vertical_middle
+        color: "#3c6ab0"
+      - state: icon_planet
+      - state: icon_text3
+      - state: detail_bookmark
+        color: "#2c5491"
     - type: Paper
       content: book-text-earth
 
@@ -278,9 +443,21 @@
   description: The book is in excellent condition, with a shiny cover depicting a spaceship hovering above a planet, perhaps with the Earth in the background. The title "Journey Beyond - The Starship Aurora Mission" is written in bold, silver letters. The cover also features a quote from a review, "A breathtaking tale of human achievement and exploration" to entice potential readers.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_aurora
+      - state: paper
+      - state: cover_base
+        color: "#0f204f"
+      - state: decor_vertical_middle
+        color: "#3c6ab0" 
+      - state: decor_spine
+        color: "#3c6ab0" 
+      - state: icon_stars2
+      - state: icon_aurora
+      - state: detail_bookmark
+        color: "#2c5491"
+      - state: detail_rivets
+        color: "#799dd4"
     - type: Paper
       content: book-text-aurora
 
@@ -291,9 +468,18 @@
   description: The book appears new with crisp pages and an uncreased spine. The cover features an image of a temple with a glowing, multicolored aura around it, symbolizing the various gods discussed in the book. The title is displayed prominently in gold lettering, with the author's name and a brief summary of the book written in smaller text below.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_temple
+      - state: paper
+      - state: cover_base
+        color: "#542e80"
+      - state: decor_vertical_middle
+        color: "#39205e"
+      - state: decor_wingette_circle
+        color: "#914fb8"
+      - state: icon_temple
+      - state: detail_bookmark
+        color: "#bfbfbf"
     - type: Paper
       content: book-text-temple
 
@@ -304,9 +490,18 @@
   description: The book is in good condition, with a slightly worn cover that features a dark and ominous space station looming in the background. The title "Watched" is written in bold letters that seem to be staring back at the reader, conveying the feeling of being constantly observed. The blurb on the back cover hints at a thrilling and suspenseful tale of paranoia and danger in a confined setting.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_watched
+      - state: paper
+      - state: cover_base
+        color: "#611e10"
+      - state: overlay_dirt
+        color: "#4f1206"
+      - state: decor_wingette_circle
+        color: "#241e1d"
+      - state: icon_eye
+      - state: detail_bookmark
+        color: "#bfbfbf"
     - type: Paper
       content: book-text-watched
 
@@ -317,9 +512,17 @@
   description: The cover features Smith, the medical officer, in his uniform, looking determined and ready to face any challenge. The backdrop shows the SS Horizon under attack, with explosions and smoke filling the space station. In the foreground, a wizard with a staff can be seen, adding an element of mystery and intrigue to the scene. The title is prominently displayed in bold letters, with the author's name and a tagline indicating the book's action-packed and suspenseful nature.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_medical
+      - state: paper
+      - state: cover_base
+        color: "#d7dadb"
+      - state: decor_wingette_circle
+        color: "#55b0d4"
+      - state: icon_medical_cross
+        color: "#55b0d4"
+      - state: detail_bookmark
+        color: "#55b0d4"
     - type: Paper
       content: book-text-medical-officer
 
@@ -330,9 +533,16 @@
   description: The book looks old and worn, with faded lettering on the cover. The cover depicts a dark and eerie morgue, with a full moon casting an ominous glow over the scene. In the foreground are Morty the possum and Morticia the raccoon, with mischievous expressions on their faces, peeking out from behind a metal shelf. The title is written in bold, spooky letters, with the subtitle "A Tale of Animal Spirits" written in smaller font below.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_morgue
+      - state: paper
+      - state: cover_old
+        color: "#d7dadb"
+      - state: icon_text2
+        color: "#61363d"
+      - state: overlay_dirt
+      - state: detail_bookmark
+        color: "#61363d"
     - type: Paper
       content: book-text-morgue
 
@@ -343,9 +553,21 @@
   description: The book is in new condition, with vibrant colors and illustrations on the cover. The cover shows Rufus on his bicycle, with Blossom flying beside him in a playful manner. The title is written in bold, whimsical font, with the characters' names highlighted in a contrasting color. The overall aesthetic is charming and inviting, appealing to children and adults alike.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_rufus
+      - state: paper
+      - state: cover_base
+        color: "#6597c9"
+      - state: decor_bottom
+        color: "#113a63"
+      - state: decor_diagonal
+        color: "#113a63"
+      - state: icon_text3
+        color: "#ffde7d"
+      - state: detail_bookmark
+        color: "#61363d"
+      - state: detail_rivets
+        color: "#ffde7d"
     - type: Paper
       content: book-text-rufus
 
@@ -356,9 +578,19 @@
   description: The book is in a good condition, with a glossy cover depicting a jungle scene with vibrant colors and intricate details. The title "The Map of Adventure," is written in bold, gold lettering. The cover also features an image of a mysterious suitcase with the map spilling out of it.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_map
+      - state: paper
+      - state: cover_base
+        color: "#56c463"
+      - state: icon_briefcase
+      - state: decor_wingette
+        color: "#298033"
+      - state: icon_briefcase
+      - state: detail_bookmark
+        color: "#61363d"
+      - state: detail_rivets
+        color: "#ffde7d"
     - type: Paper
       content: book-text-map
 
@@ -369,9 +601,17 @@
   description: The book is in excellent condition, with crisp pages and a glossy cover. The cover features a striking image of a mountain range, with a silhouette of a climber with a guitar on their back in the foreground. The title is bold and eye-catching, with the subtitle "A Journey of Music, Mountains, and Self-Discovery."
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_journ_mount
+      - state: paper
+      - state: cover_base
+        color: "#9bc1c9"
+      - state: icon_briefcase
+      - state: icon_mount
+      - state: detail_bookmark
+        color: "#61363d"
+      - state: detail_rivets
+        color: "#ffde7d"
     - type: Paper
       content: book-text-journ-mount
 
@@ -384,7 +624,16 @@
     - type: Sprite
       sprite: Objects/Misc/books.rsi
       layers:
-        - state: book6
+      - state: paper
+      - state: cover_base
+        color: "#1d662c"
+      - state: decor_spine
+        color: "#2a8c58"
+      - state: icon_glow
+        color: "#b9edc4"
+      - state: icon_tree
+      - state: detail_bookmark
+        color: "#61363d"
     - type: Paper
       content: book-text-inspiration
 
@@ -397,7 +646,14 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0 
+    - state: paper
+    - state: cover_old
+      color: "#c526de"
+    - state: decor_wingette
+    - state: icon_bucket
+    - state: detail_bookmark
+      color: "#61363d"
+    - state: overlay_dirt
   - type: Paper
     content: book-text-janitor
 
diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
index aa8823d70d..762204701c 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
@@ -1,8 +1,8 @@
 - type: entity
   parent: BaseStorageItem
-  abstract: true
   id: BriefcaseBase
   description: Useful for carrying items in your hands.
+  abstract: true
   components:
   - type: Item
     size: Ginormous
@@ -14,10 +14,9 @@
     - Briefcase
 
 - type: entity
-  name: brown briefcase
   parent: BriefcaseBase
   id: BriefcaseBrown
-  description: A handy briefcase.
+  name: brown briefcase
   components:
   - type: Sprite
     sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
@@ -26,23 +25,9 @@
     sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
 
 - type: entity
-  parent: BriefcaseBase
-  abstract: true
-  id: BriefcaseSyndieBase
+  parent: BriefcaseBrown
+  id: BriefcaseSyndie
   suffix: Syndicate, Empty
-  description: Useful for carrying items in your hands.
   components:
   - type: Item
     size: Huge
-
-- type: entity
-  name: brown briefcase
-  parent: BriefcaseSyndieBase
-  id: BriefcaseSyndie
-  description: A handy briefcase.
-  components:
-  - type: Sprite
-    sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
-    state: icon
-  - type: Item
-    sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Misc/cds.yml b/Resources/Prototypes/Entities/Objects/Misc/cds.yml
new file mode 100644
index 0000000000..a80a7d1d58
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/cds.yml
@@ -0,0 +1,19 @@
+- type: entity
+  name: coordinates disk
+  parent: BaseItem
+  id: CoordinatesDisk
+  description: A disk containing the coordinates to a location in space. Necessary for any FTL-traversing vessel to reach their destination. Fits inside shuttle consoles.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/cd.rsi
+    state: icon
+  - type: StaticPrice
+    price: 100
+  - type: Tag
+    tags:
+    - CoordinatesDisk
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 1
+  - type: ShuttleDestinationCoordinates
diff --git a/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml b/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml
index 1fe3b8a271..f170aa899e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml
@@ -14,9 +14,9 @@
     successChance: 1
     interactSuccessSound:
       collection: DeskBell
-    params:
-      variation: 0.03
-      volume: 3
+      params:
+        variation: 0.03
+        volume: 3
     onActivate: true
   - type: EmitSoundOnUse
     sound:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/diskcases.yml b/Resources/Prototypes/Entities/Objects/Misc/diskcases.yml
new file mode 100644
index 0000000000..da86d7a00d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/diskcases.yml
@@ -0,0 +1,21 @@
+- type: entity
+  name: diskcase
+  parent: BaseStorageItem
+  id: DiskCase
+  description: Case for storing a coordinates disk.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/diskcases.rsi
+    state: icon_base
+  - type: Storage
+    grid:
+    - 0,0,0,1
+    maxItemSize: Normal
+    whitelist:
+      tags:
+        - Document
+        - CoordinatesDisk
+    storageOpenSound: /Audio/Machines/screwdriveropen.ogg
+    storageCloseSound: /Audio/Machines/screwdriverclose.ogg
+    storageInsertSound: /Audio/Items/crowbar.ogg
+    storageRemoveSound: /Audio/Items/crowbar.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml b/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
index bc3488aaf4..43c4568e70 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
@@ -48,6 +48,5 @@
         types:
           Heat: 5
       coldDamage: {}
-      ColdDamageThreshold: 0
+      coldDamageThreshold: 0
     - type: FrictionContacts
-      
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index 657201912e..a100500494 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -58,11 +58,9 @@
         types:
           Heat: 5
       coldDamage: {}
-      ColdDamageThreshold: 0
+      coldDamageThreshold: 0
     - type: Flammable
       fireSpread: true #If you walk into incredibly dense, flaming vines, you can expect to burn.
-      cold:
-        types: {}
       damage:
         types:
           Heat: 3
@@ -75,11 +73,12 @@
         methods: [Touch]
         effects:
         - !type:HealthChange
-          scaled: true
+          scaleByQuantity: true
           damage:
             types:
               Heat: 10
     - type: AtmosExposed
+    - type: Kudzu
       growthTickChance: 0.3
       spreadChance: 0.4
     - type: SpeedModifierContacts
@@ -235,7 +234,6 @@
       damage:
        types:
          Heat: 3
-      growthTickChance: 0.3
     - type: AtmosExposed
     - type: SpeedModifierContacts
       walkSpeedModifier: 0.3
diff --git a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
index 799a7baae1..4529be251f 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
@@ -70,11 +70,9 @@
         types:
           Heat: 5
       coldDamage: {}
-      ColdDamageThreshold: 0
+      coldDamageThreshold: 0
     - type: Flammable
       fireSpread: true
-      cold:
-        types: {}
       damage:
         types:
           Heat: 5
@@ -157,11 +155,9 @@
         types:
           Heat: 5
       coldDamage: {}
-      ColdDamageThreshold: 0
+      coldDamageThreshold: 0
     - type: Flammable
       fireSpread: true
-      cold:
-        types: {}
       damage:
         types:
           Heat: 5
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
index 97cde34a23..5995f18fb9 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -206,7 +206,6 @@
       implantAction: ActionActivateScramImplant
     - type: TriggerImplantAction
     - type: ScramImplant
-      teleportAttempts: 10 # small amount of risk of being teleported into space and lets you teleport off shuttles
 
 - type: entity
   parent: BaseSubdermalImplant
diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 81bb043e4f..ffd21ab032 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -17,7 +17,6 @@
     count: 1
   - type: Tag
     tags:
-      - NoPaint
       - DroneUsable
   - type: Damageable
     damageContainer: Inorganic
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
index c6ed578cf5..0a470b072d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -68,7 +68,6 @@
     failChance: 0
     locPrefix: "necro"
     healSound: "/Audio/Effects/lightburn.ogg"
-    cooldownTime: 1.3
   - type: Summonable
     specialItem: SpawnPointGhostCerberus
     respawnTime: 300
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index d53641fbb6..c49ef70983 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -89,123 +89,6 @@
         - Mop
         - MopAdv
 
-- type: entity
-  name: mop bucket
-  id: MopBucket
-  description: Holds water and the tears of the janitor.
-  components:
-  - type: Clickable
-  - type: Sprite
-    sprite: Objects/Specific/Janitorial/janitorial.rsi
-    noRot: true
-    layers:
-    - state: mopbucket
-    - state: mopbucket_water-1
-      map: ["enum.SolutionContainerLayers.Fill"]
-      visible: false
-    drawdepth: Objects
-  - type: InteractionOutline
-  - type: SolutionContainerManager
-    solutions:
-      bucket:
-        maxVol: 600
-  - type: Spillable
-    solution: bucket
-    spillDelay: 3.0
-  - type: DrainableSolution
-    solution: bucket
-  - type: RefillableSolution
-    solution: bucket
-  - type: ExaminableSolution
-    solution: bucket
-  - type: Tag
-    tags:
-      - Wringer
-  - type: ItemMapper
-    mapLayers:
-      mopbucket_shark_blue:
-        whitelist:
-          tags:
-            - PlushieSharkBlue
-      mopbucket_shark_pink:
-        whitelist:
-          tags:
-            - PlushieSharkPink
-      mopbucket_shark_grey:
-        whitelist:
-          tags:
-            - PlushieSharkGrey
-    sprite: Objects/Fun/sharkplush.rsi
-  - type: Physics
-    bodyType: Dynamic
-  - type: Transform
-    noRot: true
-  - type: ItemSlots
-    slots:
-      shark_slot:
-        name: mop-bucket-slot-component-slot-name-shark
-        whitelist:
-          tags:
-            - PlushieSharkBlue
-            - PlushieSharkPink
-            - PlushieSharkGrey
-        priority: 3 # Higher than drinking priority
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.25,-0.40,0.25,0.25"
-        density: 60
-        mask:
-        - MobMask
-        layer:
-        - MobLayer
-  - type: Pullable
-  - type: Drink
-    solution: bucket
-  - type: Appearance
-  - type: SolutionContainerVisuals
-    maxFillLevels: 3
-    fillBaseName: mopbucket_water-
-  - type: ContainerContainer
-    containers:
-      storagebase: !type:Container
-        ents: []
-      shark_slot: !type:ContainerSlot {}
-  - type: GuideHelp
-    guides:
-    - Janitorial
-  - type: Damageable
-    damageContainer: Inorganic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 70
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-
-- type: entity
-  name: mop bucket
-  id: MopBucketFull
-  parent: MopBucket
-  suffix: full
-  components:
-    - type: Sprite
-      layers:
-        - state: mopbucket
-        - state: mopbucket_water-3
-          map: [ "enum.SolutionContainerLayers.Fill" ]
-    - type: SolutionContainerManager
-      solutions:
-        bucket:
-          maxVol: 600
-          reagents:
-            - ReagentId: Water
-              Quantity: 600
-
 - type: entity
   name: wet floor sign
   id: WetFloorSign
@@ -281,291 +164,6 @@
     tags: # ignore "WhitelistChameleon" tag
       - WetFloorSign
 
-- type: entity
-  name: janitorial trolley
-  id: JanitorialTrolley
-  parent: BaseStructureDynamic
-  description: This is the alpha and omega of sanitation.
-  components:
-    - type: Sprite
-      noRot: true
-      sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
-      layers:
-        - state: cart
-        - state: cart_water-1
-          map: ["enum.SolutionContainerLayers.Fill"]
-          visible: false
-    - type: Rotatable
-    - type: InteractionOutline
-    # Removing storage until OnInteractUsing logic resolved
-    #- type: Storage
-    #  popup: false
-    #  capacity: 80
-    #  blacklist: # there is exclusive item slots for that
-    #    tags:
-    #      - Mop
-    #      - TrashBag
-    #      - Bucket
-    - type: ItemSlots
-      slots:
-        mop_slot:
-          name: janitorial-trolley-slot-component-slot-name-mop
-          whitelist:
-            tags:
-              - Mop
-          insertOnInteract: false # or it conflicts with bucket logic
-          priority: 9 # Higher than bucket slot
-        plunger_slot:
-          name: janitorial-trolley-slot-component-slot-name-plunger
-          whitelist:
-            tags:
-              - Plunger
-          priority: 8
-        wetfloorsign_slot4:
-          name: janitorial-trolley-slot-component-slot-name-sign
-          whitelist:
-            tags:
-              - WetFloorSign
-          priority: 7
-        wetfloorsign_slot3:
-          name: janitorial-trolley-slot-component-slot-name-sign
-          whitelist:
-            tags:
-              - WetFloorSign
-          priority: 7
-        wetfloorsign_slot2:
-          name: janitorial-trolley-slot-component-slot-name-sign
-          whitelist:
-            tags:
-              - WetFloorSign
-          priority: 7
-        wetfloorsign_slot1:
-          name: janitorial-trolley-slot-component-slot-name-sign
-          whitelist:
-            tags:
-              - WetFloorSign
-          priority: 7
-        lightreplacer_slot:
-          name: janitorial-trolley-slot-component-slot-name-lightreplacer
-          whitelist:
-            components:
-              - LightReplacer
-          priority: 6
-        spraybottle_slot:
-          name: janitorial-trolley-slot-component-slot-name-spray
-          whitelist:
-            tags:
-              - Spray
-          insertOnInteract: false # or it conflicts with bucket logic
-          priority: 5 # Higher than bucket slot
-        bucket_slot:
-          name: janitorial-trolley-slot-component-slot-name-bucket
-          whitelist:
-            tags:
-              - Bucket
-          insertOnInteract: false # or it also conflicts with bucket logic
-          priority: 4 # Higher than trash bag slot
-        trashbag_slot:
-          name: janitorial-trolley-slot-component-slot-name-trashbag
-          whitelist:
-            tags:
-              - TrashBag
-          priority: 3 # Higher than drinking priority
-    - type: Fixtures
-      fixtures:
-        fix1:
-          shape:
-            !type:PhysShapeCircle
-            radius: 0.3
-          density: 250
-          layer:
-          - MobLayer
-          mask:
-          - MobMask
-    - type: Spillable
-      solution: bucket
-      spillDelay: 3.0
-    - type: SolutionContainerManager
-      solutions:
-        bucket:
-          maxVol: 800
-          reagents:
-            - ReagentId: Water
-              Quantity: 600 # 3 quarters full at roundstart to make it more appealing
-    - type: DrainableSolution
-      solution: bucket
-    - type: RefillableSolution
-      solution: bucket
-    - type: ExaminableSolution
-      solution: bucket
-    - type: Tag
-      tags:
-        - Wringer
-    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
-    - type: Destructible
-      thresholds:
-        - trigger:
-            !type:DamageTrigger
-            damage: 400
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-        - trigger:
-            !type:DamageTrigger
-            damage: 200
-          behaviors:
-            - !type:EmptyAllContainersBehaviour
-            - !type:DoActsBehavior
-              acts: ["Destruction"]
-            - !type:PlaySoundBehavior
-              sound:
-                collection: MetalBreak
-    - type: ItemMapper
-      mapLayers:
-        cart_plunger:
-          whitelist:
-            tags:
-              - Plunger
-        cart_mop:
-          whitelist:
-            tags:
-              - MopBasic
-        cart_advmop:
-          whitelist:
-            tags:
-              - MopAdv
-        cart_garbage:
-          whitelist:
-            tags:
-              - TrashBag
-        cart_replacer:
-          whitelist:
-            components:
-              - LightReplacer
-        cart_spray:
-          whitelist:
-            tags:
-              - Spray
-        cart_sign1: # this is like stack of floor signs
-          minCount: 1
-          whitelist:
-            tags:
-              - WetFloorSign
-        cart_sign2:
-          minCount: 2
-          whitelist:
-            tags:
-              - WetFloorSign
-        cart_sign3:
-          minCount: 3
-          whitelist:
-            tags:
-              - WetFloorSign
-        cart_sign4:
-          minCount: 4
-          whitelist:
-            tags:
-              - WetFloorSign
-        cart_bucket:
-          whitelist:
-            tags:
-              - Bucket
-      sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
-    - type: Appearance
-    - type: SolutionContainerVisuals
-      maxFillLevels: 3
-      fillBaseName: cart_water-
-    - type: UserInterface
-      interfaces:
-      - key: enum.StorageUiKey.Key
-        type: StorageBoundUserInterface
-    - type: Drink
-      solution: bucket
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          ents: []
-        mop_slot: !type:ContainerSlot {}
-        trashbag_slot: !type:ContainerSlot {}
-        bucket_slot: !type:ContainerSlot {}
-        plunger_slot: !type:ContainerSlot {}
-        wetfloorsign_slot4: !type:ContainerSlot {}
-        wetfloorsign_slot3: !type:ContainerSlot {}
-        wetfloorsign_slot2: !type:ContainerSlot {}
-        wetfloorsign_slot1: !type:ContainerSlot {}
-        lightreplacer_slot: !type:ContainerSlot {}
-        spraybottle_slot:  !type:ContainerSlot {}
-    - type: GuideHelp
-      guides:
-      - Janitorial
-    - type: TileFrictionModifier
-      modifier: 0.4 # makes it slide
-
-- type: entity
-  id: FloorDrain
-  name: drain
-  description: Drains puddles around it. Useful for dumping mop buckets or keeping certain rooms clean.
-  placement:
-    mode: SnapgridCenter
-  components:
-    - type: Sprite
-      drawdepth: FloorObjects
-      sprite: Objects/Specific/Janitorial/drain.rsi
-      layers:
-      - state: icon
-      - map: [ "enum.SolutionContainerLayers.Fill" ]
-        state: fill-1
-        visible: false
-    - type: InteractionOutline
-    - type: Clickable
-    - type: Transform
-      anchored: true
-    - type: Physics
-      bodyType: Static
-      canCollide: false
-    - type: AmbientSound
-      enabled: false
-      volume: -8
-      range: 8
-      sound:
-        path: /Audio/Ambience/Objects/drain.ogg
-    - type: Drain
-    - type: DumpableSolution
-      solution: drainBuffer
-    - type: Appearance
-    - type: SolutionContainerVisuals
-      maxFillLevels: 1
-      fillBaseName: fill-
-      solutionName: drainBuffer
-    - type: SolutionContainerManager
-      solutions:
-        drainBuffer:
-          maxVol: 1000
-    - type: DrainableSolution
-      solution: drainBuffer
-    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
-    - type: Destructible
-      thresholds:
-        - trigger:
-            !type:DamageTrigger
-            damage: 200
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-        - trigger:
-            !type:DamageTrigger
-            damage: 100
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-            - !type:PlaySoundBehavior
-              sound:
-                collection: MetalBreak
-
 - type: entity
   name: plunger
   id: Plunger
@@ -624,6 +222,15 @@
     damage:
       types:
         Blunt: 3
+  - type: Plunger
+
+- type: weightedRandomEntity
+  id: PlungerLoot
+  weights:
+    RandomSpawner100: 56
+    SpacemenFigureSpawner: 28
+    SpawnMobCockroach: 5
+    MaintenanceToolSpawner: 5
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
index 56786057d5..5678de6baf 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -62,7 +62,6 @@
     solution: soap
   - type: DeleteOnSolutionEmpty
     solution: soap
-  - type: PaintRemover
   - type: FlavorProfile
     flavors:
       - clean
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
index 5a2587ff71..6e5362d9bb 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@@ -66,9 +66,6 @@
     bodyType: KinematicController
   - type: Clickable
   - type: WiresPanel
-  - type: Wires #we just want the panel
-    boardName: wires-board-name-mech
-    layoutId: Mech
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 851fcaa12d..c14c3e8ef0 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -710,6 +710,10 @@
   parent: Pill
   id: PillAmbuzolPlus
   components:
+    - type: Pill
+      pillType: 2
+    - type: Sprite
+      state: pill3
     - type: SolutionContainerManager
       solutions:
         food:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index afd9b9364b..43cfde2a98 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -115,6 +115,7 @@
     solutionName: pen
     transferAmount: 15
     onlyAffectsMobs: false
+    injectOnly: true
   - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 1
@@ -205,6 +206,7 @@
     solutionName: pen
     transferAmount: 20
     onlyAffectsMobs: false
+    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -236,6 +238,7 @@
     solutionName: pen
     transferAmount: 20
     onlyAffectsMobs: false
+    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -267,6 +270,8 @@
     solutionName: pen
     transferAmount: 20
     onlyAffectsMobs: false
+    injectOnly: true
+
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -299,6 +304,7 @@
     solutionName: pen
     transferAmount: 30
     onlyAffectsMobs: false
+    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -337,6 +343,7 @@
     solutionName: pen
     transferAmount: 60
     onlyAffectsMobs: false
+    injectOnly: true
   - type: StaticPrice
     price: 500
   - type: Tag
@@ -397,6 +404,7 @@
     solutionName: pen
     transferAmount: 30
     onlyAffectsMobs: false
+    injectOnly: true
   - type: StaticPrice
     price: 500
   - type: Tag
@@ -447,6 +455,7 @@
     solution: hypospray
   - type: ExaminableSolution
     solution: hypospray
+    heldOnly: true # Allow examination only when held in hand.
   - type: Hypospray
     onlyAffectsMobs: false
   - type: UseDelay
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index cb5d3b6553..135b7fffd6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: BodyBagContainer
+  id: BodyBag
   parent: BaseFoldable
   name: body bag
   description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition.
@@ -85,7 +85,7 @@
   id: BodyBagFolded
   name: body bag
   description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition.
-  parent: BodyBagContainer
+  parent: BodyBag
   suffix: folded
   components:
   - type: Foldable
@@ -120,6 +120,8 @@
   - type: SolutionSpiker
     sourceSolution: food
     ignoreEmpty: true
+  - type: ScoopableSolution
+    solution: food
   - type: Extractable
     grindableSolutionName: food
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index c7eeac03d2..2ca0e6639f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -520,13 +520,13 @@
   components:
     - type: Sprite
       layers:
-        - state: syndicate
-        - state: icon-tools
+      - state: syndicate
+      - state: icon-syndicate
     - type: ItemBorgModule
       items:
-        - Crowbar
-        - Emag
-        - PinpointerSyndicateNuclear
+      - Crowbar
+      - Emag
+      - PinpointerSyndicateNuclear
 
 - type: entity
   id: BorgModuleEsword
@@ -536,12 +536,12 @@
   components:
     - type: Sprite
       layers:
-        - state: syndicate
-        - state: icon-tools
+      - state: syndicate
+      - state: icon-syndicate
     - type: ItemBorgModule
       items:
-        - EnergySwordDouble
-        - PinpointerSyndicateNuclear
+      - EnergySwordDouble
+      - PinpointerSyndicateNuclear
 
 - type: entity
   id: BorgModuleL6C
@@ -551,9 +551,9 @@
   components:
     - type: Sprite
       layers:
-        - state: syndicate
-        - state: icon-tools
+      - state: syndicate
+      - state: icon-syndicate
     - type: ItemBorgModule
       items:
-        - WeaponLightMachineGunL6C
-        - PinpointerSyndicateNuclear
+      - WeaponLightMachineGunL6C
+      - PinpointerSyndicateNuclear
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml b/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml
index adbb7cde40..a17c892169 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml
@@ -9,6 +9,7 @@
     noRot: true
   - type: Repairable
   - type: DamagePopup
+    allowTypeChange: true
     damagePopupType: Combined
   - type: Fixtures
     fixtures:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 63fbed5346..1f0258de03 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -475,7 +475,6 @@
       behaviors:
       - !type:SpillBehavior
         solution: food
-        transferForensics: true
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index 4251977a54..851c127647 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -147,8 +147,12 @@
     predictable: false
     soundActivate:
       path: /Audio/Items/Lighters/zippo_open.ogg
+      params:
+        volume: -5
     soundDeactivate:
       path: /Audio/Items/Lighters/zippo_close.ogg
+      params:
+        volume: -5
   - type: ItemToggleMeleeWeapon
     activatedDamage:
         types:
@@ -206,6 +210,9 @@
     netsync: false
     radius: 1.2 #slightly stronger than the other lighters
     color: orange
+  - type: UseDelay
+  - type: IgnitionSource
+    ignited: false
 
 - type: entity
   name: flippo engraved lighter
diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
index d69ca57e49..9e82c2c1ac 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -163,7 +163,6 @@
     sprite: Objects/Tools/Toolboxes/toolbox_thief.rsi
     state: icon
   - type: ThiefUndeterminedBackpack
-    transformAfterSelect: AlwaysPoweredWallLight
     possibleSets:
     # - TO DO Thief pinpointer needed
     - ChemistrySet
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index af18572550..eecc0a7220 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -389,15 +389,35 @@
       path: "/Audio/Items/drill_hit.ogg"
 
 - type: entity
-  name: RCD
-  parent: BaseItem
   id: RCD
-  description: An advanced construction device which can place/remove walls, floors, and airlocks quickly.
+  parent: BaseItem
+  name: RCD
+  description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function.
   components:
   - type: RCD
+    availablePrototypes:   
+    - WallSolid
+    - FloorSteel
+    - Plating
+    - Catwalk
+    - Grille
+    - Window    
+    - WindowDirectional
+    - WindowReinforcedDirectional
+    - ReinforcedWindow
+    - Airlock
+    - AirlockGlass
+    - Firelock
+    - TubeLight
+    - BulbLight
+    - LVCable
+    - MVCable
+    - HVCable
+    - CableTerminal
+    - Deconstruct
   - type: LimitedCharges
-    maxCharges: 5
-    charges: 5
+    maxCharges: 30
+    charges: 30
   - type: UseDelay
   - type: Sprite
     sprite: Objects/Tools/rcd.rsi
@@ -415,6 +435,12 @@
       Plastic: 100
   - type: StaticPrice
     price: 100
+  - type: UserInterface
+    interfaces:
+    - key: enum.RcdUiKey.Key
+      type: RCDMenuBoundUserInterface
+  - type: ActivatableUI
+    key: enum.RcdUiKey.Key
 
 - type: entity
   id: RCDEmpty
@@ -422,37 +448,50 @@
   suffix: Empty
   components:
   - type: LimitedCharges
-    maxCharges: 5
     charges: 0
+  - type: RCD
+    availablePrototypes:   
+    - WallSolid
+    - FloorSteel
+    - Plating
+    - Catwalk
+    - Grille
+    - Window
+    - WindowDirectional
+    - WindowReinforcedDirectional
+    - ReinforcedWindow
+    - Airlock
+    - AirlockGlass
+    - Firelock
 
 - type: entity
   id: RCDRecharging
   parent: RCD
-  name: experimental rcd
-  description: A bluespace-enhanced RCD that regenerates charges passively.
+  name: experimental RCD
+  description: A bluespace-enhanced rapid construction device that passively generates its own compressed matter.
   suffix: AutoRecharge
   components:
   - type: LimitedCharges
-    maxCharges: 3
-    charges: 3
+    maxCharges: 20
+    charges: 20
   - type: AutoRecharge
-    rechargeDuration: 30
+    rechargeDuration: 10
 
 - type: entity
   id: RCDExperimental
   parent: RCD
   suffix: Admeme
-  name: experimental rcd
-  description: A bluespace-enhanced RCD that regenerates charges passively.
+  name: experimental RCD
+  description: A bluespace-enhanced rapid construction device that passively generates its own compressed matter.
   components:
   - type: AutoRecharge
-    rechargeDuration: 5
+    rechargeDuration: 1
 
 - type: entity
-  name: RCD Ammo
+  name: compressed matter
   parent: BaseItem
   id: RCDAmmo
-  description: Ammo cartridge for an RCD.
+  description: A cartridge of raw matter compacted by bluespace technology. Used in rapid construction devices.
   components:
   - type: RCDAmmo
   - type: Sprite
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 7a8ca2a114..e370a35081 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -110,9 +110,9 @@
     solution: ammo
   - type: DrainableSolution
     solution: ammo
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnProjectileHit
     transferAmount: 15
-    blockSlots: NONE #tranquillizer darts shouldn't be blocked by a mask
+    solution: ammo
   - type: InjectableSolution
     solution: ammo
 
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 8bf5690a79..48599c6055 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -226,7 +226,7 @@
   name: practice laser rifle
   parent: WeaponLaserCarbine
   id: WeaponLaserCarbinePractice
-  description: This modified laser rifle fires harmless beams in the 40-watt range, for target practice.
+  description: This modified laser rifle fires nearly harmless beams in the 40-watt range, for target practice.
   components:
   - type: ProjectileBatteryAmmoProvider
     proto: BulletTrailLaserPractice
@@ -475,7 +475,7 @@
   name: practice disabler
   parent: WeaponDisabler
   id: WeaponDisablerPractice
-  description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for cadets.
+  description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for cadets making it mostly harmless.
   components:
     - type: Sprite
       sprite: Objects/Weapons/Guns/Battery/practice_disabler.rsi
@@ -630,6 +630,7 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/Revolvers/chimp.rsi
   - type: Gun
+    projectileSpeed: 4
     fireRate: 1.5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
@@ -644,6 +645,8 @@
       fireCost: 100
     - proto: AnomalousParticleZetaStrong
       fireCost: 100
+    - proto: AnomalousParticleSigmaStrong
+      fireCost: 100
   - type: Construction
     graph: UpgradeWeaponPistolCHIMP
     node: start
@@ -666,6 +669,8 @@
       fireCost: 100
     - proto: AnomalousParticleZetaStrong
       fireCost: 100
+    - proto: AnomalousParticleSigmaStrong
+      fireCost: 100
 
 - type: entity
   name: eye of a behonker
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
index 8dbcf2b303..52c5dc8a9d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
@@ -50,9 +50,9 @@
     solution: ammo
   - type: InjectableSolution
     solution: ammo
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnEmbed
     transferAmount: 2
-    blockSlots: NONE
+    solution: ammo
   - type: SolutionTransfer
     maxTransferAmount: 2
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
index 99c4a7bdf2..3f37d308db 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -35,7 +35,7 @@
   id: RedLaserPractice
   damage:
     types:
-      Heat: 0
+      Heat: 1
   muzzleFlash:
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
     state: muzzle_laser
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 79dfeb1d1f..b4016e5935 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -102,7 +102,7 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 2
+        Blunt: 1
 
 - type: entity
   id: BaseBulletRubber
@@ -290,7 +290,7 @@
       fly-by: *flybyfixture
   - type: Ammo
   - type: StaminaDamageOnCollide
-    damage: 5
+    damage: 1
   - type: Projectile
     impactEffect: BulletImpactEffectDisabler
     damage:
@@ -498,6 +498,11 @@
   name: delta particles
   noSpawn: true
   components:
+  - type: PointLight
+    enabled: true
+    color: "#c2385d"
+    radius: 2.0
+    energy: 7.0
   - type: AnomalousParticle
     particleType: Delta
   - type: Sprite
@@ -524,6 +529,9 @@
         Heat: 5
   - type: TimedDespawn
     lifetime: 3
+  - type: Reflective
+    reflective:
+    - Energy
 
 
 - type: entity
@@ -544,6 +552,11 @@
   name: epsilon particles
   noSpawn: true
   components:
+  - type: PointLight
+    enabled: true
+    color: "#38c296"
+    radius: 2.0
+    energy: 7.0
   - type: Sprite
     layers:
       - state: magicm_cyan
@@ -569,6 +582,11 @@
   name: zeta particles
   noSpawn: true
   components:
+  - type: PointLight
+    enabled: true
+    color: "#b9c238"
+    radius: 2.0
+    energy: 7.0
   - type: Sprite
     layers:
       - state: magicm_yellow
@@ -594,6 +612,11 @@
   name: omega particles
   noSpawn: true
   components:
+  - type: PointLight
+    enabled: true
+    color: "#38c24f"
+    radius: 2.0
+    energy: 7.0
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
     layers:
@@ -612,6 +635,33 @@
       types:
         Heat: 20
 
+- type: entity
+  parent: AnomalousParticleDelta
+  id: AnomalousParticleSigma
+  name: sigma particles
+  noSpawn: true
+  components:
+  - type: PointLight
+    enabled: true
+    color: "#8d38c2"
+    radius: 2.0
+    energy: 7.0
+  - type: Sprite
+    layers:
+      - state: magicm
+        shader: unshaded
+  - type: AnomalousParticle
+    particleType: Sigma
+
+- type: entity
+  parent: AnomalousParticleSigma
+  id: AnomalousParticleSigmaStrong
+  name: sigma particles
+  noSpawn: true
+  components:
+  - type: AnomalousParticle
+    particleType: Sigma
+
 # Launcher projectiles (grenade / rocket)
 - type: entity
   id: BulletRocket
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index 8ba643a115..834d35a529 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -40,6 +40,21 @@
     tags:
     - BaseballBat
 
+- type: entity
+  name: incomplete baseball bat
+  parent: BaseItem
+  id: IncompleteBaseBallBat
+  description: A few planks of wood stuck together.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/incomplete_bat.rsi
+    state: icon
+  - type: Item
+    size: Normal
+  - type: Construction
+    graph: WoodenBat
+    node: incompleteBat
+
 - type: entity
   name: knockback stick
   parent: BaseBallBat
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 4cd1de298f..277097bd94 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -82,9 +82,6 @@
     enabled: false
     reflects:
       - Energy
-  - type: Tag
-    tags:
-      - NoPaint
   - type: IgnitionSource
     temperature: 700
 
@@ -177,7 +174,6 @@
   - type: Tag
     tags:
     - Write
-    - NoPaint
   - type: DisarmMalus
     malus: 0
   - type: Reflect
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 504dd89eda..7bac8251db 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -273,6 +273,7 @@
     tags:
     - CombatKnife
     - Knife
+    - CannonRestrict
   - type: Sprite
     sprite: Objects/Weapons/Melee/throwing_knife.rsi
     state: icon
@@ -285,6 +286,7 @@
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/star_hit.ogg
   - type: DamageOtherOnHit
+    ignoreResistances: true
     damage:
       types:
         Slash: 10
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
index 93bd7f696a..8bfec739cc 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -53,6 +53,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
   - type: Construction
     graph: Spear
     node: spear
@@ -66,10 +67,9 @@
     solution: melee
   - type: InjectableSolution
     solution: melee
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnEmbed
     transferAmount: 2
-    fixtureId: "throw-fixture"
-    blockSlots: NONE
+    solution: melee
   - type: SolutionTransfer
     maxTransferAmount: 2
   - type: Wieldable
diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
index e71b3ce46d..c3fbb998b2 100644
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -120,4 +120,4 @@
   id: BaseStationAllEventsEligible
   abstract: true
   components:
-    - type: StationEventEligible # For when someone makes this more granular in the future.
+    - type: StationEventEligible # For when someone makes this more granular in the future.
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
index 07fea9ef0a..58b63b68cf 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
@@ -23,17 +23,14 @@
           !type:DamageTrigger
           damage: 50
         behaviors:
-          - !type:DoActsBehavior
-        acts: [ "Destruction" ]
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
   - type: AmbientSound
     volume: -5
     range: 5
     sound:
       path: /Audio/Ambience/Objects/fireplace.ogg
   - type: AlwaysHot
-  - type: Tag
-    tags:
-      - NoPaint
 
 - type: entity
   id: LegionnaireBonfire
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
index e30fcef0dd..042a7548c9 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -69,7 +69,6 @@
       beakerSlot: !type:ContainerSlot
   - type: StaticPrice
     price: 1000
-  - type: Wires
   - type: WiresPanel
   - type: DeviceList
   - type: DeviceNetwork
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
index 15e40f79c3..712083b7ff 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
@@ -16,9 +16,6 @@
     noRot: false
   - type: Machine
     board: BoozeDispenserMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-booze
-    layoutId: BoozeDispenser
   - type: GuideHelp
     guides:
     - Bartender
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
index 7a9731d629..09ec0a812e 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
@@ -28,9 +28,6 @@
         acts: ["Destruction"]
   - type: Machine
     board: ChemDispenserMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-chemdispenser
-    layoutId: ChemDispenser
   - type: GuideHelp
     guides:
     - Chemicals
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
index 4322d56947..59fd97b2cf 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
@@ -16,9 +16,6 @@
     noRot: false
   - type: Machine
     board: SodaDispenserMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-soda
-    layoutId: SodaDispenser
   - type: GuideHelp
     guides:
     - Bartender
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 91f984bf69..45b19ab84e 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -4,10 +4,9 @@
   id: AirlockServiceLocked
   suffix: Service, Locked
   components:
-  - type: AccessReader
-    access: [["Service"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsService ]
 
 - type: entity
   parent: Airlock
@@ -24,108 +23,99 @@
   id: AirlockTheatreLocked
   suffix: Theatre, Locked
   components:
-  - type: AccessReader
-    access: [["Theatre"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsTheatre ]
 
 - type: entity
   parent: Airlock
   id: AirlockChapelLocked
   suffix: Chapel, Locked
   components:
-  - type: AccessReader
-    access: [["Chapel"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChapel ]
 
 - type: entity
   parent: Airlock
   id: AirlockJanitorLocked
   suffix: Janitor, Locked
   components:
-  - type: AccessReader
-    access: [["Janitor"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJanitor ]
 
 - type: entity
   parent: Airlock
   id: AirlockKitchenLocked
   suffix: Kitchen, Locked
   components:
-  - type: AccessReader
-    access: [["Kitchen"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsKitchen ]
 
 - type: entity
   parent: Airlock
   id: AirlockBarLocked
   suffix: Bar, Locked
   components:
-  - type: AccessReader
-    access: [["Bar"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsBar ]
 
 - type: entity
   parent: Airlock
   id: AirlockHydroponicsLocked
   suffix: Hydroponics, Locked
   components:
-  - type: AccessReader
-    access: [["Hydroponics"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHydroponics ]
 
 - type: entity
   parent: Airlock
   id: AirlockServiceCaptainLocked
   suffix: Captain, Locked
   components:
-  - type: AccessReader
-    access: [["Captain"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCaptain ]
 
 - type: entity
   parent: AirlockExternal
   id: AirlockExternalLocked
   suffix: External, Locked
   components:
-  - type: AccessReader
-    access: [["External"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsExternal ]
 
 - type: entity
   parent: AirlockExternal
   id: AirlockExternalCargoLocked
   suffix: External, Cargo, Locked
   components:
-  - type: AccessReader
-    access: [["Cargo"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCargo ]
 
 - type: entity
   parent: AirlockExternal
   id: AirlockExternalEngineeringLocked
   suffix: External, Engineering, Locked
   components:
-  - type: AccessReader
-    access: [["Engineering"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsEngineering ]
 
 - type: entity
   parent: AirlockExternal
   id: AirlockExternalAtmosphericsLocked
   suffix: External, Atmospherics, Locked
   components:
-  - type: AccessReader
-    access: [["Atmospherics"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsAtmospherics ]
 
 - type: entity
   parent: AirlockExternal
@@ -148,20 +138,18 @@
   id: AirlockFreezerLocked
   suffix: Kitchen, Locked
   components:
-  - type: AccessReader
-    access: [["Kitchen"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsKitchen ]
 
 - type: entity
   parent: AirlockFreezer
   id: AirlockFreezerKitchenHydroLocked
   suffix: Kitchen/Hydroponics, Locked
   components:
-  - type: AccessReader
-    access: [["Kitchen"], ["Hydroponics"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsFreezer ]
 
 - type: entity
   parent: AirlockFreezer
@@ -178,40 +166,36 @@
   id: AirlockEngineeringLocked
   suffix: Engineering, Locked
   components:
-  - type: AccessReader
-    access: [["Engineering"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsEngineering ]
 
 - type: entity
   parent: AirlockAtmospherics
   id: AirlockAtmosphericsLocked
   suffix: Atmospherics, Locked
   components:
-  - type: AccessReader
-    access: [["Atmospherics"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsAtmospherics ]
 
 - type: entity
   parent: AirlockCargo
   id: AirlockCargoLocked
   suffix: Cargo, Locked
   components:
-  - type: AccessReader
-    access: [["Cargo"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCargo ]
 
 - type: entity
   parent: AirlockCargo
   id: AirlockSalvageLocked
   suffix: Salvage, Locked
   components:
-  - type: AccessReader
-    access: [["Salvage"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSalvage ]
 
 - type: entity
   parent: AirlockMining
@@ -228,50 +212,45 @@
   id: AirlockMedicalLocked
   suffix: Medical, Locked
   components:
-  - type: AccessReader
-    access: [["Medical"]]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMedical ]
 
 - type: entity
   parent: AirlockVirology
   id: AirlockVirologyLocked
   suffix: Virology, Locked
   components:
-  - type: AccessReader
-    access: [["Medical"]]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMedical ]
 
 - type: entity
   parent: AirlockChemistry
   id: AirlockChemistryLocked
   suffix: Chemistry, Locked
   components:
-  - type: AccessReader
-    access: [["Chemistry"]]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChemistry ]
 
 - type: entity
   parent: AirlockScience
   id: AirlockScienceLocked
   suffix: Science, Locked
   components:
-  - type: AccessReader
-    access: [["Research"]]
-  - type: Wires
-    layoutId: AirlockScience
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsResearch ]
 
 - type: entity
   parent: AirlockScience
   id: AirlockMedicalScienceLocked
   suffix: Medical/Science, Locked
   components:
-  - type: AccessReader
-    access: [["Research"], ["Medical"]]
-  - type: Wires
-    layoutId: AirlockScience
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsScience ]
 
 - type: entity
   parent: AirlockCentralCommand
@@ -288,8 +267,9 @@
   id: AirlockCommandLocked
   suffix: Command, Locked
   components:
-  - type: AccessReader
-    access: [["Command"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
   - type: Wires
     layoutId: AirlockCommand
 
@@ -298,78 +278,72 @@
   id: AirlockCaptainLocked
   suffix: Captain, Locked
   components:
-  - type: AccessReader
-    access: [["Captain"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCaptain ]
 
 - type: entity
   parent: AirlockCommand
   id: AirlockChiefMedicalOfficerLocked
   suffix: ChiefMedicalOfficer, Locked
   components:
-  - type: AccessReader
-    access: [["ChiefMedicalOfficer"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefMedicalOfficer ]
 
 - type: entity
   parent: AirlockCommand
   id: AirlockChiefEngineerLocked
   suffix: ChiefEngineer, Locked
   components:
-  - type: AccessReader
-    access: [["ChiefEngineer"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefEngineer ]
 
 - type: entity
   parent: AirlockCommand
   id: AirlockHeadOfSecurityLocked
   suffix: HeadOfSecurity, Locked
   components:
-  - type: AccessReader
-    access: [["HeadOfSecurity"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHeadOfSecurity ]
 
 - type: entity
   parent: AirlockCommand
   id: AirlockResearchDirectorLocked
   suffix: ResearchDirector, Locked
   components:
-  - type: AccessReader
-    access: [["ResearchDirector"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsResearchDirector ]
 
 - type: entity
   parent: AirlockCommand
   id: AirlockHeadOfPersonnelLocked
   suffix: HeadOfPersonnel, Locked
   components:
-  - type: AccessReader
-    access: [["HeadOfPersonnel"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHeadOfPersonnel ]
 
 - type: entity
   parent: AirlockCommand
   id: AirlockQuartermasterLocked
   suffix: Quartermaster, Locked
   components:
-  - type: AccessReader
-    access: [["Quartermaster"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsQuartermaster ]
 
 - type: entity
   parent: AirlockSecurity
   id: AirlockSecurityLocked
   suffix: Security, Locked
   components:
-  - type: AccessReader
-    access: [["Security"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
   - type: Wires
     layoutId: AirlockSecurity
 
@@ -378,8 +352,9 @@
   id: AirlockDetectiveLocked
   suffix: Detective, Locked
   components:
-  - type: AccessReader
-    access: [["Detective"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsDetective ]
   - type: Wires
     layoutId: AirlockSecurity
 
@@ -388,8 +363,9 @@
   id: AirlockBrigLocked
   suffix: Brig, Locked
   components:
-  - type: AccessReader
-    access: [["Brig"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsBrig ]
   - type: Wires
     layoutId: AirlockSecurity
 
@@ -408,8 +384,9 @@
   id: AirlockArmoryLocked
   suffix: Armory, Locked
   components:
-  - type: AccessReader
-    access: [["Armory"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsArmory ]
   - type: Wires
     layoutId: AirlockArmory
 
@@ -418,20 +395,18 @@
   id: AirlockVaultLocked
   suffix: Vault, Locked
   components:
-  - type: AccessReader
-    access: [["Security", "Command"]]
-  - type: Wires
-    layoutId: AirlockSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsVault ]
 
 - type: entity
   parent: AirlockCommand
   id: AirlockEVALocked
   suffix: EVA, Locked
   components:
-  - type: AccessReader
-    access: [["External"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsExternal ]
 
 # Glass Airlocks
 - type: entity
@@ -439,10 +414,9 @@
   id: AirlockServiceGlassLocked
   suffix: Service, Locked
   components:
-  - type: AccessReader
-    access: [["Service"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsService ]
 
 - type: entity
   parent: AirlockGlass
@@ -469,28 +443,27 @@
   id: AirlockBarGlassLocked
   suffix: Bar, Locked
   components:
-  - type: AccessReader
-    access: [["Bar"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsBar ]
 
 - type: entity
   parent: AirlockExternalGlass
   id: AirlockExternalGlassLocked
   suffix: External, Glass, Locked
   components:
-  - type: AccessReader
-    access: [["External"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsExternal ]
 
 - type: entity
   parent: AirlockExternalGlass
   id: AirlockExternalGlassCargoLocked
   suffix: External, Glass, Cargo, Locked
   components:
-  - type: AccessReader
-    access: [["Cargo"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCargo ]
 
 - type: entity
   parent: AirlockExternalGlass
@@ -513,30 +486,27 @@
   id: AirlockExternalGlassEngineeringLocked
   suffix: External, Glass, Engineering, Locked
   components:
-  - type: AccessReader
-    access: [["Engineering"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsEngineering ]
 
 - type: entity
   parent: AirlockExternalGlass
   id: AirlockExternalGlassAtmosphericsLocked
   suffix: External, Glass, Atmospherics, Locked
   components:
-  - type: AccessReader
-    access: [["Atmospherics"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsAtmospherics ]
 
 - type: entity
   parent: AirlockGlass
   id: AirlockKitchenGlassLocked
   suffix: Kitchen, Locked
   components:
-  - type: AccessReader
-    access: [["Kitchen"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsKitchen ]
 
 - type: entity
   parent: AirlockGlass
@@ -553,60 +523,54 @@
   id: AirlockHydroGlassLocked
   suffix: Hydroponics, Locked
   components:
-  - type: AccessReader
-    access: [["Hydroponics"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHydroponics ]
 
 - type: entity
   parent: AirlockGlass
   id: AirlockChapelGlassLocked
   suffix: Chapel, Locked
   components:
-  - type: AccessReader
-    access: [["Chapel"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChapel ]
 
 - type: entity
   parent: AirlockEngineeringGlass
   id: AirlockEngineeringGlassLocked
   suffix: Engineering, Locked
   components:
-  - type: AccessReader
-    access: [["Engineering"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsEngineering ]
 
 - type: entity
   parent: AirlockAtmosphericsGlass
   id: AirlockAtmosphericsGlassLocked
   suffix: Atmospherics, Locked
   components:
-  - type: AccessReader
-    access: [["Atmospherics"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsAtmospherics ]
 
 - type: entity
   parent: AirlockCargoGlass
   id: AirlockCargoGlassLocked
   suffix: Cargo, Locked
   components:
-  - type: AccessReader
-    access: [["Cargo"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCargo ]
 
 - type: entity
   parent: AirlockCargoGlass
   id: AirlockSalvageGlassLocked
   suffix: Salvage, Locked
   components:
-  - type: AccessReader
-    access: [["Salvage"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSalvage ]
 
 - type: entity
   parent: AirlockMiningGlass
@@ -633,40 +597,36 @@
   id: AirlockMedicalGlassLocked
   suffix: Medical, Locked
   components:
-  - type: AccessReader
-    access: [["Medical"]]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMedical ]
 
 - type: entity
   parent: AirlockVirologyGlass
   id: AirlockVirologyGlassLocked
   suffix: Virology, Locked
   components:
-  - type: AccessReader
-    access: [["Medical"]]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMedical ]
 
 - type: entity
   parent: AirlockScienceGlass
   id: AirlockScienceGlassLocked
   suffix: Science, Locked
   components:
-  - type: AccessReader
-    access: [["Research"]]
-  - type: Wires
-    layoutId: AirlockScience
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsResearch ]
 
 - type: entity
   parent: AirlockScienceGlass
   id: AirlockMedicalScienceGlassLocked
   suffix: Medical/Science, Locked
   components:
-  - type: AccessReader
-    access: [["Research"], ["Medical"]]
-  - type: Wires
-    layoutId: AirlockScience
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsScience ]
 
 - type: entity
   parent: AirlockCentralCommandGlass
@@ -683,110 +643,99 @@
   id: AirlockCommandGlassLocked
   suffix: Command, Locked
   components:
-  - type: AccessReader
-    access: [["Command"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
 
 - type: entity
   parent: AirlockCommandGlass
   id: AirlockCaptainGlassLocked
   suffix: Captain, Locked
   components:
-  - type: AccessReader
-    access: [["Captain"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCaptain ]
 
 - type: entity
   parent: AirlockCommandGlass
   id: AirlockChiefMedicalOfficerGlassLocked
   suffix: ChiefMedicalOfficer, Locked
   components:
-  - type: AccessReader
-    access: [["ChiefMedicalOfficer"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefMedicalOfficer ]
 
 - type: entity
   parent: AirlockCommandGlass
   id: AirlockChiefEngineerGlassLocked
   suffix: ChiefEngineer, Locked
   components:
-  - type: AccessReader
-    access: [["ChiefEngineer"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefEngineer ]
 
 - type: entity
   parent: AirlockCommandGlass
   id: AirlockHeadOfSecurityGlassLocked
   suffix: HeadOfSecurity, Locked
   components:
-  - type: AccessReader
-    access: [["HeadOfSecurity"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHeadOfSecurity ]
 
 - type: entity
   parent: AirlockCommandGlass
   id: AirlockResearchDirectorGlassLocked
   suffix: ResearchDirector, Locked
   components:
-  - type: AccessReader
-    access: [["ResearchDirector"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsResearchDirector ]
 
 - type: entity
   parent: AirlockCommandGlass
   id: AirlockHeadOfPersonnelGlassLocked
   suffix: HeadOfPersonnel, Locked
   components:
-  - type: AccessReader
-    access: [["HeadOfPersonnel"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHeadOfPersonnel ]
 
 - type: entity
   parent: AirlockCommandGlass
   id: AirlockQuartermasterGlassLocked
   suffix: Quartermaster, Locked
   components:
-  - type: AccessReader
-    access: [["Quartermaster"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsQuartermaster ]
 
 - type: entity
   parent: AirlockSecurityGlass
   id: AirlockSecurityGlassLocked
   suffix: Security, Locked
   components:
-  - type: AccessReader
-    access: [["Security"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
 
 - type: entity
   parent: AirlockSecurityGlass
   id: AirlockDetectiveGlassLocked
   suffix: Detective, Locked
   components:
-  - type: AccessReader
-    access: [["Detective"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsDetective ]
 
 - type: entity
   parent: AirlockSecurityGlass
   id: AirlockBrigGlassLocked
   suffix: Brig, Locked
   components:
-  - type: AccessReader
-    access: [["Brig"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsBrig ]
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -803,18 +752,18 @@
   id: AirlockArmoryGlassLocked
   suffix: Armory, Locked
   components:
-  - type: AccessReader
-    access: [["Armory"]]
-  - type: Wires
-    layoutId: AirlockSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsArmory ]
 
 - type: entity
   parent: AirlockCommandGlassLocked
   id: AirlockEVAGlassLocked
   suffix: EVA, Locked
   components:
-  - type: AccessReader
-    access: [["External"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsExternal ]
 
 - type: entity
   parent: AirlockSyndicateGlass
@@ -838,114 +787,108 @@
   id: AirlockMaintLocked
   suffix: Locked
   components:
-  - type: AccessReader
-    access: [["Maintenance"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMaintenance ]
 
 - type: entity
   parent: AirlockMaintGlass
   id: AirlockMaintGlassLocked
   suffix: Locked
   components:
-  - type: AccessReader
-    access: [["Maintenance"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMaintenance ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintSalvageLocked
   suffix: Salvage, Locked
   components:
-  - type: AccessReader
-    access: [["Salvage"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSalvage ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintCargoLocked
   suffix: Cargo, Locked
   components:
-  - type: AccessReader
-    access: [["Cargo"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCargo ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintCommandLocked
   suffix: Command, Locked
   components:
-  - type: AccessReader
-    access: [["Command"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintCommonLocked
   suffix: Common, Locked
   components:
-  - type: AccessReader
-    access: [["Maintenance"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMaintenance ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintEngiLocked
   suffix: Engineering, Locked
   components:
-  - type: AccessReader
-    access: [["Engineering"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsEngineering ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintAtmoLocked
   suffix: Atmospherics, Locked
   components:
-  - type: AccessReader
-    access: [["Atmospherics"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsAtmospherics ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintBarLocked
   suffix: Bar, Locked
   components:
-  - type: AccessReader
-    access: [["Bar"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsBar ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintChapelLocked
   suffix: Chapel, Locked
   components:
-  - type: AccessReader
-    access: [["Chapel"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChapel ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintHydroLocked
   suffix: Hydroponics, Locked
   components:
-  - type: AccessReader
-    access: [["Hydroponics"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHydroponics ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintJanitorLocked
   suffix: Janitor, Locked
   components:
-  - type: AccessReader
-    access: [["Janitor"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJanitor ]
 
 - type: entity
   parent: AirlockMaint
@@ -972,108 +915,99 @@
   id: AirlockMaintTheatreLocked
   suffix: Theatre, Locked
   components:
-  - type: AccessReader
-    access: [["Theatre"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsTheatre ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintKitchenLocked
   suffix: Kitchen, Locked
   components:
-  - type: AccessReader
-    access: [["Kitchen"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsKitchen ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintIntLocked
   suffix: Interior, Locked
   components:
-  - type: AccessReader
-    access: [["Maintenance"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMaintenance ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintMedLocked
   suffix: Medical, Locked
   components:
-  - type: AccessReader
-    access: [["Medical"]]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMedical ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintChemLocked
   suffix: Chemistry, Locked
   components:
-  - type: AccessReader
-    access: [["Chemistry"]]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChemistry ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintRnDLocked
   suffix: Science, Locked
   components:
-  - type: AccessReader
-    access: [["Research"]]
-  - type: Wires
-    layoutId: AirlockScience
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsResearch ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintRnDMedLocked
   suffix: Medical/Science, Locked
   components:
-  - type: AccessReader
-    access: [["Research"], ["Medical"]]
-  - type: Wires
-    layoutId: AirlockScience
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsRnDMed ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintSecLocked
   suffix: Security, Locked
   components:
-  - type: AccessReader
-    access: [["Security"]]
-  - type: Wires
-    layoutId: AirlockSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintDetectiveLocked
   suffix: Detective, Locked
   components:
-  - type: AccessReader
-    access: [["Detective"]]
-  - type: Wires
-    layoutId: AirlockSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsDetective ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintHOPLocked
   suffix: HeadOfPersonnel, Locked
   components:
-  - type: AccessReader
-    access: [["HeadOfPersonnel"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHeadOfPersonnel ]
 
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintCaptainLocked
   suffix: Captain, Locked
   components:
-  - type: AccessReader
-    access: [["Captain"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCaptain ]
 
 - type: entity
   parent: AirlockMaint
@@ -1147,8 +1081,9 @@
   id: AirlockExternalShuttleLocked
   suffix: External, Docking, Locked
   components:
-  - type: AccessReader
-    access: [["External"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsExternal ]
 
 - type: entity
   parent: AirlockShuttleSyndicate
@@ -1171,8 +1106,9 @@
   id: AirlockExternalGlassShuttleLocked
   suffix: External, Glass, Docking, Locked
   components:
-  - type: AccessReader
-    access: [["External"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsExternal ]
 
 - type: entity
   parent: AirlockGlassShuttleSyndicate
@@ -1197,8 +1133,9 @@
   components:
     - type: PriorityDock
       tag: DockEmergency
-    - type: AccessReader
-      access: [["External"]]
+    - type: ContainerFill
+      containers:
+        board: [ DoorElectronicsExternal ]
 
 - type: entity
   parent: AirlockGlassShuttle
@@ -1239,24 +1176,27 @@
   id: HighSecCommandLocked
   suffix: Command, Locked
   components:
-  - type: AccessReader
-    access: [["Command"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
 
 - type: entity
   parent: HighSecDoor
   id: HighSecCaptainLocked
   suffix: Captain, Locked
   components:
-  - type: AccessReader
-    access: [["Captain"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCaptain ]
 
 - type: entity
   parent: HighSecDoor
   id: HighSecArmoryLocked
   suffix: Armory, Locked
   components:
-  - type: AccessReader
-    access: [["Armory"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsArmory ]
 
 #Airtight hatch
 
@@ -1265,6 +1205,6 @@
   id: AirlockHatchSyndicate
   suffix: Syndicate, Locked
   components:
-  - type: AccessReader
-    access: [["SyndicateAgent"]]
-
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
index 43036b6520..3896bf83e0 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -140,48 +140,6 @@
     sprite: Structures/Doors/Airlocks/Standard/hatch_maint.rsi
 
 # Glass
-
-- type: entity
-  id: AirlockGlass
-  parent: Airlock
-  name: glass airlock
-  components:
-  - type: MeleeSound
-    soundGroups:
-      Brute:
-        collection: GlassSmack
-  - type: Door
-    occludes: false
-  - type: Occluder
-    enabled: false
-  - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/glass.rsi
-  - type: AnimationPlayer
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
-        density: 100
-        mask:
-        - FullTileMask
-        layer:     #removed opaque from the layer, allowing lasers to pass through glass airlocks
-        - GlassAirlockLayer
-  - type: LayerChangeOnWeld
-    unWeldedLayer: GlassAirlockLayer
-    weldedLayer: GlassLayer
-  - type: Construction
-    graph: Airlock
-    node: glassAirlock
-  - type: PaintableAirlock
-    group: Glass
-  - type: RadiationBlocker
-    resistance: 2
-  - type: Tag
-    tags:
-      - GlassAirlock
-      # This tag is used to nagivate the Airlock construction graph. It's needed because the construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
 - type: entity
   parent: AirlockGlass
   id: AirlockEngineeringGlass
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
index 17b770faec..8b007427e8 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
@@ -30,6 +30,10 @@
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: StructuralMetallic
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index da99f93bf0..44ac68dd58 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -48,6 +48,8 @@
   - type: ContainerFill
     containers:
       board: [ DoorElectronics ]
+  - type: AccessReader
+    containerAccessProvider: board
   - type: Door
     crushDamage:
       types:
@@ -111,6 +113,10 @@
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: StructuralMetallicStrong
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8    
   - type: Destructible
     thresholds:
     - trigger:
@@ -133,7 +139,6 @@
   - type: PaintableAirlock
     group: Standard
     department: Civilian
-  - type: AccessReader
   - type: StaticPrice
     price: 150
   - type: LightningTarget
@@ -146,5 +151,53 @@
   - type: BlockWeather
   placement:
     mode: SnapgridCenter
+ 
+- type: entity
+  id: AirlockRCDResistant
+  parent: Airlock
+  abstract: true
+  components:
+  - type: RCDDeconstructable
+    deconstructable: false
 
-
+- type: entity
+  id: AirlockGlass
+  parent: Airlock
+  name: glass airlock
+  components:
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmack
+  - type: Door
+    occludes: false
+  - type: Occluder
+    enabled: false
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/glass.rsi
+  - type: AnimationPlayer
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
+        density: 100
+        mask:
+        - FullTileMask
+        layer:     #removed opaque from the layer, allowing lasers to pass through glass airlocks
+        - GlassAirlockLayer
+  - type: LayerChangeOnWeld
+    unWeldedLayer: GlassAirlockLayer
+    weldedLayer: GlassLayer
+  - type: Construction
+    graph: Airlock
+    node: glassAirlock
+  - type: PaintableAirlock
+    group: Glass
+  - type: RadiationBlocker
+    resistance: 2
+  - type: Tag
+    tags:
+      - GlassAirlock
+      # This tag is used to nagivate the Airlock construction graph. It's needed because the construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
index f1d5158749..00df7a942e 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: Airlock
+  parent: AirlockRCDResistant
   id: AirlockExternal
   suffix: External
   description: It opens, it closes, it might crush you, and there might be only space behind it. Has to be manually activated.
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index 65a3cf5bef..6670eb3fac 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: Airlock
+  parent: AirlockRCDResistant
   id: AirlockShuttle
   suffix: Docking
   name: external airlock
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index 25e5796252..873184062f 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -19,6 +19,10 @@
     - type: Damageable
       damageContainer: StructuralInorganic
       damageModifierSet: StructuralMetallic
+    - type: RCDDeconstructable
+      cost: 4
+      delay: 6
+      fx: EffectRCDDeconstruct6
     - type: Destructible
       thresholds:
       - trigger:
@@ -83,9 +87,6 @@
     - type: Appearance
     - type: WiresVisuals
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-firelock
-      layoutId: Firelock
     - type: UserInterface
       interfaces:
         - key: enum.WiresUiKey.Key
@@ -151,7 +152,7 @@
 
 - type: entity
   id: FirelockEdge
-  parent: BaseFirelock
+  parent: Firelock
   name: firelock
   components:
     - type: Sprite
@@ -181,3 +182,6 @@
       canCollide: false
     - type: StaticPrice
       price: 100
+    - type: Construction
+      graph: Firelock
+      node: FirelockEdge
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
index 46a174d244..cd3242b33b 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
@@ -25,6 +25,10 @@
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: StructuralMetallic
+  - type: RCDDeconstructable
+    cost: 4
+    delay: 6
+    fx: EffectRCDDeconstruct6    
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
index ed875126ec..1b425d859a 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -43,6 +43,10 @@
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: StructuralMetallic
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 6
+    fx: EffectRCDDeconstruct6
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
index 85e33b3865..2f1ad217ce 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
@@ -41,6 +41,10 @@
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: StructuralMetallic
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -97,6 +101,10 @@
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: StructuralMetallic
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
index c4060c2095..84085fc6ba 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
@@ -4,6 +4,7 @@
   name: blast door
   description: This one says 'BLAST DONGER'.
   components:
+  - type: AccessReader
   - type: Sprite
     sprite: Structures/Doors/Shutters/blastdoor.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door_autolink.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door_autolink.yml
index 399760616c..3386703ec9 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door_autolink.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door_autolink.yml
@@ -56,6 +56,8 @@
   parent: BlastDoor
   suffix: Autolink, Bridge
   components:
+    - type: AccessReader
+      access: [["Command"]]
     - type: AutoLinkReceiver
       channel: Bridge
 
@@ -64,9 +66,51 @@
   parent: BlastDoorOpen
   suffix: Open, Autolink, Bridge
   components:
+    - type: AccessReader
+      access: [["Command"]]
     - type: AutoLinkReceiver
       channel: Bridge
 
+- type: entity
+  id: BlastDoorEngineering
+  parent: BlastDoor
+  suffix: Autolink, Engineering
+  components:
+  - type: AccessReader
+    access: [["Command"], ["Engineering"]]
+  - type: AutoLinkReceiver
+    channel: Engineering
+
+- type: entity
+  id: BlastDoorEngineeringOpen
+  parent: BlastDoorOpen
+  suffix: Open, Autolink, Engineering
+  components:
+  - type: AccessReader
+    access: [["Command"], ["Engineering"]]
+  - type: AutoLinkReceiver
+    channel: Engineering
+
+- type: entity
+  id: BlastDoorScience
+  parent: BlastDoor
+  suffix: Autolink, Science
+  components:
+  - type: AccessReader
+    access: [["Command"], ["Research"]]
+  - type: AutoLinkReceiver
+    channel: Research
+
+- type: entity
+  id: BlastDoorScienceOpen
+  parent: BlastDoorOpen
+  suffix: Open, Autolink, Science
+  components:
+  - type: AccessReader
+    access: [["Command"], ["Research"]]
+  - type: AutoLinkReceiver
+    channel: Research
+
 - type: entity
   id: BlastDoorWindows
   parent: BlastDoor
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
index 7d5b00713c..6534ad39c4 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
@@ -26,6 +26,10 @@
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: StructuralMetallic
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
index b3c45bc4f2..1f4f68a59c 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -66,7 +66,11 @@
     damageContainer: StructuralInorganic
     damageModifierSet: Glass
   - type: ExaminableDamage
-    messages: WindowMessages
+    messages: WindowMessages   
+  - type: RCDDeconstructable
+    cost: 8
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 6cecb75bf4..be41fd733f 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -290,6 +290,7 @@
           MaterialWoodPlank:
             min: 1
             max: 1
+  - type: Construction
     graph: RitualSeat
     node: chairCursed
 
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
index a6f14b383c..f02b126248 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -2,48 +2,100 @@
   name: toilet
   id: ToiletEmpty
   suffix: Empty
-  parent: SeatBase
+  parent: [ DisposalUnitBase, SeatBase ]
   description: The HT-451, a torque rotation-based, waste disposal unit for small matter. This one seems remarkably clean.
   components:
-  - type: MeleeSound
-    soundGroups:
-      Brute:
-        path:
-          "/Audio/Weapons/slash.ogg"
-  - type: Anchorable
   - type: Sprite
     sprite: Structures/Furniture/toilet.rsi
-    state: closed_toilet_seat_up
+    layers:
+    - state: condisposal
+      map: [ "enum.DisposalUnitVisualLayers.Unanchored" ]
+    - state: disposal
+      map: [ "enum.DisposalUnitVisualLayers.Base" ]
+    - state: disposal-flush
+      map: [ "enum.DisposalUnitVisualLayers.OverlayFlush" ]
+    - state: dispover-charge
+      map: [ "enum.DisposalUnitVisualLayers.OverlayCharging" ]
+    - state: dispover-ready
+      map: [ "enum.DisposalUnitVisualLayers.OverlayReady" ]
+    - state: dispover-full
+      map: [ "enum.DisposalUnitVisualLayers.OverlayFull" ]
+    - state: dispover-handle
+      map: [ "enum.DisposalUnitVisualLayers.OverlayEngaged" ]
+    - map: [ "DoorVisualState.DoorOpen" ]
+    - map: [ "SeatVisualState.SeatUp" ]
+  - type: Rotatable
+  - type: Transform
+    noRot: false
+  - type: Strap
+    whitelist:
+      components:
+      - HumanoidAppearance
+  - type: DisposalUnit
+    autoEngageEnabled: false
+    noUI: true
+    blacklist:
+      components:
+      - HumanoidAppearance
+      - Plunger
+      - SolutionTransfer
+    whitelist:
+      components:
+      - Item
+    soundFlush: /Audio/Effects/Fluids/flush.ogg
+    soundInsert: /Audio/Effects/Fluids/splash.ogg
   - type: Toilet
-  - type: SecretStash
-    secretPartName: secret-stash-part-toilet
   - type: ContainerContainer
     containers:
       stash: !type:ContainerSlot {}
-  - type: SolutionContainerManager
-    solutions:
-      drainBuffer:
-        maxVol: 500
-      toilet:
-        maxVol: 250
-  - type: Transform
-    anchored: true
+      disposals: !type:Container
   - type: Physics
     bodyType: Static
   - type: Construction
     graph: Toilet
     node: toilet
+  - type: PlungerUse
   - type: Appearance
+  - type: SecretStash
+    secretPartName: secret-stash-part-toilet
+    examineStash: toilet-component-on-examine-found-hidden-item
+    openableStash: true
   - type: Drain
     autoDrain: false
-  - type: DumpableSolution
-    solution: drainBuffer
-  - type: SolutionContainerVisuals
-    maxFillLevels: 1
-    fillBaseName: fill-
-    solutionName: drainBuffer
   - type: StaticPrice
     price: 25
+  - type: UserInterface
+    interfaces:
+    - key: enum.DisposalUnitUiKey.Key
+      type: DisposalUnitBoundUserInterface
+  - type: RatKingRummageable
+  - type: SolutionContainerManager
+    solutions:
+      drainBuffer:
+        maxVol: 100
+      tank:
+        maxVol: 500
+  - type: SolutionRegeneration
+    solution: tank
+    generated:
+      reagents:
+      - ReagentId: Water
+        Quantity: 1
+  - type: DrainableSolution
+    solution: tank
+  - type: ReagentTank
+  - type: DumpableSolution
+    solution: drainBuffer
+  - type: GenericVisualizer
+    visuals:
+      enum.ToiletVisuals.SeatVisualState:
+        SeatVisualState.SeatUp:
+          SeatUp: { state: disposal-up }
+          SeatDown: { state: disposal-down }
+      enum.StashVisuals.DoorVisualState:
+        DoorVisualState.DoorOpen:
+          DoorOpen: { state: disposal-open }
+          DoorClosed: { state: disposal-closed }
 
 - type: entity
   id: ToiletDirtyWater
diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
index 4e9e428373..a837790dd7 100644
--- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
+++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
@@ -23,9 +23,6 @@
         behaviors:
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
-  - type: Tag
-    tags:
-      - NoPaint
 
 - type: entity
   id: HoloFan
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index 4231f63628..a5c62d4055 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -37,6 +37,10 @@
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: StructuralMetallic
+  - type: RCDDeconstructable
+    cost: 4
+    delay: 2
+    fx: EffectRCDDeconstruct2  
   - type: Destructible
     thresholds:
     - trigger:
@@ -68,7 +72,7 @@
     mode: SnapgridCenter
     snap:
     - Wallmount
-
+    
 - type: entity
   name: light
   description: "A light fixture. Draws power and produces light when equipped with a light tube."
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index 49f33d1cff..40fa8cf472 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -7,7 +7,6 @@
   components:
   - type: ApcPowerReceiver
     powerLoad: 350
-    priority: Low
   - type: ExtensionCableReceiver
   - type: PointLight
     radius: 1.8
@@ -70,7 +69,8 @@
   - type: PointLight
     color: "#e3a136"
   - type: SpaceVillainArcade
-    rewardAmount: 0
+    rewardMinAmount: 0
+    rewardMaxAmount: 0
     possibleRewards:
     - ToyMouse
     - ToyAi
@@ -146,8 +146,8 @@
     board: SpaceVillainArcadeComputerCircuitboard
   - type: Advertise
     pack: SpaceVillainAds
-    minWait: 60 # Arcades are noisy
-    maxWait: 240
+    minimumWait: 60 # Arcades are noisy
+    maximumWait: 240
   - type: SpeakOnUIClosed
     pack: SpaceVillainGoodbyes
 
@@ -190,7 +190,7 @@
     board: BlockGameArcadeComputerCircuitboard
   - type: Advertise
     pack: BlockGameAds
-    minWait: 60 # Arcades are noisy
-    maxWait: 240
+    minimumWait: 60 # Arcades are noisy
+    maximumWait: 240
   - type: SpeakOnUIClosed
     pack: BlockGameGoodbyes
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 7f70576ff6..7ad03272b1 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -63,6 +63,22 @@
     color: "#43ccb5"
   - type: Rotatable
     rotateWhileAnchored: true
+  - type: ItemSlots
+    slots:
+      disk_slot:
+        name: Disk
+        insertSound:
+          path: /Audio/Machines/terminal_insert_disc.ogg
+        ejectSound:
+          path: /Audio/Machines/terminal_insert_disc.ogg
+        whitelist:
+          components:
+          - ShuttleDestinationCoordinates
+  - type: ContainerContainer
+    containers:
+      board: !type:Container
+        ents: []
+      disk_slot: !type:ContainerSlot {}
 
 - type: entity
   parent: BaseComputerShuttle
@@ -406,7 +422,6 @@
       type: ResearchClientBoundUserInterface
   - type: ApcPowerReceiver
     powerLoad: 1000
-    priority: Low
   - type: Computer
     board: ResearchComputerCircuitboard
   - type: AccessReader
@@ -455,7 +470,6 @@
       type: ResearchClientBoundUserInterface
   - type: ApcPowerReceiver
     powerLoad: 1000
-    priority: Low
   - type: Computer
     board: AnalysisComputerCircuitboard
   - type: PointLight
@@ -800,6 +814,8 @@
     radius: 1.5
     energy: 1.6
     color: "#b89f25"
+  - type: AccessReader
+    access: [["Quartermaster"]]
   - type: GuideHelp
     guides:
     - CargoBounties
@@ -962,7 +978,6 @@
     speechVerb: Robotic
   - type: SurveillanceCameraSpeaker
   - type: SurveillanceCameraMonitor
-    speechEnabled: true
   - type: ActivatableUI
     key: enum.SurveillanceCameraMonitorUiKey.Key
   - type: ActivatableUIRequiresVision
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
index e2c210e7e6..23789730d0 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
@@ -29,8 +29,6 @@
           components:
           - FitsInDispenser
   - type: Machine
-  - type: Wires
-    layoutId: chem
   - type: WiresPanel
   - type: WiresVisuals
   - type: ContainerContainer
diff --git a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
index cc9f8035fe..ab09a03fef 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
@@ -37,9 +37,6 @@
     color: "#fca3c0"
   - type: Appearance
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-vessel
-    layoutId: Vessel
   - type: AmbientSound
     enabled: false
     range: 3
@@ -160,6 +157,7 @@
     board: APECircuitboard
   - type: Lock
     locked: false
+  - type: LockedWiresPanel
   - type: AccessReader
     access: [[ "Research" ]]
   - type: Emitter
@@ -171,10 +169,12 @@
     - AnomalousParticleDelta
     - AnomalousParticleEpsilon
     - AnomalousParticleZeta
+    - AnomalousParticleSigma
     setTypePorts:
       SetParticleDelta: AnomalousParticleDelta
       SetParticleEpsilon: AnomalousParticleEpsilon
       SetParticleZeta: AnomalousParticleZeta
+      SetParticleSigma: AnomalousParticleSigma
     fireBurstSize: 1
     fireBurstDelayMin: 2
     fireBurstDelayMax: 6
@@ -184,6 +184,7 @@
     guides:
     - APE
   - type: Gun
+    projectileSpeed: 4
     fireRate: 10 #just has to be fast enough to keep up with upgrades
     showExamineText: false
     selectedMode: SemiAuto
@@ -194,9 +195,6 @@
   - type: Appearance
   - type: WiresPanel
   - type: WiresVisuals
-  - type: Wires
-    boardName: wires-board-name-ape
-    layoutId: Ape
   - type: GenericVisualizer
     visuals:
       enum.PowerDeviceVisuals.Powered:
@@ -204,6 +202,7 @@
           True: { visible: true }
           False: { visible: false }
   - type: LockVisuals
+  - type: LockedAnchorable
   - type: DeviceNetwork
     deviceNetId: Wireless
     receiveFrequencyId: BasicDevice
@@ -217,6 +216,7 @@
       - SetParticleDelta
       - SetParticleEpsilon
       - SetParticleZeta
+      - SetParticleSigma
 
 - type: entity
   id: MachineAnomalyGenerator
@@ -284,9 +284,6 @@
     fuelCost: 10
     doAfterDelay: 5
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-anomalygenerator
-    layoutId: AnomalyGenerator
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
index 1b183661f5..b00d6d8986 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
@@ -143,9 +143,6 @@
         Blunt: 10
   - type: Machine
     board: ArtifactCrusherMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-crusher
-    layoutId: Crusher
   - type: WiresPanel
   - type: Sprite
     sprite: Structures/Machines/artifact_crusher.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
index 01fdd0054f..d671bd9635 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -63,9 +63,6 @@
           False: { visible: false }
   # Machine / Construction stuff
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-chemmaster
-    layoutId: chem_master
   - type: Machine
     board: ChemMasterMachineCircuitboard
   - type: ContainerContainer
diff --git a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
index da902dce29..b71cf42bb1 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
@@ -52,9 +52,6 @@
     materialWhiteList:
     - Biomass
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-cloningpod
-    layoutId: CloningPod
   - type: ApcPowerReceiver
     powerLoad: 200 #Receives most of its power from the console
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
index b069d28a33..8281a6548b 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
@@ -23,7 +23,6 @@
         machine_parts: !type:Container
     - type: CrewMonitoringServer
     - type: SingletonDeviceNetServer
-      ServerType: CrewMonitoringServer
     - type: DeviceNetwork
       deviceNetId: Wireless
       transmitFrequencyId: CrewMonitor
@@ -34,7 +33,6 @@
     - type: StationLimitedNetwork
     - type: ApcPowerReceiver
       powerLoad: 200
-      priority: Low
     - type: ExtensionCableReceiver
     - type: Destructible
       thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
index a46f53f09e..96de462b79 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
@@ -98,9 +98,6 @@
   - type: Machine
     board: FatExtractorMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-fatextractor
-    layoutId: FatExtractor
   - type: Appearance
   - type: Speech
     speechVerb: Robotic
diff --git a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
index 54a32db69f..3244789a02 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
@@ -52,9 +52,6 @@
       path: /Audio/Items/rped.ogg
   - type: WiresPanel
   - type: WiresVisuals
-  - type: Wires
-    boardName: wires-board-name-flatpacker
-    layoutId: Flatpacker
   - type: Appearance
   - type: ActivatableUI
     key: enum.FlatpackCreatorUIKey.Key
diff --git a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
index 2eb4f57fab..618538dccb 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
@@ -55,7 +55,7 @@
     activePower: 2500
     lightRadiusMin: 0.75
     lightRadiusMax: 2.5
-    spritemap:
+    spriteMap:
       broken: "broken"
       unpowered: "off"
       off: "off"
@@ -120,9 +120,6 @@
             min: 1
             max: 1
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-minigravitygenerator
-    layoutId: MiniGravityGenerator
   - type: Machine
     board: MiniGravityGeneratorCircuitboard
   - type: ApcPowerReceiver
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 8f438e0208..5387d1ed15 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -42,9 +42,6 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-autolathe
-    layoutId: Autolathe
   - type: ActivatableUI
     key: enum.LatheUiKey.Key
   - type: ActivatableUIRequiresPower
@@ -270,9 +267,6 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Machine
     board: ProtolatheMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-protolathe
-    layoutId: Protolathe
   - type: Lathe
     idleState: icon
     runningState: building
diff --git a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
index 028e348fd4..9a9c5283c0 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
@@ -61,9 +61,6 @@
   - type: Machine
     board: MaterialReclaimerMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-reclaimer
-    layoutId: Reclaimer
   - type: MaterialReclaimer
     whitelist:
       components:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
index 9dab23a3b4..3cfc421b7b 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
@@ -69,9 +69,6 @@
   - type: Machine
     board: MedicalScannerMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-medicalscanner
-    layoutId: MedicalScanner
   - type: Appearance
   - type: Climbable
   - type: ApcPowerReceiver
diff --git a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
similarity index 93%
rename from Resources/Prototypes/Entities/Objects/Devices/nuke.yml
rename to Resources/Prototypes/Entities/Structures/Machines/nuke.yml
index 96d422dc0c..2aab75d54e 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseStructure
+  parent: [BaseStructure, StructureWheeled]
   id: NuclearBomb
   name: nuclear fission explosive
   description: You probably shouldn't stick around to see if this is armed.
@@ -29,7 +29,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.45
-        density: 80 #It has wheels and bluespace tech to make it lighter.
+        density: 255 # Has "bluespace technology" to make it lighter, whatever that means. Don't mind the fact that this is lighter then a high capacity fuel tank.
         mask:
         - MachineMask
         layer:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
index 3bb1458b8c..773112f6f3 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -97,4 +97,8 @@
     node: machine
     containers:
     - machine_parts
-    - machine_board
\ No newline at end of file
+    - machine_board
+  - type: DrainableSolution
+    solution: output
+  - type: ExaminableSolution
+    solution: output
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml
index 7b369f62cc..948b3f84b2 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/research.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml
@@ -20,11 +20,8 @@
     - CivilianServices
   - type: ApcPowerReceiver
     powerLoad: 200
-    priority: Low
   - type: ExtensionCableReceiver
   - type: WiresPanel
-  - type: Wires
-    layoutId: rndserver
   - type: WiresVisuals
   - type: Machine
     board: ResearchAndDevelopmentServerMachineCircuitboard
diff --git a/Resources/Prototypes/Entities/Structures/Machines/salvage.yml b/Resources/Prototypes/Entities/Structures/Machines/salvage.yml
index 1b279782df..a17eed5712 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/salvage.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/salvage.yml
@@ -52,7 +52,6 @@
   description: Locates salvage.
   components:
   - type: SalvageMagnet
-    offsetRadiusMax: 32
   - type: ApcPowerReceiver
     powerLoad: 1000
 
diff --git a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
index 42c798b337..2ab75235ff 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
@@ -5,7 +5,6 @@
   description: A bed that massively slows down the patient's metabolism and prevents bodily decay, allowing more time to administer a proper treatment for stabilization.
   components:
   - type: StasisBed
-    baseMultiplier: 10
   - type: AntiRotOnBuckle
   - type: HealOnBuckle
     damage:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
index e12826a8ce..6cc1fc7981 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
@@ -51,9 +51,6 @@
   - type: Machine
     board: TelecomServerCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-telecomserver
-    layoutId: TelecomServer
   - type: Transform
     anchored: true
   - type: Pullable
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 0685b9d7ab..6d5a49f4f2 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -93,7 +93,6 @@
   - type: LitOnPowered
   - type: ApcPowerReceiver
     powerLoad: 200
-    priority: Low
   - type: Actions
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-mechanical
@@ -1411,9 +1410,6 @@
     snap:
     - Wallmount
   components:
-  - type: Physics
-    canCollide: false
-  - type: Fixtures
   - type: Sprite
     drawdepth: WallMountedItems
     snapCardinals: false
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
index a9ce86ad22..960d081966 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: PortableScrubber
-  parent: [BaseMachinePowered, ConstructibleMachine]
+  parent: [BaseMachinePowered, ConstructibleMachine, StructureWheeled]
   name: portable scrubber
   description: It scrubs, portably!
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
index a6f831e1a5..d0f239b338 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
@@ -64,9 +64,6 @@
     - type: Construction
       graph: GasTrinary
       node: filter
-      conditions:
-        - !type:TileNotBlocked
-        - !type:NoUnstackableInTile
     - type: AmbientSound
       enabled: false
       volume: -9
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
index 6880860a6f..55ef9a6783 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -228,7 +228,7 @@
       visuals:
        # toggle color of the unshaded light:
        enum.OutletInjectorVisuals.Enabled:
-         unshaded:
+         enum.LightLayers.Unshaded:
            True: { color: "#5eff5e" }
            False: { color: "#990000" }
     - type: Appearance
@@ -267,9 +267,6 @@
       inHandsOnly: false
       key: enum.ThermomachineUiKey.Key
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-thermomachine
-      layoutId: Thermomachine
     - type: WiresVisuals
     - type: NodeContainer
       nodes:
@@ -329,7 +326,6 @@
   suffix: Enabled
   components:
   - type: GasThermoMachine
-    enabled: true
   - type: ApcPowerReceiver
     powerDisabled: false
 
@@ -374,7 +370,6 @@
   suffix: Enabled
   components:
   - type: GasThermoMachine
-    enabled: true
   - type: ApcPowerReceiver
     powerDisabled: false
 
@@ -452,9 +447,6 @@
   - type: Machine
     board: CondenserMachineCircuitBoard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-condenser
-    layoutId: Condenser
   - type: WiresVisuals
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
index 1193182d09..43dc63445c 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -10,7 +10,6 @@
   components:
   - type: Sprite
     sprite: Structures/Piping/disposal.rsi
-    snapCardinals: true
     layers:
     - state: condisposal
       map: [ "enum.DisposalUnitVisualLayers.Unanchored" ]
@@ -19,7 +18,7 @@
     - state: disposal-charging
       map: [ "enum.DisposalUnitVisualLayers.BaseCharging" ]
     - state: disposal-flush
-      map: [ "enum.DisposalUnitVisualLayers.BaseFlush" ]
+      map: [ "enum.DisposalUnitVisualLayers.OverlayFlush" ]
     - state: dispover-charge
       map: [ "enum.DisposalUnitVisualLayers.OverlayCharging" ]
     - state: dispover-ready
@@ -30,17 +29,6 @@
       map: [ "enum.DisposalUnitVisualLayers.OverlayEngaged" ]
   - type: Physics
     bodyType: Static
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.25,-0.4,0.25,0.4"
-        density: 75
-        mask:
-        - MachineMask
-        layer:
-        - MachineLayer
   - type: Destructible
     thresholds:
     - trigger:
@@ -82,6 +70,9 @@
   parent: DisposalUnitBase
   name: disposal unit
   components:
+  - type: Sprite
+    sprite: Structures/Piping/disposal.rsi
+    snapCardinals: true
   - type: Construction
     graph: DisposalMachine
     node: disposal_unit
@@ -100,6 +91,7 @@
   components:
   - type: Sprite
     sprite: Structures/Piping/disposal.rsi
+    snapCardinals: true
     layers:
       - state: conmailing
         map: [ "enum.DisposalUnitVisualLayers.Unanchored" ]
@@ -108,7 +100,7 @@
       - state: mailing-charging
         map: [ "enum.DisposalUnitVisualLayers.BaseCharging" ]
       - state: mailing-flush
-        map: [ "enum.DisposalUnitVisualLayers.BaseFlush" ]
+        map: [ "enum.DisposalUnitVisualLayers.OverlayFlush" ]
       - state: dispover-charge
         map: [ "enum.DisposalUnitVisualLayers.OverlayCharging" ]
       - state: dispover-ready
@@ -122,7 +114,9 @@
     node: mailing_unit
   - type: DisposalUnit
     autoEngageEnabled: false
-    mobsCanEnter: false
+    whitelist:
+      components:
+      - Item
   - type: MailingUnit
   - type: DeviceNetwork
     deviceNetId: Wired
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
index a48e2221c3..4b1e15bdb2 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -84,6 +84,8 @@
   - type: Lock
     locked: false
   - type: LockVisuals
+  - type: LockedAnchorable
+  - type: LockedWiresPanel
   - type: AccessReader
     access: [[ "Engineering" ]]
   - type: Machine
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
index f236bb8a41..48994ac7d8 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
@@ -59,7 +59,6 @@
     maxCharge: 1000000
     startingCharge: 0
   - type: BatteryDischarger
-    activeSupplyRate: 15000
   - type: TeslaCoil
     chargeFromLightning: 500000
   - type: LightningTarget
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
index 4567c6d044..ea41ba3a20 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
@@ -85,7 +85,6 @@
   - type: ChaoticJump
     jumpMinInterval: 8
     jumpMaxInterval: 15
-    offset: 1
   - type: WarpPoint
     follow: true
     location: tesla ball
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
index b606c01f1d..dbaacd6abc 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
@@ -6,7 +6,7 @@
 - type: entity
   abstract: true
   id: PortableGeneratorBase
-  parent: [ BaseMachine, ConstructibleMachine ]
+  parent: [ BaseMachine, ConstructibleMachine, StructureWheeled]
   components:
     # Basic properties
     - type: Transform
@@ -27,8 +27,8 @@
           shape:
             !type:PhysShapeAabb
             bounds: "-0.40,-0.40,0.40,0.40"
-          # It has wheels
-          density: 45
+          # Despite the heavy weight, it has wheels, so it's still fairly portable.
+          density: 155
           mask:
             - MachineMask
           layer:
@@ -42,9 +42,6 @@
 
     # Construction, interaction
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-generator
-      layoutId: Generator
     - type: UserInterface
       interfaces:
         - key: enum.GeneratorComponentUiKey.Key
@@ -259,8 +256,7 @@
           shape:
             !type:PhysShapeAabb
             bounds: "-0.30,-0.30,0.30,0.30"
-          # It has wheels
-          density: 30
+          density: 80
           mask:
             - MachineMask
           layer:
diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml
index 9ed61ea810..902fbde342 100644
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -97,9 +97,6 @@
     supplyRampRate: 500
   - type: WallMount
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-apc
-    layoutId: APC
   - type: WiresVisuals
   - type: Damageable
     damageContainer: StructuralInorganic
diff --git a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
index 600b97a976..abbe7f4e56 100644
--- a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
@@ -17,6 +17,10 @@
     - type: Damageable
       damageContainer: StructuralInorganic
       damageModifierSet: StructuralMetallic
+    - type: RCDDeconstructable
+      cost: 2
+      delay: 2
+      fx: EffectRCDDeconstruct2  
     - type: Destructible
       thresholds:
         - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml
index 536f857c19..54b992c970 100644
--- a/Resources/Prototypes/Entities/Structures/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -50,6 +50,10 @@
     lowVoltageNode: power
   - type: CableVis
     node: power
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2  
 
 - type: entity
   parent: CableBase
diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
index 7cde196832..786f099f25 100644
--- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
@@ -83,9 +83,6 @@
       visible: false
   - type: Machine
     board: CellRechargerCircuitboard
-  - type: Wires
-    boardName: wires-board-name-recharger
-    layoutId: Recharger
   - type: WiresPanel
   - type: GenericVisualizer
     visuals:
@@ -256,8 +253,6 @@
     - machine_parts
     - machine_board
     - entity_storage
-  - type: Wires
-    layoutId: borgcharger
   - type: WiresPanel
   - type: WiresVisuals
   - type: Machine
diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml
index 02c4a0899b..cb552c32a4 100644
--- a/Resources/Prototypes/Entities/Structures/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -67,9 +67,6 @@
       color: "#c9c042"
       castShadows: false
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-smes
-      layoutId: SMES
     - type: Machine
       board: SMESMachineCircuitboard
     - type: StationInfiniteBatteryTarget
diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml
index 0e642be6ea..73a242aaab 100644
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -92,9 +92,6 @@
     intensitySlope: 2
     totalIntensity: 200
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-substation
-    layoutId: Substation
   - type: Machine
     board: SubstationMachineCircuitboard
   - type: StationInfiniteBatteryTarget
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
index 14a9997b80..aedfd262d8 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -21,6 +21,7 @@
     anchored: false
   - type: Physics
     bodyType: Static
+    bodyStatus: InAir
   - type: Fixtures
     fixtures:
       fix1:
@@ -47,6 +48,9 @@
   - type: EmitSoundOnSpawn
     sound:
       path: /Audio/Effects/teleport_arrival.ogg
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 0
+    randomStartSecretMax: 2
 
 - type: entity
   id: AnomalyPyroclastic
@@ -86,7 +90,6 @@
     tempChange: 420
   - type: ProjectileAnomaly
     projectilePrototype: ProjectileAnomalyFireball
-    targetNonSentientChance: 0.6
     projectileSpeed: 0.5
     minProjectiles: 3
     maxProjectiles: 6
@@ -160,6 +163,8 @@
   - type: Anomaly
     corePrototype: AnomalyCoreFlesh
     coreInertPrototype: AnomalyCoreFleshInert
+    minPulseLength: 180
+    maxPulseLength: 300
   - type: Sprite
     layers:
     - state: anom5
@@ -324,7 +329,6 @@
     explosionMaxTileIntensity: 20
   - type: ProjectileAnomaly
     projectilePrototype: ProjectileIcicle
-    targetNonSentientChance: 0.1
   - type: EntitySpawnAnomaly
     entries:
     - settings:
@@ -351,6 +355,8 @@
   - type: Anomaly
     corePrototype: AnomalyCoreRock
     coreInertPrototype: AnomalyCoreRockInert
+    minPulseLength: 180
+    maxPulseLength: 300
   - type: Sprite
     layers:
     - state: anom6
@@ -598,9 +604,11 @@
     color: "#6270bb"
   - type: Anomaly
     animationTime: 6
-    offset: 0.05, 0
+    offset: 0, 0
     corePrototype: AnomalyCoreFlora
     coreInertPrototype: AnomalyCoreFloraInert
+    minPulseLength: 60
+    maxPulseLength: 120
     anomalyContactDamage:
       types:
         Slash: 0
@@ -705,6 +713,8 @@
   - type: Anomaly
     corePrototype: AnomalyCoreLiquid
     coreInertPrototype: AnomalyCoreLiquidInert
+    minPulseLength: 60
+    maxPulseLength: 120
     anomalyContactDamage:
       types:
         Slash: 1
@@ -818,6 +828,8 @@
   - type: Anomaly
     corePrototype: AnomalyCoreShadow
     coreInertPrototype: AnomalyCoreShadowInert
+    minPulseLength: 60
+    maxPulseLength: 120
     anomalyContactDamage:
       types:
         Cold: 10
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml
new file mode 100644
index 0000000000..e0247001f2
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml
@@ -0,0 +1,62 @@
+- type: entity
+  id: FloorDrain
+  name: drain
+  description: Drains puddles around it. Useful for dumping mop buckets or keeping certain rooms clean.
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: Sprite
+      drawdepth: FloorObjects
+      sprite: Objects/Specific/Janitorial/drain.rsi
+      layers:
+      - state: icon
+      - map: [ "enum.SolutionContainerLayers.Fill" ]
+        state: fill-1
+        visible: false
+    - type: InteractionOutline
+    - type: Clickable
+    - type: Transform
+      anchored: true
+    - type: Physics
+      bodyType: Static
+      canCollide: false
+    - type: AmbientSound
+      enabled: false
+      volume: -8
+      range: 8
+      sound:
+        path: /Audio/Ambience/Objects/drain.ogg
+    - type: Drain
+    - type: DumpableSolution
+      solution: drainBuffer
+    - type: Appearance
+    - type: SolutionContainerVisuals
+      maxFillLevels: 1
+      fillBaseName: fill-
+      solutionName: drainBuffer
+    - type: SolutionContainerManager
+      solutions:
+        drainBuffer:
+          maxVol: 1000
+    - type: DrainableSolution
+      solution: drainBuffer
+    - type: Damageable
+      damageContainer: Inorganic
+      damageModifierSet: Metallic
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 200
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+        - trigger:
+            !type:DamageTrigger
+            damage: 100
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+            - !type:PlaySoundBehavior
+              sound:
+                collection: MetalBreak
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
new file mode 100644
index 0000000000..2591b3f340
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
@@ -0,0 +1,336 @@
+# Mop Bucket
+- type: entity
+  name: mop bucket
+  id: MopBucket
+  parent: [BaseStructureDynamic, StructureWheeled]
+  description: Holds water and the tears of the janitor.
+  components:
+  - type: Clickable
+  - type: Sprite
+    sprite: Objects/Specific/Janitorial/janitorial.rsi
+    noRot: true
+    layers:
+    - state: mopbucket
+    - state: mopbucket_water-1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
+    drawdepth: Objects
+  - type: InteractionOutline
+  - type: SolutionContainerManager
+    solutions:
+      bucket:
+        maxVol: 600
+  - type: Spillable
+    solution: bucket
+    spillDelay: 3.0
+    spillWhenThrown: false
+  - type: DrainableSolution
+    solution: bucket
+  - type: RefillableSolution
+    solution: bucket
+  - type: ExaminableSolution
+    solution: bucket
+  - type: Tag
+    tags:
+      - Wringer
+  - type: ItemMapper
+    mapLayers:
+      mopbucket_shark_blue:
+        whitelist:
+          tags:
+            - PlushieSharkBlue
+      mopbucket_shark_pink:
+        whitelist:
+          tags:
+            - PlushieSharkPink
+      mopbucket_shark_grey:
+        whitelist:
+          tags:
+            - PlushieSharkGrey
+    sprite: Objects/Fun/sharkplush.rsi
+  - type: Transform
+    noRot: true
+  - type: ItemSlots
+    slots:
+      shark_slot:
+        name: mop-bucket-slot-component-slot-name-shark
+        whitelist:
+          tags:
+            - PlushieSharkBlue
+            - PlushieSharkPink
+            - PlushieSharkGrey
+        priority: 3 # Higher than drinking priority
+  - type: Drink
+    solution: bucket
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: mopbucket_water-
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+      shark_slot: !type:ContainerSlot {}
+  - type: GuideHelp
+    guides:
+    - Janitorial
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 70
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.45"
+        density: 60
+        mask:
+        - MachineMask
+
+- type: entity
+  name: mop bucket
+  id: MopBucketFull
+  parent: MopBucket
+  suffix: full
+  components:
+    - type: Sprite
+      layers:
+        - state: mopbucket
+        - state: mopbucket_water-3
+          map: [ "enum.SolutionContainerLayers.Fill" ]
+    - type: SolutionContainerManager
+      solutions:
+        bucket:
+          maxVol: 600
+          reagents:
+            - ReagentId: Water
+              Quantity: 600
+
+# Janicart
+- type: entity
+  name: janitorial trolley
+  id: JanitorialTrolley
+  parent: [BaseStructureDynamic, StructureWheeled]
+  description: This is the alpha and omega of sanitation.
+  components:
+    - type: Sprite
+      noRot: true
+      sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
+      layers:
+        - state: cart
+        - state: cart_water-1
+          map: ["enum.SolutionContainerLayers.Fill"]
+          visible: false
+    - type: Rotatable
+    - type: InteractionOutline
+    # Removing storage until OnInteractUsing logic resolved
+    #- type: Storage
+    #  popup: false
+    #  capacity: 80
+    #  blacklist: # there is exclusive item slots for that
+    #    tags:
+    #      - Mop
+    #      - TrashBag
+    #      - Bucket
+    - type: ItemSlots
+      slots:
+        mop_slot:
+          name: janitorial-trolley-slot-component-slot-name-mop
+          whitelist:
+            tags:
+              - Mop
+          insertOnInteract: false # or it conflicts with bucket logic
+          priority: 9 # Higher than bucket slot
+        plunger_slot:
+          name: janitorial-trolley-slot-component-slot-name-plunger
+          whitelist:
+            tags:
+              - Plunger
+          priority: 8
+        wetfloorsign_slot4:
+          name: janitorial-trolley-slot-component-slot-name-sign
+          whitelist:
+            tags:
+              - WetFloorSign
+          priority: 7
+        wetfloorsign_slot3:
+          name: janitorial-trolley-slot-component-slot-name-sign
+          whitelist:
+            tags:
+              - WetFloorSign
+          priority: 7
+        wetfloorsign_slot2:
+          name: janitorial-trolley-slot-component-slot-name-sign
+          whitelist:
+            tags:
+              - WetFloorSign
+          priority: 7
+        wetfloorsign_slot1:
+          name: janitorial-trolley-slot-component-slot-name-sign
+          whitelist:
+            tags:
+              - WetFloorSign
+          priority: 7
+        lightreplacer_slot:
+          name: janitorial-trolley-slot-component-slot-name-lightreplacer
+          whitelist:
+            components:
+              - LightReplacer
+          priority: 6
+        spraybottle_slot:
+          name: janitorial-trolley-slot-component-slot-name-spray
+          whitelist:
+            tags:
+              - Spray
+          insertOnInteract: false # or it conflicts with bucket logic
+          priority: 5 # Higher than bucket slot
+        bucket_slot:
+          name: janitorial-trolley-slot-component-slot-name-bucket
+          whitelist:
+            tags:
+              - Bucket
+          insertOnInteract: false # or it also conflicts with bucket logic
+          priority: 4 # Higher than trash bag slot
+        trashbag_slot:
+          name: janitorial-trolley-slot-component-slot-name-trashbag
+          whitelist:
+            tags:
+              - TrashBag
+          priority: 3 # Higher than drinking priority
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape:
+            !type:PhysShapeCircle
+            radius: 0.3
+          density: 250
+          layer:
+          - MobLayer
+          mask:
+          - MobMask
+    - type: Spillable
+      solution: bucket
+      spillDelay: 3.0
+      spillWhenThrown: false
+    - type: SolutionContainerManager
+      solutions:
+        bucket:
+          maxVol: 800
+          reagents:
+            - ReagentId: Water
+              Quantity: 600 # 3 quarters full at roundstart to make it more appealing
+    - type: DrainableSolution
+      solution: bucket
+    - type: RefillableSolution
+      solution: bucket
+    - type: ExaminableSolution
+      solution: bucket
+    - type: Tag
+      tags:
+        - Wringer
+    - type: Damageable
+      damageContainer: Inorganic
+      damageModifierSet: Metallic
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 400
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+        - trigger:
+            !type:DamageTrigger
+            damage: 200
+          behaviors:
+            - !type:EmptyAllContainersBehaviour
+            - !type:DoActsBehavior
+              acts: ["Destruction"]
+            - !type:PlaySoundBehavior
+              sound:
+                collection: MetalBreak
+    - type: ItemMapper
+      mapLayers:
+        cart_plunger:
+          whitelist:
+            tags:
+              - Plunger
+        cart_mop:
+          whitelist:
+            tags:
+              - MopBasic
+        cart_advmop:
+          whitelist:
+            tags:
+              - MopAdv
+        cart_garbage:
+          whitelist:
+            tags:
+              - TrashBag
+        cart_replacer:
+          whitelist:
+            components:
+              - LightReplacer
+        cart_spray:
+          whitelist:
+            tags:
+              - Spray
+        cart_sign1: # this is like stack of floor signs
+          minCount: 1
+          whitelist:
+            tags:
+              - WetFloorSign
+        cart_sign2:
+          minCount: 2
+          whitelist:
+            tags:
+              - WetFloorSign
+        cart_sign3:
+          minCount: 3
+          whitelist:
+            tags:
+              - WetFloorSign
+        cart_sign4:
+          minCount: 4
+          whitelist:
+            tags:
+              - WetFloorSign
+        cart_bucket:
+          whitelist:
+            tags:
+              - Bucket
+      sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
+    - type: Appearance
+    - type: SolutionContainerVisuals
+      maxFillLevels: 3
+      fillBaseName: cart_water-
+    - type: UserInterface
+      interfaces:
+      - key: enum.StorageUiKey.Key
+        type: StorageBoundUserInterface
+    - type: Drink
+      solution: bucket
+    - type: ContainerContainer
+      containers:
+        storagebase: !type:Container
+          ents: []
+        mop_slot: !type:ContainerSlot {}
+        trashbag_slot: !type:ContainerSlot {}
+        bucket_slot: !type:ContainerSlot {}
+        plunger_slot: !type:ContainerSlot {}
+        wetfloorsign_slot4: !type:ContainerSlot {}
+        wetfloorsign_slot3: !type:ContainerSlot {}
+        wetfloorsign_slot2: !type:ContainerSlot {}
+        wetfloorsign_slot1: !type:ContainerSlot {}
+        lightreplacer_slot: !type:ContainerSlot {}
+        spraybottle_slot:  !type:ContainerSlot {}
+    - type: GuideHelp
+      guides:
+      - Janitorial
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index 810a611af8..4778cd472b 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -574,7 +574,7 @@
     sprite: Structures/Storage/Crates/syndicate.rsi
 
 - type: entity
-  parent: CrateBaseWeldable
+  parent: [StructureWheeled, CrateBaseWeldable]
   id: CrateTrashCart
   name: trash cart
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
index b77eeb3355..5b55eb4878 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
@@ -66,3 +66,21 @@
   - type: Transform
     noRot: true
   - type: Mixable
+
+# For highcap tanks
+- type: entity
+  id: StorageTankBig
+  parent: StorageTank
+  abstract: true
+  components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        density: 455 #very heavy, they store 10k units of reagents after all.
+        mask:
+        - MachineMask
+        layer:
+        - WallLayer
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
index 80fac33636..2b5e31c9a2 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
@@ -2,7 +2,7 @@
 
 - type: entity
   id: WeldingFuelTank
-  parent: StorageTank
+  parent: [StorageTank, StructureWheeled]
   name: fuel tank
   description: A fuel tank. It's used to store high amounts of fuel.
   suffix: Empty
@@ -49,7 +49,7 @@
           Quantity: 1500
 
 - type: entity
-  parent: WeldingFuelTank
+  parent: [StorageTankBig, WeldingFuelTank] # StorageTankBig must come first, or else the desnity won't get inherited.
   id: WeldingFuelTankHighCapacity
   name: high-capacity fuel tank
   description: A highly pressurized fuel tank made to hold gargantuan amounts of welding fuel.
@@ -83,7 +83,7 @@
 
 - type: entity
   id: WaterTank
-  parent: StorageTank
+  parent: [StorageTank, StructureWheeled]
   name: water tank
   description: A water tank. It's used to store high amounts of water.
   suffix: Empty
@@ -117,7 +117,7 @@
           Quantity: 1500
 
 - type: entity
-  parent: WaterTankFull
+  parent: StorageTank
   id: WaterCooler
   name: water cooler
   description: Seems like a good place to stand and waste time. It has a stock of paper cups on the side.
@@ -129,6 +129,7 @@
       - state: watercooler-2-1
         map: ["enum.SolutionContainerLayers.Fill"]
         visible: false
+  - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 4
     fillBaseName: watercooler-2-
@@ -159,14 +160,20 @@
       - FitsInDispenser
       tags:
       - Trash
+  - type: ExaminableSolution
+    solution: tank
+  - type: StaticPrice
+    price: 500
 
 - type: entity
-  parent: StorageTank
+  parent: [StorageTankBig, WaterTank]
   id: WaterTankHighCapacity
   name: high-capacity water tank
   description: A highly pressurized water tank made to hold gargantuan amounts of water.
   suffix: Full
   components:
+  - type: StaticPrice
+    price: 2500
   - type: Sprite
     sprite: Structures/Storage/tanks.rsi
     layers:
@@ -194,7 +201,7 @@
 
 - type: entity
   id: GenericTank
-  parent: StorageTank
+  parent: [StorageTank, StructureWheeled]
   suffix: Empty
   components:
     - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
index 1a0750c531..bef57a40af 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
@@ -59,7 +59,6 @@
         board: !type:Container
     - type: ApcPowerReceiver
       powerLoad: 200
-      priority: Low
     - type: WallMount
       arc: 360
     - type: ExtensionCableReceiver
diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
index 984ec626ab..2d0c55af5a 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
@@ -10,9 +10,6 @@
       Brute:
         path:
           "/Audio/Weapons/grille_hit.ogg"
-  - type: Tag
-    tags:
-    - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/fence.rsi
     drawdepth: WallTops
@@ -78,6 +75,10 @@
           True: { visible: True }
           False: { visible: False }
   - type: AnimationPlayer
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2
 
 - type: entity
   parent: BaseFenceMetal
diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
index f2b03aaeb8..55b7e40803 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
@@ -12,7 +12,6 @@
           "/Audio/Weapons/boxingpunch1.ogg"
   - type: Tag
     tags:
-    - RCDDeconstructWhitelist
     - Wooden
   - type: Sprite
     sprite: Structures/Walls/wooden_fence.rsi
@@ -24,6 +23,10 @@
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Wood
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
index 813ccebfbb..c8092cff2f 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
@@ -9,9 +9,12 @@
         Brute:
           path:
             "/Audio/Weapons/grille_hit.ogg"
+    - type: RCDDeconstructable
+      cost: 6
+      delay: 4
+      fx: EffectRCDDeconstruct4  
     - type: Tag
       tags:
-        - RCDDeconstructWhitelist
         - DeleteWithWindows
     - type: CanBuildWindowOnTop
     - type: Sprite
@@ -123,8 +126,11 @@
       state: grille_broken
     - type: Tag
       tags:
-        - RCDDeconstructWhitelist
         - DeleteWithWindows
+    - type: RCDDeconstructable
+      cost: 6
+      delay: 4
+      fx: EffectRCDDeconstruct4
     - type: Construction
       graph: Grille
       node: grilleBroken
diff --git a/Resources/Prototypes/Entities/Structures/Walls/railing.yml b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
index 3152374e46..a35ced82c2 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/railing.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
@@ -57,6 +57,10 @@
   - type: Construction
     graph: Railing
     node: railing
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2  
 
 - type: entity
   parent: BaseStructure
@@ -126,6 +130,10 @@
   - type: Construction
     graph: Railing
     node: railingCorner
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2  
 
 - type: entity
   parent: BaseStructure
@@ -186,7 +194,11 @@
   - type: Construction
     graph: Railing
     node: railingCornerSmall
-
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2  
+    
 - type: entity
   parent: BaseStructure
   id: RailingRound
@@ -261,3 +273,7 @@
   - type: Construction
     graph: Railing
     node: railingRound
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2  
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 553e7560df..5832afacfc 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -61,11 +61,14 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/brick.rsi
   - type: Icon
     sprite: Structures/Walls/brick.rsi
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -91,7 +94,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/clock.rsi
   - type: Icon
@@ -124,7 +126,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/clown.rsi
   - type: Icon
@@ -132,6 +133,10 @@
   - type: Construction
     graph: Girder
     node: bananiumWall
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8    
   - type: Destructible
     thresholds:
     - trigger:
@@ -157,7 +162,6 @@
   components:
   - type: Tag
     tags:
-      - RCDDeconstructWhitelist
       - Wall
       - Structure
   - type: Sprite
@@ -191,7 +195,6 @@
   components:
   - type: Tag
     tags:
-      - RCDDeconstructWhitelist
       - Wall
   - type: Sprite
     sprite: Structures/Walls/cult.rsi
@@ -235,7 +238,6 @@
     tags:
       - Wall
       - Debug
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/debug.rsi
   - type: Icon
@@ -265,11 +267,14 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/diamond.rsi
   - type: Icon
     sprite: Structures/Walls/diamond.rsi
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8   
   - type: Destructible
     thresholds:
     - trigger:
@@ -295,7 +300,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/gold.rsi
   - type: Icon
@@ -303,6 +307,10 @@
   - type: Construction
     graph: Girder
     node: goldWall
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8  
   - type: Destructible
     thresholds:
     - trigger:
@@ -337,7 +345,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/ice.rsi
   - type: Icon
@@ -367,7 +374,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/plasma.rsi
   - type: Icon
@@ -375,6 +381,10 @@
   - type: Construction
     graph: Girder
     node: plasmaWall
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -411,7 +421,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/plastic.rsi
   - type: Icon
@@ -419,6 +428,10 @@
   - type: Construction
     graph: Girder
     node: plasticWall
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8    
   - type: Destructible
     thresholds:
     - trigger:
@@ -471,7 +484,6 @@
     - type: Tag
       tags:
         - Wall
-        - RCDDeconstructWhitelist
     - type: Destructible
       thresholds:
         - trigger:
@@ -623,7 +635,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/riveted.rsi
   - type: Icon
@@ -658,11 +669,14 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/sandstone.rsi
   - type: Icon
     sprite: Structures/Walls/sandstone.rsi
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8    
   - type: Destructible
     thresholds:
     - trigger:
@@ -688,7 +702,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/silver.rsi
   - type: Icon
@@ -696,6 +709,10 @@
   - type: Construction
     graph: Girder
     node: silverWall
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8    
   - type: Destructible
     thresholds:
     - trigger:
@@ -861,7 +878,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/solid.rsi
   - type: WallReplacementMarker
@@ -870,6 +886,10 @@
     node: wall
   - type: Icon
     sprite: Structures/Walls/solid.rsi
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8    
   - type: Destructible
     thresholds:
     - trigger:
@@ -1036,7 +1056,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/web.rsi
   - type: Icon
@@ -1254,11 +1273,14 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/cobblebrick.rsi
   - type: Icon
     sprite: Structures/Walls/cobblebrick.rsi
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8    
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Windows/mining.yml b/Resources/Prototypes/Entities/Structures/Windows/mining.yml
index 910c3daae2..82d11b732b 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/mining.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/mining.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: MiningWindow
   name: mining window
-  parent: Window
+  parent: WindowRCDResistant
   components:
   - type: Sprite
     drawdepth: WallTops
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
index e841434bac..1a2ad95363 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: PlasmaWindow
   name: plasma window
-  parent: Window
+  parent: WindowRCDResistant
   components:
   - type: Sprite
     drawdepth: WallTops
@@ -57,7 +57,7 @@
 
 - type: entity
   id: PlasmaWindowDirectional
-  parent: WindowDirectional
+  parent: WindowDirectionalRCDResistant
   name: directional plasma window
   description: Don't smudge up the glass down there.
   placement:
diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
index abd29e3585..65d9bf966b 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -14,6 +14,10 @@
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: RGlass
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 6
+    fx: EffectRCDDeconstruct6
   - type: Destructible
     thresholds:
     - trigger:
@@ -101,6 +105,10 @@
       sprite: Structures/Windows/cracks_directional.rsi
   - type: Damageable
     damageModifierSet: RGlass
+  - type: RCDDeconstructable
+    cost: 4
+    delay: 4
+    fx: EffectRCDDeconstruct4  
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
index a5bbd1214f..39be308392 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: ReinforcedPlasmaWindow
   name: reinforced plasma window
-  parent: Window
+  parent: WindowRCDResistant
   components:
   - type: Sprite
     drawdepth: WallTops
@@ -60,7 +60,7 @@
 
 - type: entity
   id: PlasmaReinforcedWindowDirectional
-  parent: WindowDirectional
+  parent: WindowDirectionalRCDResistant
   name: directional reinforced plasma window
   description: Don't smudge up the glass down there.
   placement:
diff --git a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
index 4e1cb9d160..7ac8306c30 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: ReinforcedUraniumWindow
   name: reinforced uranium window
-  parent: Window
+  parent: WindowRCDResistant
   components:
   - type: Sprite
     drawdepth: WallTops
diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
index 9c16eee1ae..8299dabe6b 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: ShuttleWindow
   name: shuttle window
-  parent: Window
+  parent: WindowRCDResistant
   components:
   - type: Sprite
     drawdepth: WallTops
diff --git a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
index 77ca26bee1..0351a63609 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: UraniumWindow
   name: uranium window
-  parent: Window
+  parent: WindowRCDResistant
   components:
   - type: Sprite
     drawdepth: WallTops
diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index c4cdec96ae..78eb399b33 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -16,7 +16,6 @@
     arc: 360 # interact despite grilles
   - type: Tag
     tags:
-      - RCDDeconstructWhitelist
       - ForceFixRotations
       - Window
   - type: Sprite
@@ -42,6 +41,10 @@
   - type: ExaminableDamage
     messages: WindowMessages
   - type: Repairable
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 4
+    fx: EffectRCDDeconstruct4
   - type: Destructible
     thresholds:
     - trigger:
@@ -90,6 +93,14 @@
   - type: WindowMark
     replacementProto: WallSolid
   - type: BlockWeather
+  
+- type: entity
+  id: WindowRCDResistant
+  parent: Window
+  abstract: true
+  components:
+  - type: RCDDeconstructable
+    deconstructable: false
 
 - type: entity
   id: WindowDirectional
@@ -138,6 +149,10 @@
     damageModifierSet: Glass
   - type: ExaminableDamage
     messages: WindowMessages
+  - type: RCDDeconstructable
+    cost: 4
+    delay: 2
+    fx: EffectRCDDeconstruct2
   - type: Destructible
     thresholds:
     - trigger:
@@ -181,6 +196,14 @@
     price: 10
   - type: ReflectAspectMark
 
+- type: entity
+  id: WindowDirectionalRCDResistant  
+  parent: WindowDirectional
+  abstract: true
+  components:
+  - type: RCDDeconstructable
+    deconstructable: false
+
 - type: entity
   id: WindowFrostedDirectional
   parent: WindowDirectional
diff --git a/Resources/Prototypes/Entities/Structures/base_structure.yml b/Resources/Prototypes/Entities/Structures/base_structure.yml
index 5068de6596..c77ec6443b 100644
--- a/Resources/Prototypes/Entities/Structures/base_structure.yml
+++ b/Resources/Prototypes/Entities/Structures/base_structure.yml
@@ -63,5 +63,13 @@
         - LowImpassable
   - type: Anchorable
 
+# For use with yaml composition, so that all wheeled structures can easily be changed.
+- type: entity
+  id: StructureWheeled
+  abstract: true
+  components:
+    - type: TileFrictionModifier
+      modifier: 0.4
+
 - type: Tag
   id: Structure
diff --git a/Resources/Prototypes/Entities/Structures/catwalk.yml b/Resources/Prototypes/Entities/Structures/catwalk.yml
index 14ced18771..c23a3cc175 100644
--- a/Resources/Prototypes/Entities/Structures/catwalk.yml
+++ b/Resources/Prototypes/Entities/Structures/catwalk.yml
@@ -51,3 +51,7 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2  
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
index 43b8bd197a..8ea7172d8b 100644
--- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -81,9 +81,6 @@
   - type: Machine
     board: HydroponicsTrayMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-hydroponicstray
-    layoutId: HydroponicsTray
   - type: AmbientSound
     volume: -9
     range: 5
@@ -92,9 +89,6 @@
   - type: GuideHelp
     guides:
     - Botany
-  - type: Tag
-    tags:
-      - NoPaint
 
 - type: entity
   parent: hydroponicsTray
diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
index beba4b3168..871befe403 100644
--- a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
+++ b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
@@ -63,12 +63,15 @@
         - Opaque
         - MidImpassable
   - type: Occluder
+  - type: Construction
+    graph: PlasticFlapsGraph
+    node: opaqueFlaps
 
 - type: entity
   id: PlasticFlapsAirtightClear
   parent: PlasticFlapsClear
   name: airtight plastic flaps
-  suffix: Airtight Clear
+  suffix: Airtight, Clear
   description: Heavy duty, slightly stronger, airtight plastic flaps. Definitely can't get past those. No way.
   components:
   - type: Destructible
@@ -80,12 +83,17 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Airtight
+  - type: Construction
+    graph: PlasticFlapsGraph
+    node: airtightFlaps
+  - type: StaticPrice
+    price: 100
 
 - type: entity
   id: PlasticFlapsAirtightOpaque
   parent: PlasticFlapsOpaque
   name: airtight plastic flaps
-  suffix: Airtight Opaque
+  suffix: Airtight, Opaque
   description: Heavy duty, slightly stronger, airtight plastic flaps. Definitely can't get past those. No way.
   components:
   - type: Destructible
@@ -97,3 +105,8 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Airtight
+  - type: Construction
+    graph: PlasticFlapsGraph
+    node: airtightopaqueFlaps
+  - type: StaticPrice
+    price: 100
diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index 446abf99ed..2b55efc21b 100644
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -624,6 +624,11 @@
   flavorType: Complex
   description: flavor-complex-dr-gibb
 
+- type: flavor
+  id: gingersoda
+  flavorType: Complex
+  description: flavor-complex-ginger-soda
+
 - type: flavor
   id: lemonlimesoda
   flavorType: Complex
@@ -694,6 +699,11 @@
   flavorType: Complex
   description: flavor-complex-rum
 
+- type: flavor
+  id: coconutrum
+  flavorType: Complex
+  description: flavor-complex-coconut-rum
+
 - type: flavor
   id: coffeeliquor
   flavorType: Complex
@@ -739,6 +749,31 @@
   flavorType: Complex
   description: flavor-complex-ice
 
+- type: flavor
+  id: arnoldpalmer
+  flavorType: Complex
+  description: flavor-complex-arnold-palmer
+
+- type: flavor
+  id: bluehawaiian
+  flavorType: Complex
+  description: flavor-complex-blue-hawaiian
+
+- type: flavor
+  id: cosmopolitan
+  flavorType: Complex
+  description: flavor-complex-cosmopolitan
+
+- type: flavor
+  id: painkiller
+  flavorType: Complex
+  description: flavor-complex-painkiller
+
+- type: flavor
+  id: pinacolada
+  flavorType: Complex
+  description: flavor-complex-pina-colada
+
 - type: flavor
   id: longisland
   flavorType: Complex
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index cf6e480d69..2737e65db6 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -162,6 +162,7 @@
     - id: BasicTrashVariationPass
     - id: SolidWallRustingVariationPass
     - id: ReinforcedWallRustingVariationPass
+    - id: CutWireVariationPass
     - id: BasicPuddleMessVariationPass
       prob: 0.99
       orGroup: puddleMess
diff --git a/Resources/Prototypes/GameRules/variation.yml b/Resources/Prototypes/GameRules/variation.yml
index 8721003c83..7424fc2854 100644
--- a/Resources/Prototypes/GameRules/variation.yml
+++ b/Resources/Prototypes/GameRules/variation.yml
@@ -119,3 +119,15 @@
     tilesPerSpillAverage: 150
     tilesPerSpillStdDev: 10
     randomPuddleSolutionFill: RandomFillTrashPuddleBloodbath
+
+- type: entity
+  id: CutWireVariationPass
+  parent: BaseVariationPass
+  noSpawn: true
+  components:
+  - type: CutWireVariationPass
+    wireCutChance: 0.01
+    maxWiresCut: 20
+    blacklist:
+      components:
+      - ParticleAcceleratorControlBox
diff --git a/Resources/Prototypes/Guidebook/chemicals.yml b/Resources/Prototypes/Guidebook/chemicals.yml
new file mode 100644
index 0000000000..508b61b4ac
--- /dev/null
+++ b/Resources/Prototypes/Guidebook/chemicals.yml
@@ -0,0 +1,63 @@
+- type: guideEntry
+  id: Chemicals
+  name: guide-entry-chemicals
+  text: "/ServerInfo/Guidebook/Chemicals.xml"
+  children:
+  - Elements
+  - Medicine
+  - Narcotics
+  - Pyrotechnic
+  - Toxins
+  - Foods
+  - Botanical
+  - Biological
+  - Others
+  filterEnabled: True
+
+- type: guideEntry
+  id: Elements
+  name: guide-entry-elements
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Elements.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Narcotics
+  name: guide-entry-narcotics
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Narcotics.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Pyrotechnic
+  name: guide-entry-pyrotechnics
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Pyrotechnic.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Toxins
+  name: guide-entry-toxins
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Toxins.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Foods
+  name: guide-entry-foods
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Foods.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Botanical
+  name: guide-entry-botanical
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Botany.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Biological
+  name: guide-entry-biological
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Biological.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Others
+  name: guide-entry-others
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Other.xml"
+  filterEnabled: True
diff --git a/Resources/Prototypes/Guidebook/medical.yml b/Resources/Prototypes/Guidebook/medical.yml
index 9ea2398a7c..95a4f1ca75 100644
--- a/Resources/Prototypes/Guidebook/medical.yml
+++ b/Resources/Prototypes/Guidebook/medical.yml
@@ -47,4 +47,4 @@
 - type: guideEntry
   id: AdvancedBrute
   name: guide-entry-brute
-  text: "/ServerInfo/Guidebook/Medical/AdvancedBrute.xml"
\ No newline at end of file
+  text: "/ServerInfo/Guidebook/Medical/AdvancedBrute.xml"
diff --git a/Resources/Prototypes/Guidebook/shiftandcrew.yml b/Resources/Prototypes/Guidebook/shiftandcrew.yml
index 9df1b26008..3c4618902e 100644
--- a/Resources/Prototypes/Guidebook/shiftandcrew.yml
+++ b/Resources/Prototypes/Guidebook/shiftandcrew.yml
@@ -19,12 +19,6 @@
   name: guide-entry-survival
   text: "/ServerInfo/Guidebook/Survival.xml"
 
-- type: guideEntry
-  id: Chemicals
-  name: guide-entry-chemicals
-  text: "/ServerInfo/Guidebook/Chemicals.xml"
-  filterEnabled: True
-
 - type: guideEntry
   id: Janitorial
   name: guide-entry-janitorial
@@ -47,4 +41,3 @@
   id: Food Recipes
   name: guide-entry-foodrecipes
   text: "/ServerInfo/Guidebook/Service/FoodRecipes.xml"
-
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 9436588f61..eae58ce94a 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -421,7 +421,6 @@
   nutrientConsumption: 0.40
   idealLight: 8
   idealHeat: 298
-  juicy: true
   splatPrototype: PuddleSplatter
   chemicals:
     Nutriment:
@@ -456,7 +455,6 @@
   nutrientConsumption: 0.70
   idealLight: 8
   idealHeat: 298
-  juicy: true
   splatPrototype: PuddleSplatter
   chemicals:
     Nutriment:
@@ -491,7 +489,6 @@
   nutrientConsumption: 0.70
   idealLight: 8
   idealHeat: 298
-  juicy: true
   splatPrototype: PuddleSplatter
   chemicals:
     Blood:
diff --git a/Resources/Prototypes/NPCs/Combat/melee.yml b/Resources/Prototypes/NPCs/Combat/melee.yml
index 2facfaa542..122875ed97 100644
--- a/Resources/Prototypes/NPCs/Combat/melee.yml
+++ b/Resources/Prototypes/NPCs/Combat/melee.yml
@@ -70,12 +70,11 @@
 # Tries to melee attack our target.
 - type: htnCompound
   id: MeleeAttackTargetCompound
-  preconditions:
-    - !type:KeyExistsPrecondition
-      key: Target
   branches:
-    # Move to melee range and hit them
-    - tasks:
+    - preconditions:
+      - !type:KeyExistsPrecondition
+        key: Target
+      tasks:
         - !type:HTNPrimitiveTask
           operator: !type:MoveToOperator
             shutdownState: PlanFinished
@@ -104,11 +103,11 @@
 
 - type: htnCompound
   id: MeleeAttackOrderedTargetCompound
-  preconditions:
-    - !type:KeyExistsPrecondition
-      key: Target
   branches:
-    - tasks:
+    - preconditions:
+      - !type:KeyExistsPrecondition
+        key: Target
+      tasks:
         - !type:HTNPrimitiveTask
           operator: !type:MoveToOperator
             shutdownState: PlanFinished
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index 63c567aa1a..71f0ed04e8 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -72,7 +72,6 @@
     TechnologyDiskStealCollectionObjective: 1        #rnd
     FigurineStealCollectionObjective: 0.3          #service
     IDCardsStealCollectionObjective: 1
-    CannabisStealCollectionObjective: 1
     LAMPStealCollectionObjective: 2 #only for moth
 
 - type: weightedRandom
diff --git a/Resources/Prototypes/RCD/rcd.yml b/Resources/Prototypes/RCD/rcd.yml
new file mode 100644
index 0000000000..bc1aa91d28
--- /dev/null
+++ b/Resources/Prototypes/RCD/rcd.yml
@@ -0,0 +1,280 @@
+# Operations
+- type: rcd
+  id: Invalid   # Hidden prototype - do not add to RCDs
+  mode: Invalid
+  
+- type: rcd
+  id: Deconstruct
+  name: rcd-component-deconstruct
+  category: Main
+  sprite: /Textures/Interface/Radial/RCD/deconstruct.png
+  mode: Deconstruct
+  prototype: EffectRCDDeconstructPreview
+  rotation: Camera
+
+- type: rcd
+  id: DeconstructLattice   # Hidden prototype - do not add to RCDs  
+  name: rcd-component-deconstruct
+  mode: Deconstruct
+  cost: 2
+  delay: 1
+  rotation: Camera
+  fx: EffectRCDDeconstruct2
+    
+- type: rcd
+  id: DeconstructTile      # Hidden prototype - do not add to RCDs
+  name: rcd-component-deconstruct
+  mode: Deconstruct
+  cost: 4
+  delay: 4
+  rotation: Camera
+  fx: EffectRCDDeconstruct4
+
+# Flooring 
+- type: rcd
+  id: Plating
+  name: rcd-component-plating
+  category: WallsAndFlooring
+  sprite: /Textures/Interface/Radial/RCD/plating.png
+  mode: ConstructTile
+  prototype: Plating
+  cost: 1
+  delay: 1
+  collisionMask: InteractImpassable
+  rules:
+    - CanBuildOnEmptyTile
+  fx: EffectRCDConstruct1
+  
+- type: rcd
+  id: FloorSteel
+  name: rcd-component-floor-steel
+  category: WallsAndFlooring
+  sprite: /Textures/Interface/Radial/RCD/metal_tile.png
+  mode: ConstructTile
+  prototype: FloorSteel
+  cost: 1
+  delay: 1
+  collisionMask: InteractImpassable
+  rules:
+    - CanBuildOnEmptyTile
+  fx: EffectRCDConstruct1
+
+- type: rcd
+  id: Catwalk
+  category: WallsAndFlooring
+  sprite: /Textures/Interface/Radial/RCD/catwalk.png
+  mode: ConstructObject
+  prototype: Catwalk
+  cost: 1
+  delay: 1
+  collisionMask: InteractImpassable
+  rules:
+    - MustBuildOnSubfloor
+    - IsCatwalk
+  rotation: Fixed
+  fx: EffectRCDConstruct1
+
+# Walls
+- type: rcd
+  id: WallSolid
+  category: WallsAndFlooring
+  sprite: /Textures/Interface/Radial/RCD/solid_wall.png
+  mode: ConstructObject
+  prototype: WallSolid 
+  cost: 4
+  delay: 2
+  collisionMask: FullTileMask
+  rotation: Fixed
+  fx: EffectRCDConstruct2
+
+- type: rcd
+  id: Grille
+  category: WindowsAndGrilles
+  sprite: /Textures/Interface/Radial/RCD/grille.png
+  mode: ConstructObject
+  prototype: Grille
+  cost: 4
+  delay: 2
+  collisionMask: FullTileMask
+  rotation: Fixed
+  fx: EffectRCDConstruct2
+
+# Windows
+- type: rcd
+  id: Window
+  category: WindowsAndGrilles
+  sprite: /Textures/Interface/Radial/RCD/window.png
+  mode: ConstructObject
+  prototype: Window
+  cost: 3
+  delay: 2
+  collisionMask: FullTileMask
+  rules:
+    - IsWindow
+  rotation: Fixed
+  fx: EffectRCDConstruct2
+  
+- type: rcd
+  id: WindowDirectional
+  category: WindowsAndGrilles
+  sprite: /Textures/Interface/Radial/RCD/directional.png
+  mode: ConstructObject
+  prototype: WindowDirectional
+  cost: 2
+  delay: 1
+  collisionMask: FullTileMask
+  collisionBounds: "-0.23,-0.49,0.23,-0.36"
+  rules:
+    - IsWindow
+  rotation: User
+  fx: EffectRCDConstruct1
+  
+- type: rcd
+  id: ReinforcedWindow
+  category: WindowsAndGrilles
+  sprite: /Textures/Interface/Radial/RCD/window_reinforced.png
+  mode: ConstructObject
+  prototype: ReinforcedWindow
+  cost: 4
+  delay: 3
+  collisionMask: FullTileMask
+  rules:
+    - IsWindow
+  rotation: User
+  fx: EffectRCDConstruct3
+    
+- type: rcd
+  id: WindowReinforcedDirectional
+  category: WindowsAndGrilles
+  sprite: /Textures/Interface/Radial/RCD/directional_reinforced.png
+  mode: ConstructObject
+  prototype: WindowReinforcedDirectional
+  cost: 3
+  delay: 2
+  collisionMask: FullTileMask
+  collisionBounds: "-0.23,-0.49,0.23,-0.36"
+  rules:
+    - IsWindow
+  rotation: User
+  fx: EffectRCDConstruct2
+
+# Airlocks
+- type: rcd
+  id: Airlock
+  category: Airlocks
+  sprite: /Textures/Interface/Radial/RCD/airlock.png
+  mode: ConstructObject
+  prototype: Airlock
+  cost: 4
+  delay: 4
+  collisionMask: FullTileMask
+  rotation: Camera
+  fx: EffectRCDConstruct4
+  
+- type: rcd
+  id: AirlockGlass
+  category: Airlocks
+  sprite: /Textures/Interface/Radial/RCD/glass_airlock.png
+  mode: ConstructObject
+  prototype: AirlockGlass
+  cost: 4
+  delay: 4
+  collisionMask: FullTileMask
+  rotation: Camera
+  fx: EffectRCDConstruct4
+  
+- type: rcd
+  id: Firelock
+  category: Airlocks
+  sprite: /Textures/Interface/Radial/RCD/firelock.png
+  mode: ConstructObject
+  prototype: Firelock
+  cost: 4
+  delay: 3
+  collisionMask: FullTileMask
+  rotation: Camera
+  fx: EffectRCDConstruct3
+
+# Lighting
+- type: rcd
+  id: TubeLight
+  category: Lighting
+  sprite: /Textures/Interface/Radial/RCD/tube_light.png
+  mode: ConstructObject
+  prototype: Poweredlight
+  cost: 2
+  delay: 1
+  collisionMask: TabletopMachineMask
+  collisionBounds: "-0.23,-0.49,0.23,-0.36"
+  rotation: User
+  fx: EffectRCDConstruct1
+  
+- type: rcd
+  id: BulbLight
+  category: Lighting
+  sprite: /Textures/Interface/Radial/RCD/bulb_light.png
+  mode: ConstructObject
+  prototype: PoweredSmallLight
+  cost: 2
+  delay: 1
+  collisionMask: TabletopMachineMask
+  collisionBounds: "-0.23,-0.49,0.23,-0.36"
+  rotation: User
+  fx: EffectRCDConstruct1
+
+# Electrical
+- type: rcd
+  id: LVCable
+  category: Electrical
+  sprite: /Textures/Interface/Radial/RCD/lv_coil.png
+  mode: ConstructObject
+  prototype: CableApcExtension
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: Fixed
+  fx: EffectRCDConstruct0
+    
+- type: rcd
+  id: MVCable
+  category: Electrical
+  sprite: /Textures/Interface/Radial/RCD/mv_coil.png
+  mode: ConstructObject
+  prototype: CableMV
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: Fixed
+  fx: EffectRCDConstruct0
+    
+- type: rcd
+  id: HVCable
+  category: Electrical
+  sprite: /Textures/Interface/Radial/RCD/hv_coil.png
+  mode: ConstructObject
+  prototype: CableHV
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: Fixed
+  fx: EffectRCDConstruct0
+    
+- type: rcd
+  id: CableTerminal
+  category: Electrical
+  sprite: /Textures/Interface/Radial/RCD/cable_terminal.png
+  mode: ConstructObject
+  prototype: CableTerminal
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
\ No newline at end of file
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index f6bac28b32..44eba0f848 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -79,6 +79,26 @@
         reagent: Ethanol
         amount: 0.1
 
+- type: reagent
+  id: BlueHawaiian
+  name: reagent-name-blue-hawaiian
+  parent: BaseAlcohol
+  desc: reagent-desc-blue-hawaiian
+  physicalDesc: reagent-physical-desc-tropical
+  flavor: bluehawaiian
+  color: "#47687b"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/bluehawaiian.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2
+
 - type: reagent
   id: Cognac
   name: reagent-name-cognac
@@ -732,6 +752,46 @@
         reagent: Ethanol
         amount: 0.2
 
+- type: reagent
+  id: CoconutRum
+  name: reagent-name-coconut-rum
+  parent: BaseAlcohol
+  desc: reagent-desc-coconut-rum
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: rum
+  color: "#cccbc8"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/coconutrum.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2
+
+- type: reagent
+  id: Cosmopolitan
+  name: reagent-name-cosmopolitan
+  parent: BaseAlcohol
+  desc: reagent-desc-cosmopolitan
+  physicalDesc: reagent-physical-desc-citric
+  flavor: cosmopolitan
+  color: "#f73030"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/cosmopolitan.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.15
+
 - type: reagent
   id: CubaLibre
   name: reagent-name-cuba-libre
@@ -1254,6 +1314,26 @@
           types:
             Poison: 1
 
+- type: reagent
+  id: Painkiller
+  name: reagent-name-painkiller
+  parent: BaseAlcohol
+  desc: reagent-desc-painkiller
+  physicalDesc: reagent-physical-desc-refreshing
+  flavor: painkiller
+  color: "#e6cb47"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/painkiller.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2
+
 - type: reagent
   id: Patron
   name: reagent-name-patron
@@ -1292,6 +1372,18 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
 
+- type: reagent
+  id: PinaColada
+  name: reagent-name-pina-colada
+  parent: BaseAlcohol
+  desc: reagent-desc-pina-colada
+  physicalDesc: reagent-physical-desc-tropical
+  flavor: alcohol
+  color: "#e8dba4"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/pinacolada.rsi
+    state: icon
+
 - type: reagent
   id: Sbiten
   name: reagent-name-sbiten
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 908358e0a8..f2ca64e826 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -48,6 +48,34 @@
       - !type:SatiateThirst
         factor: 1
 
+- type: reagent
+  id: CoconutWater
+  name: reagent-name-coconut-water
+  parent: BaseDrink
+  desc: reagent-desc-coconut-water
+  physicalDesc: reagent-physical-desc-milky
+  flavor: nutty
+  color: "#f4eadb"
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 4 # Coconut water is 94% water
+
+- type: reagent
+  id: CreamOfCoconut
+  name: reagent-name-cream-of-coconut
+  parent: BaseDrink
+  desc: reagent-desc-cream-of-coconut
+  physicalDesc: reagent-physical-desc-syrupy
+  flavor: creamy
+  color: "#FFEABF"
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+
 - type: reagent
   id: CafeLatte
   name: reagent-name-cafe-latte
@@ -406,6 +434,26 @@
       - !type:SatiateHunger
         factor: 4
 
+- type: reagent
+  id: ArnoldPalmer
+  name: reagent-name-arnold-palmer
+  parent: BaseAlcohol
+  desc: reagent-desc-arnold-palmer
+  physicalDesc: reagent-physical-desc-sweet
+  flavor: arnoldpalmer
+  color: "#d8cc5d"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 4
+      - !type:AdjustReagent
+        reagent: Theobromine
+        amount: 0.05
+
 - type: reagent
   id: Pilk
   name: reagent-name-pilk
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index 63ae5b25d5..ba5adc4f2a 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -8,6 +8,23 @@
   color: "#6c2828"
   recognizable: true
 
+- type: reagent
+  id: RoyRogers
+  name: reagent-name-roy-rogers
+  parent: BaseSoda
+  desc: reagent-desc-roy-rogers
+  physicalDesc: reagent-physical-desc-sweet
+  flavor: cola
+  color: "#262019"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/royrogers.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 4
+
 - type: reagent
   id: ChangelingSting
   name: reagent-name-changeling-sting
@@ -116,6 +133,35 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
 
+- type: reagent
+  id: SolDry
+  name: reagent-name-sol-dry
+  parent: BaseSoda
+  desc: reagent-desc-sol-dry
+  physicalDesc: reagent-physical-desc-fizzy
+  flavor: gingersoda
+  color: "#ccb87e"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/sol_dry_glass.rsi
+    state: icon
+
+- type: reagent
+  id: ShirleyTemple
+  name: reagent-name-shirley-temple
+  parent: BaseSoda
+  desc: reagent-desc-shirley-temple
+  physicalDesc: reagent-physical-desc-fizzy
+  flavor: sweet
+  color: "#af2221"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/shirleytemple.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 4
+
 - type: reagent
   id: SpaceMountainWind
   name: reagent-name-space-mountain-wind
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
index 8fbfd3cd64..4cc2810792 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
@@ -164,3 +164,27 @@
       # eating salt on its own kinda sucks, kids
       - !type:SatiateThirst
         factor: -0.5
+
+- type: reagent
+  id: Syrup
+  name: reagent-name-syrup
+  group: Foods
+  desc: reagent-desc-syrup
+  flavor: sweet
+  color: "#fb7125"
+  recognizable: true
+  physicalDesc: reagent-physical-desc-sticky
+  slippery: false
+  viscosity: 0.55 #Start using syrup to attach your remote recievers to your microwaves!
+  tileReactions:
+    - !type:SpillTileReaction
+  metabolisms:
+    Food:
+      # 12 diona blood for 1 unit of syrup, this stuff better be worthwhile.
+      effects:
+      - !type:SatiateHunger
+        factor: 6.0 #Stronger than cookedramen
+  footstepSound:
+    collection: FootstepBlood
+    params:
+      volume: 6
diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml
index f94970c6eb..baa550b133 100644
--- a/Resources/Prototypes/Reagents/biological.yml
+++ b/Resources/Prototypes/Reagents/biological.yml
@@ -82,6 +82,32 @@
     params:
       volume: 6
 
+- type: reagent
+  id: Sap
+  name: reagent-name-sap
+  group: Biological
+  desc: reagent-desc-sap
+  flavor: sweet
+  color: "#cd7314"
+  recognizable: true
+  physicalDesc: reagent-physical-desc-sticky
+  slippery: false
+  viscosity: 0.10
+  tileReactions:
+    - !type:SpillTileReaction
+  metabolisms:
+    Food:
+      # Sweet!
+      effects:
+      - !type:SatiateHunger
+        factor: 1
+      - !type:SatiateThirst
+        factor: 1
+  footstepSound:
+    collection: FootstepBlood
+    params:
+      volume: 6
+
 - type: reagent
   parent: Blood
   id: CopperBlood
diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
index 51ad17e991..b4b5f455b6 100644
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -80,7 +80,7 @@
     Medicine:
       effects:
       - !type:ModifyBloodLevel
-        condition:
+        conditions:
         - !type:OrganType
           type: Arachnid
           shouldHave: true
@@ -170,7 +170,7 @@
     Medicine:
       effects:
       - !type:ModifyBloodLevel
-        condition:
+        conditions:
         - !type:OrganType
           type: Arachnid
           shouldHave: false
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index b8580614f5..bfd5ca4c93 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -234,7 +234,7 @@
           types:
             Asphyxiation: 1
             Cold: 2
-        groups:
+          groups:
             Brute: 0.5
       - !type:Jitter
         conditions:
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index ba86e86406..55304cfb1b 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -122,6 +122,13 @@
         damage:
           types:
             Poison: 1
+      - !type:AdjustReagent
+        conditions:
+        - !type:ReagentThreshold
+          reagent: ChloralHydrate
+          min: 1
+        reagent: ChloralHydrate
+        amount: -10
       - !type:GenericStatusEffect
         key: Stun
         time: 3
@@ -135,6 +142,10 @@
         component: StaminaModifier
         time: 3
         type: Add
+      - !type:GenericStatusEffect
+        key: ForcedSleep
+        time: 3
+        type: Remove
     Medicine:
       metabolismRate: 0.2
       effects:
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index 6e1ad75a35..954d4a6bef 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -480,7 +480,6 @@
         conditions:
           - !type:OrganType
             type: Human
-        reagent: Protein
         type: Local
         visualType: MediumCaution
         messages: [ "generic-reagent-effect-sick" ]
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/glasses_sechud.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/glasses_sechud.yml
new file mode 100644
index 0000000000..de264dbd58
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/glasses_sechud.yml
@@ -0,0 +1,25 @@
+- type: constructionGraph
+  id: GlassesSecHUD
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: glassesSec
+          steps:
+            - tag: Sunglasses
+              name: sun glasses
+              icon:
+                sprite: Clothing/Eyes/Glasses/sunglasses.rsi
+                state: icon
+              doAfter: 5
+            - tag: HudSecurity
+              name: security hud
+              icon:
+                sprite: Clothing/Eyes/Hud/sec.rsi
+                state: icon
+              doAfter: 5
+            - material: Cable
+              amount: 5
+              doAfter: 5
+    - node: glassesSec
+      entity: ClothingEyesGlassesSecurity
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml
index 7daf9ca22d..d9a4cd02fb 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml
@@ -24,7 +24,6 @@
           conditions:
             - !type:EntityAnchored
               anchored: false
-            - !type:ToiletLidClosed {}
           steps:
             - tool: Welding
               doAfter: 2
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
index deb9da975e..8021b5a298 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
@@ -46,7 +46,7 @@
       conditions:
       - !type:EntityAnchored {}
       steps:
-      - tag: DoorElectronics
+      - component: DoorElectronics
         store: board
         name: "микросхема шлюза"
         icon:
@@ -121,7 +121,6 @@
     actions:
     - !type:SetWiresPanelSecurity
       wiresAccessible: true
-      weldingAllowed: true
     edges:
     - to: glassElectronics
       conditions:
@@ -162,7 +161,6 @@
     actions:
     - !type:SetWiresPanelSecurity
       wiresAccessible: true
-      weldingAllowed: true
     edges:
     - to: wired
       conditions:
@@ -201,7 +199,6 @@
     actions:
     - !type:SetWiresPanelSecurity
       wiresAccessible: true
-      weldingAllowed: true
     edges:
     - to: medSecurityUnfinished
       conditions:
@@ -225,7 +222,6 @@
     - !type:SetWiresPanelSecurity
       examine: wires-panel-component-on-examine-security-level1
       wiresAccessible: false
-      weldingAllowed: false
     edges:
     - to: glassAirlock
       completed:
@@ -278,7 +274,6 @@
     - !type:SetWiresPanelSecurity
       examine: wires-panel-component-on-examine-security-level2
       wiresAccessible: false
-      weldingAllowed: false
     edges:
     - to: medSecurityUnfinished
       conditions:
@@ -293,7 +288,6 @@
     - !type:SetWiresPanelSecurity
       examine: wires-panel-component-on-examine-security-level3
       wiresAccessible: false
-      weldingAllowed: false
     edges:
     - to: glassAirlock
       completed:
@@ -346,7 +340,6 @@
     - !type:SetWiresPanelSecurity
       examine: wires-panel-component-on-examine-security-level4
       wiresAccessible: false
-      weldingAllowed: false
     edges:
     - to: highSecurityUnfinished
       conditions:
@@ -369,7 +362,6 @@
     - !type:SetWiresPanelSecurity
       examine: wires-panel-component-on-examine-security-level5
       wiresAccessible: false
-      weldingAllowed: true
     edges:
     - to: highSecurity
       completed:
@@ -397,7 +389,6 @@
     - !type:SetWiresPanelSecurity
       examine: wires-panel-component-on-examine-security-level6
       wiresAccessible: false
-      weldingAllowed: false
     edges:
     - to: maxSecurity
       completed:
@@ -422,7 +413,6 @@
     - !type:SetWiresPanelSecurity
       examine: wires-panel-component-on-examine-security-level7
       wiresAccessible: false
-      weldingAllowed: false
     edges:
     - to: superMaxSecurityUnfinished
       conditions:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml
index b0cfe30eb0..76b641a06d 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml
@@ -121,7 +121,6 @@
     actions:
     - !type:SetWiresPanelSecurity
       wiresAccessible: true
-      weldingAllowed: true
     edges:
     - to: glassElectronics
       conditions:
@@ -146,7 +145,6 @@
     actions:
     - !type:SetWiresPanelSecurity
       wiresAccessible: true
-      weldingAllowed: true
     edges:
     - to: wired
       conditions:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
index e142d887ea..0acc1f85ef 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
@@ -23,7 +23,6 @@
         - !type:SetAnchor
           value: true
         - !type:SnapToGrid
-          offset: Center
       edges:
         - to: item
           steps:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
index faaa1f68cf..1db05c62ce 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
@@ -103,6 +103,14 @@
             - tool: Anchoring
               doAfter: 1
 
+        - to: FirelockEdge
+          conditions:
+            - !type:EntityAnchored
+              anchored: true
+          steps:
+            - tool: Welding
+              doAfter: 0.5
+
         - to: FirelockGlassFrame
           conditions:
             - !type:EntityAnchored
@@ -160,3 +168,14 @@
           steps:
             - tool: Anchoring
               doAfter: 1
+
+    - node: FirelockEdge
+      entity: FirelockEdge
+      edges:
+        - to: frame4
+          conditions:
+            - !type:DoorWelded
+              welded: true
+          steps:
+            - tool: Anchoring
+              doAfter: 0.25
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/plastic_flaps.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/plastic_flaps.yml
index 9f8497ac98..776c1491a6 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/plastic_flaps.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/plastic_flaps.yml
@@ -13,6 +13,7 @@
           - material: Plastic
             amount: 5
             doAfter: 10
+
   - node: plasticFlaps
     entity: PlasticFlapsClear
     edges:
@@ -24,3 +25,73 @@
         steps:
           - tool: Anchoring
             doAfter: 10
+
+      - to: opaqueFlaps
+        completed:
+          - !type:SnapToGrid { }
+        steps:
+          - tool: Welding
+            doAfter: 5
+
+      - to: airtightFlaps
+        completed:
+          - !type:SnapToGrid { }
+        steps:
+          - material: Plastic
+            amount: 5
+            doAfter: 5
+          - tool: Screwing
+            doAfter: 5
+
+  - node: opaqueFlaps
+    entity: PlasticFlapsOpaque
+    edges:
+      - to: start
+        completed:
+          - !type:SpawnPrototype
+            prototype: SheetPlastic
+            amount: 5
+        steps:
+          - tool: Anchoring
+            doAfter: 10
+
+      - to: airtightopaqueFlaps
+        completed:
+          - !type:SnapToGrid { }
+        steps:
+          - material: Plastic
+            amount: 5
+            doAfter: 5
+          - tool: Screwing
+            doAfter: 5
+
+  - node: airtightFlaps
+    entity: PlasticFlapsAirtightClear
+    edges:
+      - to: plasticFlaps
+        completed:
+          - !type:SpawnPrototype
+            prototype: SheetPlastic
+            amount: 5
+        steps:
+          - tool: Screwing
+            doAfter: 10
+
+      - to: airtightopaqueFlaps #test
+        completed:
+          - !type:SnapToGrid { }
+        steps:
+          - tool: Welding
+            doAfter: 5
+
+  - node: airtightopaqueFlaps
+    entity: PlasticFlapsAirtightOpaque
+    edges:
+      - to: opaqueFlaps
+        completed:
+          - !type:SpawnPrototype
+            prototype: SheetPlastic
+            amount: 5
+        steps:
+          - tool: Screwing
+            doAfter: 10
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
index 1dc30d48bc..24a77e4f21 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
@@ -44,7 +44,7 @@
             - !type:EntityAnchored
               anchored: true
           steps:
-            - tag: DoorElectronics
+            - component: DoorElectronics
               name: микросхема шлюза
               icon:
                 sprite: "Objects/Misc/module.rsi"
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
index 96b499c7a3..de053c58e1 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
@@ -23,7 +23,7 @@
       conditions:
       - !type:EntityAnchored {}
       steps:
-      - tag: DoorElectronics
+      - component: DoorElectronics
         store: board
         name: "микросхема шлюза"
         icon:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
index 8990d5f1ab..f6971e8296 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
@@ -107,7 +107,7 @@
       conditions:
       - !type:EntityAnchored {}
       steps:
-      - tag: DoorElectronics
+      - component: DoorElectronics
         store: board
         name: "микросхема шлюза"
         icon:
@@ -378,7 +378,7 @@
       conditions:
       - !type:EntityAnchored { }
       steps:
-      - tag: DoorElectronics
+      - component: DoorElectronics
         store: board
         name: "микросхема шлюза"
         icon:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
index 0914ae46e5..922e8857c9 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
@@ -28,18 +28,15 @@
         - to: solarpanel
           conditions:
             - !type:EntityAnchored
-              value: true
           steps:
             - material: Glass
               amount: 2
               doAfter: 0.5
           completed:
             - !type:SnapToGrid
-              offset: Center
         - to: solartracker
           conditions:
             - !type:EntityAnchored
-              value: true
           steps:
             - tag: SolarTrackerElectronics
               name: Solar Tracker Electronics
@@ -52,7 +49,6 @@
               doAfter: 2
           completed:
             - !type:SnapToGrid
-              offset: Center
 
     - node: solarpanel
       entity: SolarPanel
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
index 5ebfda6c19..8f4f612fb5 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
@@ -10,7 +10,7 @@
               amount: 2
               doAfter: 2
             - material: Cable
-              amount: 2
+              amount: 3
               doAfter: 1
             - tag: GlassShard
               name: осколок стекла
@@ -33,7 +33,7 @@
               amount: 2
               doAfter: 2
             - material: Cable
-              amount: 2
+              amount: 3
               doAfter: 1
             - tag: ReinforcedGlassShard
               name: осколок усиленного стекла
@@ -56,7 +56,7 @@
               amount: 2
               doAfter: 2
             - material: Cable
-              amount: 2
+              amount: 3
               doAfter: 1
             - tag: PlasmaGlassShard
               name: осколок плазменного стекла
@@ -79,7 +79,7 @@
               amount: 2
               doAfter: 2
             - material: Cable
-              amount: 2
+              amount: 3
               doAfter: 1
             - tag: UraniumGlassShard
               name: осколок ураного стекла
diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml
index 5aa2c9d307..f265f0332a 100644
--- a/Resources/Prototypes/Recipes/Construction/clothing.yml
+++ b/Resources/Prototypes/Recipes/Construction/clothing.yml
@@ -96,3 +96,14 @@
   description: Comfy, yet haunted by the ghosts of ducks you fed bread to as a child.
   icon: { sprite: Clothing/Shoes/Misc/duck-slippers.rsi, state: icon }
   objectType: Item
+
+- type: construction
+  name: security glasses
+  id: ClothingEyesGlassesSecurity
+  graph: GlassesSecHUD
+  startNode: start
+  targetNode: glassesSec
+  category: construction-category-clothing
+  description: A pair of sunglasses, modified to have a built-in security HUD.
+  icon: { sprite: Clothing/Eyes/Glasses/secglasses.rsi, state: icon }
+  objectType: Item
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index 2dda7d7894..66b2a57da7 100644
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -606,7 +606,7 @@
   description: A human excrement flushing apparatus.
   icon:
     sprite: Structures/Furniture/toilet.rsi
-    state: closed_toilet_seat_up
+    state: disposal
   objectType: Structure
   placementMode: SnapgridCenter
   canBuildInImpassable: false
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index 443565bfeb..b32b137d75 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -86,7 +86,7 @@
   canRotate: false
   canBuildInImpassable: false
   conditions:
-    - !type:TileNotBlocked    
+    - !type:TileNotBlocked
 
 - type: construction
   name: clock wall
@@ -795,6 +795,23 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: Thin firelock
+  id: FirelockEdge
+  graph: Firelock
+  startNode: start
+  targetNode: FirelockEdge
+  category: construction-category-structures
+  description: This is a firelock - it locks an area when a fire alarm in the area is triggered. Don't get squished!
+  icon:
+    sprite: Structures/Doors/edge_door_hazard.rsi
+    state: closed
+  placementMode: SnapgridCenter
+  objectType: Structure
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: shutter
   id: ShuttersNormalOpen
@@ -1590,6 +1607,57 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: airtight plastic flaps
+  id: PlasticFlapsAirtight
+  graph: PlasticFlapsGraph
+  startNode: start
+  targetNode: airtightFlaps
+  category: construction-category-structures
+  placementMode: SnapgridCenter
+  description: An airtight plastic flap to let items through and keep people out.
+  objectType: Structure
+  canBuildInImpassable: false
+  icon:
+    sprite: Structures/plastic_flaps.rsi
+    state: plasticflaps
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  name: opaque plastic flaps
+  id: PlasticFlapsOpaque
+  graph: PlasticFlapsGraph
+  startNode: start
+  targetNode: opaqueFlaps
+  category: construction-category-structures
+  placementMode: SnapgridCenter
+  description: An opaque plastic flap to let items through and keep people out.
+  objectType: Structure
+  canBuildInImpassable: false
+  icon:
+    sprite: Structures/plastic_flaps.rsi
+    state: plasticflaps
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  name: airtight opaque plastic flaps
+  id: PlasticFlapsAirtightOpaque
+  graph: PlasticFlapsGraph
+  startNode: start
+  targetNode: airtightopaqueFlaps
+  category: construction-category-structures
+  placementMode: SnapgridCenter
+  description: An opaque, airtight plastic flap to let items through and keep people out.
+  objectType: Structure
+  canBuildInImpassable: false
+  icon:
+    sprite: Structures/plastic_flaps.rsi
+    state: plasticflaps
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: bananium clown statue
   id: StatueBananiumClown
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml
index 56530f443e..cecd031f97 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml
@@ -1,13 +1,31 @@
-- type: constructionGraph
+- type: constructionGraph
   id: WoodenBat
   start: start
   graph:
     - node: start
       edges:
-        - to: bat
+        - to: incompleteBat
           steps:
             - material: WoodPlank
               amount: 5
               doAfter: 4
+        
+    - node: incompleteBat
+      entity: IncompleteBaseBallBat
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 5
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Prying
+              doAfter: 1
+        - to: bat
+          steps:
+            - tool: Slicing
+              doAfter: 4
+        
     - node: bat
       entity: BaseBallBat
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml
deleted file mode 100644
index 15167a958c..0000000000
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- type: constructionGraph
-  id: flowercrown
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: flowercrown
-          steps:
-            - tag: Flower
-              name: цветок
-              icon:
-                sprite: Objects/Specific/Hydroponics/poppy.rsi
-                state: produce
-            - tag: Flower
-              name: flower
-              icon:
-                sprite: Objects/Specific/Hydroponics/poppy.rsi
-                state: produce
-            - tag: Ambrosia
-              name: ambrosia
-              icon:
-                sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi
-                state: produce
-              doAfter: 10
-    - node: flowercrown
-      entity: ClothingHeadHatFlowerCrown
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowerwreath.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowerwreath.yml
index a0a87a14d8..b8e580230d 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowerwreath.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowerwreath.yml
@@ -23,4 +23,4 @@
                 state: produce
               doAfter: 10
     - node: flowerwreath
-      entity: ClothingNeckFlowerWreath
+      entity: ClothingHeadHatFlowerWreath
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/hairflower.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/hairflower.yml
deleted file mode 100644
index 76bc124290..0000000000
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/hairflower.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-- type: constructionGraph
-  id: hairflower
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: hairflower
-          steps:
-            - tag: Flower # TODO change to "RedFlower" or "Poppy" tag, so you cant make red flower from bluesyellow etc., when it will be
-              name: flower
-              icon:
-                sprite: Objects/Specific/Hydroponics/poppy.rsi
-                state: produce
-              doAfter: 3.5
-    - node: hairflower
-      entity: ClothingHeadHatHairflower
diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml
index eac90f7b48..07c0470c75 100644
--- a/Resources/Prototypes/Recipes/Crafting/improvised.yml
+++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml
@@ -98,32 +98,6 @@
     sprite: Clothing/Eyes/Misc/blindfold.rsi
     state: icon
 
-- type: construction
-  name: hairflower
-  id: hairflower
-  graph: hairflower
-  startNode: start
-  targetNode: hairflower
-  category: construction-category-clothing
-  description: "A red flower for beautiful ladies."
-  icon:
-    sprite: Clothing/Head/Misc/hairflower.rsi
-    state: icon
-  objectType: Item
-
-- type: construction
-  name: flower crown
-  id: ClothingHeadHatFlowerCrown
-  graph: flowercrown
-  startNode: start
-  targetNode: flowercrown
-  category: construction-category-clothing
-  description: "A coronet of fresh and fragrant flowers."
-  icon:
-    sprite: Clothing/Head/Misc/flower-crown.rsi
-    state: icon
-  objectType: Item
-
 - type: construction
   name: flower wreath
   id: flowerwreath
@@ -131,9 +105,9 @@
   startNode: start
   targetNode: flowerwreath
   category: construction-category-clothing
-  description: "A wreath of colourful flowers."
+  description: A wreath of colourful flowers. Can be worn both on head and neck.
   icon:
-    sprite: Clothing/Neck/Misc/flower-wreath.rsi
+    sprite: Clothing/Head/Misc/flower-wreath.rsi
     state: icon
   objectType: Item
 
@@ -163,6 +137,19 @@
     sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
     state: icon
 
+- type: construction
+  name: improvised shotgun shell
+  id: ShellShotgunImprovised
+  graph: ImprovisedShotgunShellGraph
+  startNode: start
+  targetNode: shell
+  category: construction-category-weapons
+  objectType: Item
+  description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a Barn
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
+    state: improvised
+
 - type: construction
   name: rifle stock
   id: riflestock
@@ -176,6 +163,19 @@
     sprite: Objects/Misc/rifle_stock.rsi
     state: icon
 
+- type: construction
+  name: fire bomb
+  id: firebomb
+  graph: FireBomb
+  startNode: start
+  targetNode: firebomb
+  category: construction-category-weapons
+  objectType: Item
+  description: A weak, improvised incendiary device.
+  icon:
+    sprite: Objects/Weapons/Bombs/ied.rsi
+    state: icon
+
 - type: construction
   name: cotton woven cloth
   id: CottonWovenCloth
@@ -201,3 +201,16 @@
     sprite: Clothing/Head/Hats/straw_hat.rsi
     state: icon
   objectType: Item
+
+- type: construction
+  name: pipe bomb
+  id: pipebomb
+  graph: PipeBomb
+  startNode: start
+  targetNode: pipebomb
+  category: construction-category-weapons
+  objectType: Item
+  description: An improvised explosive made from pipes and wire.
+  icon:
+    sprite: Objects/Weapons/Bombs/pipebomb.rsi
+    state: icon
diff --git a/Resources/Prototypes/Recipes/Lathes/salvage.yml b/Resources/Prototypes/Recipes/Lathes/salvage.yml
index 57ae75b617..9b3cb08643 100644
--- a/Resources/Prototypes/Recipes/Lathes/salvage.yml
+++ b/Resources/Prototypes/Recipes/Lathes/salvage.yml
@@ -1,11 +1,10 @@
 - type: latheRecipe
   id: Fulton
   result: Fulton1
-  completetime: 5
+  completetime: 1
   materials:
     Steel: 200
-    # TODO: Need better sources of cloth as otherwise these will never get made.
-    # Cloth: 200
+    Cloth: 100
 
 - type: latheRecipe
   id: FultonBeacon
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index e7e099e945..5e0d7416a4 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -87,14 +87,6 @@
   materials:
     Plastic: 100
 
-- type: latheRecipe
-  id: ClothingEyesGlassesSecurity
-  result: ClothingEyesGlassesSecurity
-  completetime: 2
-  materials:
-    Steel: 300
-    Glass: 200
-
 - type: latheRecipe
   id: ClothingEyesHudSecurity
   result: ClothingEyesHudSecurity
diff --git a/Resources/Prototypes/Recipes/Reactions/biological.yml b/Resources/Prototypes/Recipes/Reactions/biological.yml
index 4e94b8d85b..604211466f 100644
--- a/Resources/Prototypes/Recipes/Reactions/biological.yml
+++ b/Resources/Prototypes/Recipes/Reactions/biological.yml
@@ -25,6 +25,19 @@
     Water: 4
     Nitrogen: 1
 
+
+- type: reaction
+  id: SapBloodBreakdown
+  source: true
+  requiredMixerCategories:
+  - Centrifuge
+  reactants:
+    Sap:
+      amount: 10
+  products:
+    Water: 9
+    Sugar: 1
+
 - type: reaction
   id: CopperBloodBreakdown
   source: true
diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index 7608369b2c..c810ebb0ce 100644
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -54,6 +54,16 @@
   products:
     Antifreeze: 4
 
+- type: reaction
+  id: ArnoldPalmer
+  reactants:
+    IcedTea:
+      amount: 1
+    Lemonade:
+      amount: 1
+  products:
+    ArnoldPalmer: 2
+
 - type: reaction
   id: AtomicBomb
   reactants:
@@ -76,6 +86,20 @@
   products:
     B52: 3
 
+- type: reaction
+  id: BlueHawaiian
+  reactants:
+    CoconutRum:
+      amount: 2
+    JuicePineapple:
+      amount: 1
+    JuiceLemon:
+      amount: 1
+    BlueCuracao:
+      amount: 1
+  products:
+    BlueHawaiian: 5
+
 - type: reaction
   id: CogChamp
   reactants:
@@ -90,6 +114,24 @@
   sound:
     path: /Audio/Magic/Cults/ClockCult/steam_whoosh.ogg
 
+- type: reaction
+  id: BahamaMama
+  reactants:
+    Ice:
+      amount: 1
+    JuiceOrange:
+      amount: 1
+    JuicePineapple:
+      amount: 1
+    Rum:
+      amount: 1
+    CoconutRum:
+      amount: 1
+    Grenadine:
+      amount: 1
+  products:
+    BahamaMama: 6
+
 - type: reaction
   id: Barefoot
   reactants:
@@ -182,6 +224,40 @@
   products:
     CafeLatte: 2
 
+- type: reaction
+  id: CoconutRum
+  reactants:
+    Rum:
+      amount: 2
+    CoconutWater:
+      amount: 1
+  products:
+    CoconutRum: 3
+
+- type: reaction
+  id: Cosmopolitan
+  reactants:
+    Vodka:
+      amount: 1
+    JuiceBerry:
+      amount: 1
+    JuiceLime:
+      amount: 1
+  products:
+    Cosmopolitan: 3
+
+- type: reaction
+  id: CreamOfCoconut
+  reactants:
+    CoconutWater:
+      amount: 1
+    Sugar:
+      amount: 1
+    Milk:
+      amount: 1
+  products:
+    CreamOfCoconut: 3
+
 - type: reaction
   id: CubaLibre
   reactants:
@@ -638,6 +714,34 @@
   products:
     Patron: 10
 
+- type: reaction
+  id: Painkiller
+  reactants:
+    JuicePineapple:
+      amount: 3
+    CoconutRum:
+      amount: 1
+    JuiceOrange:
+      amount: 1
+    CreamOfCoconut:
+      amount: 1
+  products:
+    Painkiller: 6
+
+- type: reaction
+  id: PinaColada
+  reactants:
+    JuicePineapple:
+      amount: 3
+    JuiceLime:
+      amount: 1
+    Rum:
+      amount: 1
+    CreamOfCoconut:
+      amount: 1
+  products:
+    PinaColada: 6
+
 - type: reaction
   id: Posca
   reactants:
@@ -680,6 +784,16 @@
   products:
     RootBeerFloat: 3
 
+- type: reaction
+  id: RoyRogers
+  reactants:
+    Cola:
+      amount: 2
+    Grenadine:
+      amount: 1
+  products:
+    RoyRogers: 3
+
 - type: reaction
   id: Sbiten
   reactants:
@@ -700,6 +814,16 @@
   products:
     ScrewdriverCocktail: 3
 
+- type: reaction
+  id: ShirleyTemple
+  reactants:
+    SolDry:
+      amount: 2
+    Grenadine:
+      amount: 1
+  products:
+    ShirleyTemple: 3
+
 - type: reaction
   id: Silencer
   reactants:
diff --git a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
index 0f9835e804..aa1429b708 100644
--- a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
+++ b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
@@ -20,6 +20,19 @@
   products:
     EggCooked: 0.5
 
+- type: reaction
+  id: SapBoiling
+  impact: Low
+  minTemp: 377
+  reactants:
+    Sap:
+      amount: 1.2
+  effects:
+  - !type:CreateGas
+    gas: WaterVapor
+  products:
+    Syrup: 0.1 #12:1 sap to syruop
+
 # Holy - TODO: make it so only the chaplain can use the bible to start these reactions, not anyone with a bible
 
 - type: reaction
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 1166b65417..3e61d00c66 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -96,7 +96,6 @@
   tier: 1
   cost: 8000
   recipeUnlocks:
-  - ClothingEyesGlassesSecurity
   - Truncheon
   - TelescopicShield
   - HoloprojectorSecurity
diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml
index 4737470c06..e9d58cb5b4 100644
--- a/Resources/Prototypes/Research/experimental.yml
+++ b/Resources/Prototypes/Research/experimental.yml
@@ -4,8 +4,8 @@
   id: BasicRobotics
   name: research-technology-basic-robotics
   icon:
-    sprite: Mobs/Silicon/drone.rsi
-    state: drone
+    sprite: Structures/Machines/exosuit_fabricator.rsi
+    state: fab-idle
   discipline: Experimental
   tier: 1
   cost: 5000
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
index f5f6cda893..1f9193b58a 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
@@ -75,6 +75,61 @@
   inhand:
     - AirTankFilled
 
+# Chaplain
+- type: job
+  id: ERTChaplain
+  name: job-name-ertchaplain
+  description: job-description-ertchaplain
+  playTimeTracker: JobERTChaplain
+  setPreference: false
+  startingGear: ERTEngineerGearEVA
+  icon: "JobIconNanotrasen"
+  supervisors: job-supervisors-centcom
+  canBeAntag: false
+  accessGroups:
+  - AllAccess
+  access:
+  - CentralCommand
+  special:
+  - !type:AddComponentSpecial
+    components:
+    - type: BibleUser #Lets them heal with bibles
+
+- type: startingGear
+  id: ERTChaplainGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitERTChaplain
+    back: ClothingBackpackERTChaplainFilled
+    shoes: ClothingShoesLeather
+    head: ClothingHeadHatFez
+    eyes: ClothingEyesGlasses
+    neck: ClothingNeckStoleChaplain
+    gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterArmorBasicSlim
+    id: ERTEngineerPDA
+    ears: ClothingHeadsetAltCentCom
+    belt: ClothingBeltStorageWaistbag
+    pocket1: Flare
+    pocket2: DrinkWaterBottleFull
+
+- type: startingGear
+  id: ERTChaplainGearEVA
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitERTChaplain
+    back: ClothingBackpackERTChaplainFilled
+    shoes: ClothingShoesBootsMagAdv
+    mask: ClothingMaskGasERT
+    eyes: ClothingEyesGlasses
+    neck: ClothingNeckStoleChaplain
+    gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterHardsuitERTChaplain
+    suitstorage: AirTankFilled
+    id: ERTChaplainPDA
+    ears: ClothingHeadsetAltCentCom
+    belt: ClothingBeltStorageWaistbag
+    pocket1: Flare
+    pocket2: DrinkWaterBottleFull
+
 # Engineer
 - type: job
   id: ERTEngineer
diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml
index 4732ce17a7..3e1b625f59 100644
--- a/Resources/Prototypes/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/Roles/play_time_trackers.yml
@@ -46,6 +46,9 @@
 - type: playTimeTracker
   id: JobDetective
 
+- type: playTimeTracker
+  id: JobERTChaplain
+
 - type: playTimeTracker
   id: JobERTEngineer
 
diff --git a/Resources/Prototypes/StatusEffects/health.yml b/Resources/Prototypes/StatusEffects/health.yml
index 3ee12ef56e..562dbb336d 100644
--- a/Resources/Prototypes/StatusEffects/health.yml
+++ b/Resources/Prototypes/StatusEffects/health.yml
@@ -1,32 +1,35 @@
 - type: statusIcon
+  id: HealthIcon
+  abstract: true
+  priority: 1
+  locationPreference: Right
+  isShaded: true
+
+- type: statusIcon
+  parent: HealthIcon
   id: HealthIconFine
-  priority: 0
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Fine
-  locationPreference: Right
 
 - type: statusIcon
   id: HealthIconCritical
-  priority: 1
+  parent: HealthIcon
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Critical
-  locationPreference: Right
 
 - type: statusIcon
   id: HealthIconDead
-  priority: 1
+  parent: HealthIcon
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Dead
-  locationPreference: Right
 
 - type: statusIcon
   id: HealthIconRotting
-  priority: 1
+  parent: HealthIcon
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Rotting
-  locationPreference: Right
 
diff --git a/Resources/Prototypes/StatusEffects/hunger.yml b/Resources/Prototypes/StatusEffects/hunger.yml
index 6436665713..9af246e06e 100644
--- a/Resources/Prototypes/StatusEffects/hunger.yml
+++ b/Resources/Prototypes/StatusEffects/hunger.yml
@@ -1,49 +1,57 @@
 #Hunger
 - type: statusIcon
-  id: HungerIconOverfed
+  id: HungerIcon
+  abstract: true
   priority: 5
+  locationPreference: Right
+  isShaded: true
+
+- type: statusIcon
+  id: HungerIconOverfed
+  parent: HungerIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: overfed
-  locationPreference: Right
 
 - type: statusIcon
   id: HungerIconPeckish
-  priority: 5
+  parent: HungerIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: peckish
-  locationPreference: Right
 
 - type: statusIcon
   id: HungerIconStarving
-  priority: 5
+  parent: HungerIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: starving
-  locationPreference: Right
 
 #Thirst
 - type: statusIcon
-  id: ThirstIconOverhydrated
+  id: ThirstIcon
+  abstract: true
   priority: 5
+  locationPreference: Left
+  isShaded: true
+
+- type: statusIcon
+  id: ThirstIconOverhydrated
+  parent: ThirstIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: overhydrated
-  locationPreference: Left
 
 - type: statusIcon
   id: ThirstIconThirsty
-  priority: 5
+  parent: ThirstIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: thirsty
-  locationPreference: Left
 
 - type: statusIcon
   id: ThirstIconParched
-  priority: 5
+  parent: ThirstIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: parched
-  locationPreference: Left
diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml
index c43ccb92cb..b1c96df2bc 100644
--- a/Resources/Prototypes/StatusEffects/job.yml
+++ b/Resources/Prototypes/StatusEffects/job.yml
@@ -3,6 +3,7 @@
   abstract: true
   priority: 1
   locationPreference: Right
+  isShaded: true
 
 - type: statusIcon
   parent: JobIcon
diff --git a/Resources/Prototypes/StatusEffects/security.yml b/Resources/Prototypes/StatusEffects/security.yml
index 51d087104d..ca25f746f2 100644
--- a/Resources/Prototypes/StatusEffects/security.yml
+++ b/Resources/Prototypes/StatusEffects/security.yml
@@ -4,6 +4,7 @@
   priority: 2
   offset: 1
   locationPreference: Right
+  isShaded: true
 
 - type: statusIcon
   parent: SecurityIcon
diff --git a/Resources/Prototypes/StatusIcon/antag.yml b/Resources/Prototypes/StatusIcon/antag.yml
index 87576f93b7..da530a86d8 100644
--- a/Resources/Prototypes/StatusIcon/antag.yml
+++ b/Resources/Prototypes/StatusIcon/antag.yml
@@ -31,6 +31,7 @@
   priority: 1
   locationPreference: Right
   layer: Mod
+  isShaded: true
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: MindShield
diff --git a/Resources/Prototypes/Traits/neutral.yml b/Resources/Prototypes/Traits/neutral.yml
index 9e7f765507..ba9bd8d886 100644
--- a/Resources/Prototypes/Traits/neutral.yml
+++ b/Resources/Prototypes/Traits/neutral.yml
@@ -16,3 +16,10 @@
     - type: MothAccent
     - type: ReplacementAccent
       accent: dwarf
+
+- type: trait
+  id: Southern
+  name: trait-southern-name
+  description: trait-southern-desc
+  components:
+    - type: SouthernAccent
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index 7294fb7d07..7c1e75327f 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -417,6 +417,24 @@
     Weh:
       collection: Weh
 
+- type: emoteSounds
+  id: UnisexSilicon
+  params:
+    variation: 0.05
+  sounds:
+    Beep:
+      path: /Audio/Machines/twobeep.ogg
+    Chime:
+      path: /Audio/Machines/chime.ogg
+    Buzz:
+      path: /Audio/Machines/buzz-sigh.ogg
+    Buzz-Two:
+      path: /Audio/Machines/buzz-two.ogg
+    Honk:
+      path: /Audio/Items/bikehorn.ogg
+    Ping:
+      path: /Audio/Effects/Cargo/ping.ogg
+
 # body emotes
 - type: emoteSounds
   id: GeneralBodyEmotes
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index e5ecced693..0cb0a3fa82 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -242,6 +242,11 @@
     - buzzes.
     - buzzes!
 
+- type: emote
+  id: Weh
+  category: Vocal
+  chatMessages: [Вах!]
+
 - type: emote
   id: Chirp
   category: Vocal
@@ -259,7 +264,93 @@
   - chirping.
   - chirped.
 
+# Machine Emotes
 - type: emote
-  id: Weh
+  id: Beep
   category: Vocal
-  chatMessages: [Вех!]
\ No newline at end of file
+  chatMessages: [beeps.]
+  chatTriggers:
+    - beep
+    - beep!
+    - beep.
+    - beeps
+    - beeps.
+    - beeps!
+    - beeped
+    - beeped.
+    - beeped!
+    - beeping
+    - beeping.
+    - beeping!
+
+- type: emote
+  id: Chime
+  category: Vocal
+  chatMessages: [chimes.]
+  chatTriggers:
+    - chime
+    - chime.
+    - chime!
+    - chimes
+    - chimes.
+    - chimes!
+    - chimed
+    - chimed.
+    - chimed!
+    - chiming
+    - chiming,
+    - chiming!
+
+- type: emote
+  id: Buzz-Two
+  category: Vocal
+  chatMessages: [buzzesTwice.]
+  chatTriggers:
+    - buzztwice
+    - buzztwice.
+    - buzztwice!
+    - buzzstwice
+    - buzzstwice.
+    - buzzstwice!
+    - buzzestwice
+    - buzzestwice.
+    - buzzestwice!
+    - buzzingtwice
+    - buzzingtwice.
+    - buzzingtwice!
+    - buzzedtwice
+    - buzzedtwice.
+    - buzzedtwice!
+    - buzz twice
+    - buzz twice.
+    - buzz twice!
+    - buzzs twice
+    - buzzs twice.
+    - buzzs twice!
+    - buzzes twice
+    - buzzes twice.
+    - buzzes twice!
+    - buzzing twice
+    - buzzing twice.
+    - buzzing twice!
+    - buzzed twice
+    - buzzed twice.
+    - buzzed twice!
+
+- type: emote
+  id: Ping
+  category: Vocal
+  chatMessages: [pings.]
+  chatTriggers:
+    - ping
+    - ping.
+    - ping!
+    - pings
+    - pings.
+    - pings!
+    - pinged
+    - pinged.
+    - pinged!
+    - pinging
+    - pinging.
+    - pinging!
diff --git a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
index 18f3acfae3..911c1c2e88 100644
--- a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
+++ b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
@@ -106,7 +106,6 @@
   - type: SolutionTransfer
     canChangeTransferAmount: true
   - type: Drink
-    isOpen: true
     solution: beaker
 
 - type: artifactEffect
diff --git a/Resources/Prototypes/explosion.yml b/Resources/Prototypes/explosion.yml
index 6b8ecdd042..1006d8d80b 100644
--- a/Resources/Prototypes/explosion.yml
+++ b/Resources/Prototypes/explosion.yml
@@ -110,9 +110,9 @@
       Blunt: 15
       Piercing: 6
       Structural: 40
-  tileBreakChance: [ 0.75, 0.95, 1 ]
-  tileBreakIntensity: [ 1, 10, 15 ]
-  tileBreakRerollReduction: 30
+  tileBreakChance: [ 0, 0.5, 1 ]
+  tileBreakIntensity: [ 0, 10, 30 ]
+  tileBreakRerollReduction: 10
   intensityPerState: 20
   lightColor: Orange
   texturePath: /Textures/Effects/fire.rsi
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index eb2c190cb1..829af28846 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -418,6 +418,9 @@
 - type: Tag
   id: ConveyorAssembly
 
+- type: Tag
+  id: CoordinatesDisk
+
 - type: Tag #Ohioans die happy
   id: Corn
 
@@ -914,9 +917,6 @@
 - type: Tag
   id: NoBlockAnchoring
 
-- type: Tag
-  id: NoPaint
-
 - type: Tag
   id: NozzleBackTank
 
@@ -1037,9 +1037,6 @@
 - type: Tag
   id: RawMaterial
 
-- type: Tag
-  id: RCDDeconstructWhitelist
-
 # Give this to something that doesn't need any special recycler behavior and just needs deleting.
 - type: Tag
   id: Recyclable
@@ -1183,6 +1180,9 @@
 
 - type: Tag
   id: SuitEVA
+  
+- type: Tag
+  id: Sunglasses
 
 - type: Tag
   id: SurveillanceCameraMonitorCircuitboard
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Biological.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Biological.xml
new file mode 100644
index 0000000000..6f1a4e630b
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Biological.xml
@@ -0,0 +1,9 @@
+<Document>
+
+# Biological
+
+These reagents include chemicals that you can get from certain materials and from living things. To get the other chemicals you have to use machines like the electrolyzer and the centrifuge.
+
+<GuideReagentGroupEmbed Group="Biological"/>
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Botany.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Botany.xml
new file mode 100644
index 0000000000..832e32d644
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Botany.xml
@@ -0,0 +1,14 @@
+<Document>
+
+# Botanical Chemicals
+
+These chemicals are used by botanists. Some of the chemicals change the properties of the plants.
+
+<GuideReagentEmbed Reagent="Ammonia"/>
+<GuideReagentEmbed Reagent="Diethylamine"/>
+<GuideReagentEmbed Reagent="EZNutrient"/>
+<GuideReagentEmbed Reagent="Left4Zed"/>
+<GuideReagentEmbed Reagent="RobustHarvest"/>
+<GuideReagentEmbed Reagent="UnstableMutagen"/>
+
+</Document>
\ No newline at end of file
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Elements.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Elements.xml
new file mode 100644
index 0000000000..3a1c587304
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Elements.xml
@@ -0,0 +1,9 @@
+<Document>
+
+# Elements
+
+This list contains all the basic reagents used to make other chemicals.
+
+<GuideReagentGroupEmbed Group="Elements"/>
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Foods.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Foods.xml
new file mode 100644
index 0000000000..aea68d74ce
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Foods.xml
@@ -0,0 +1,8 @@
+<Document>
+# Foods
+
+These reagents are mostly used in the kitchen. Very helpful for Chefs and/or Service Workers.
+
+<GuideReagentGroupEmbed Group="Foods"/>
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Narcotics.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Narcotics.xml
new file mode 100644
index 0000000000..0dbb5ad359
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Narcotics.xml
@@ -0,0 +1,5 @@
+<Document>
+# Narcotics
+The reagents listed in this category includes stimulants, hallucinogens and other drug-like effects.
+<GuideReagentGroupEmbed Group="Narcotics"/>
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Other.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Other.xml
new file mode 100644
index 0000000000..31ad4ef3cb
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Other.xml
@@ -0,0 +1,5 @@
+<Document>
+# Other
+These are the other regeants listed in the Chemicals page.
+<GuideReagentGroupEmbed Group="Unknown"/>
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Pyrotechnic.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Pyrotechnic.xml
new file mode 100644
index 0000000000..9941e2ff36
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Pyrotechnic.xml
@@ -0,0 +1,5 @@
+<Document>
+# Pyrotechnics
+These chemicals are flammmable and causes hazardous effects when making them (Plasma gas and explosions). It is recommmended to make these chemicals in a safe environment.
+<GuideReagentGroupEmbed Group="Pyrotechnic"/>
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Toxins.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Toxins.xml
new file mode 100644
index 0000000000..19ab91cbf4
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Toxins.xml
@@ -0,0 +1,5 @@
+<Document>
+# Toxins
+The chemicals in this list contain toxins that induce certain effects and can cause death. Use responsibly.
+<GuideReagentGroupEmbed Group="Toxins"/>
+</Document>
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000..4bcff09c29
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/icon.png
new file mode 100644
index 0000000000..02b99ef372
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/inhand-left.png
new file mode 100644
index 0000000000..f6bb073134
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/inhand-right.png
new file mode 100644
index 0000000000..d527a7daf9
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/meta.json
similarity index 60%
rename from Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json
rename to Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/meta.json
index e0ee93d642..e2732ec02c 100644
--- a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6, inhands by peptide",
   "size": {
     "x": 32,
     "y": 32
@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-HELMET",
+      "name": "equipped-BACKPACK",
       "directions": 4
     },
     {
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon-flash.png
new file mode 100644
index 0000000000..7eaaa91e72
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon-flash.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon.png
new file mode 100644
index 0000000000..32457b1916
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/meta.json
new file mode 100644
index 0000000000..7cbcf43056
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "created by IProduceWidgets",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-flash"
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-equipped-HELMET.png
new file mode 100644
index 0000000000..67b29508a9
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-inhand-left.png
new file mode 100644
index 0000000000..c60c817262
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-inhand-right.png
new file mode 100644
index 0000000000..2b20dab172
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-equipped-HELMET.png
new file mode 100644
index 0000000000..c626307585
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-inhand-left.png
new file mode 100644
index 0000000000..d2126f33cb
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-inhand-right.png
new file mode 100644
index 0000000000..dea3b36335
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/equipped-HELMET.png
deleted file mode 100644
index ec1c408550..0000000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/icon.png
deleted file mode 100644
index 7a44f388c8..0000000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-left.png
deleted file mode 100644
index 4432f6604a..0000000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-right.png
deleted file mode 100644
index c90ef79456..0000000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/equipped-NECK.png
rename to Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json
similarity index 59%
rename from Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json
rename to Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json
index 2899868b90..c3dc06f19c 100644
--- a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-4.0",
-  "copyright": "Kevin Zheng 2022",
+  "copyright": "Kevin Zheng 2022 | equipped-NECK and icon Drawn by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,10 @@
     {
       "name": "icon"
     },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png
deleted file mode 100644
index a87d0676fb..0000000000
Binary files a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-left.png
deleted file mode 100644
index f838e54e74..0000000000
Binary files a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-right.png
deleted file mode 100644
index d56cbfde87..0000000000
Binary files a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Misc/hairflower.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/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index e93c024893..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/icon.png
deleted file mode 100644
index cd7f486a89..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-left.png
deleted file mode 100644
index ce718ad300..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-right.png
deleted file mode 100644
index 6bfef738a4..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING-body-slim.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING-body-slim.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING-body-slim.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING-body-slim.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..2acce2e63e
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/icon.png
new file mode 100644
index 0000000000..4f4bb2b8fb
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/inhand-left.png
new file mode 100644
index 0000000000..4ae23f153e
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/inhand-right.png
new file mode 100644
index 0000000000..d86d8ce96a
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/meta.json
similarity index 75%
rename from Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/meta.json
index 9e775216e4..311a714a4c 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
+  "copyright": "Created by IProduceWidgets",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/equipped-FEET.png
index 09c92cfa5f..e62bf7af7d 100644
Binary files a/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-left.png
index 1ba8eb4173..3c4c4af0f0 100644
Binary files a/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-right.png
index 7886baaeda..0b772c7c85 100644
Binary files a/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 0000000000..3fb85861a1
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..ef532d7232
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/icon.png
new file mode 100644
index 0000000000..fdaf39cf4e
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/inhand-left.png
new file mode 100644
index 0000000000..ed878f2d31
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/inhand-right.png
new file mode 100644
index 0000000000..7cc2bc1ce2
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/meta.json
new file mode 100644
index 0000000000..dca2585d6b
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from TGstation: https://github.com/tgstation/tgstation/blob/c838ba21dae97db345e0113f99596decd1d66039/icons/mob/clothing/under/security.dmi. Modified and recolored by Nairodian (github) for SS14, monkey made by brainfood1183 (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Effects/rcd.rsi/construct.png b/Resources/Textures/Effects/rcd.rsi/construct.png
deleted file mode 100644
index f4be36c9bf..0000000000
Binary files a/Resources/Textures/Effects/rcd.rsi/construct.png and /dev/null differ
diff --git a/Resources/Textures/Effects/rcd.rsi/construct0.png b/Resources/Textures/Effects/rcd.rsi/construct0.png
new file mode 100644
index 0000000000..d83fa0506c
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/construct0.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/construct1.png b/Resources/Textures/Effects/rcd.rsi/construct1.png
new file mode 100644
index 0000000000..0b597fe108
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/construct1.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/construct2.png b/Resources/Textures/Effects/rcd.rsi/construct2.png
new file mode 100644
index 0000000000..0b597fe108
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/construct2.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/construct3.png b/Resources/Textures/Effects/rcd.rsi/construct3.png
new file mode 100644
index 0000000000..0b597fe108
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/construct3.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/construct4.png b/Resources/Textures/Effects/rcd.rsi/construct4.png
new file mode 100644
index 0000000000..1f47a0f1eb
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/construct4.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/deconstruct2.png b/Resources/Textures/Effects/rcd.rsi/deconstruct2.png
new file mode 100644
index 0000000000..d2144af3c7
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/deconstruct2.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/deconstruct4.png b/Resources/Textures/Effects/rcd.rsi/deconstruct4.png
new file mode 100644
index 0000000000..7077115066
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/deconstruct4.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/deconstruct6.png b/Resources/Textures/Effects/rcd.rsi/deconstruct6.png
new file mode 100644
index 0000000000..7077115066
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/deconstruct6.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/deconstruct8.png b/Resources/Textures/Effects/rcd.rsi/deconstruct8.png
new file mode 100644
index 0000000000..79d724e6ba
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/deconstruct8.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/deconstructPreview.png b/Resources/Textures/Effects/rcd.rsi/deconstructPreview.png
new file mode 100644
index 0000000000..2d114002fb
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/deconstructPreview.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/meta.json b/Resources/Textures/Effects/rcd.rsi/meta.json
index 5004a9c4fc..c9e8320c60 100644
--- a/Resources/Textures/Effects/rcd.rsi/meta.json
+++ b/Resources/Textures/Effects/rcd.rsi/meta.json
@@ -8,7 +8,65 @@
     "copyright": "Taken from tgStation at commit https://github.com/tgstation/tgstation/commit/d75cbd0a2900fdec4c12cd5ba986b52ccff03713/icons/effects/effects_rcd.dmi",
     "states": [
         {
-            "name": "construct",
+            "name": "construct0",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },		
+		{
+            "name": "construct1",
+            "delays": [
+                [
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },		
+		{
+            "name": "construct2",
             "delays": [
                 [
                     0.1,
@@ -45,6 +103,357 @@
                     0.1
                 ]
             ]
+        },
+		{
+            "name": "construct3",
+            "delays": [
+                [
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+		{
+            "name": "construct4",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+					0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },		
+		{
+            "name": "deconstruct2",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+		{
+            "name": "deconstruct4",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+					0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+		{
+            "name": "deconstruct6",
+            "delays": [
+                [
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+					0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },		
+		{
+            "name": "deconstruct8",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+					0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+		{
+            "name": "deconstructPreview",
+            "delays": [
+                [
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+					0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05                    
+                ]
+            ]
         }
     ]
 }
diff --git a/Resources/Textures/Interface/Radial/RCD/airlock.png b/Resources/Textures/Interface/Radial/RCD/airlock.png
new file mode 100644
index 0000000000..7b1e0e9aa0
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/airlock.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/airlocks.png b/Resources/Textures/Interface/Radial/RCD/airlocks.png
new file mode 100644
index 0000000000..1195d79b58
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/airlocks.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/bulb_light.png b/Resources/Textures/Interface/Radial/RCD/bulb_light.png
new file mode 100644
index 0000000000..d607bebf77
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/bulb_light.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/cable_terminal.png b/Resources/Textures/Interface/Radial/RCD/cable_terminal.png
new file mode 100644
index 0000000000..7634566ca3
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/cable_terminal.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/catwalk.png b/Resources/Textures/Interface/Radial/RCD/catwalk.png
new file mode 100644
index 0000000000..c550f120f1
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/catwalk.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/computer_frame.png b/Resources/Textures/Interface/Radial/RCD/computer_frame.png
new file mode 100644
index 0000000000..39661a4092
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/computer_frame.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/computers_and_frames.png b/Resources/Textures/Interface/Radial/RCD/computers_and_frames.png
new file mode 100644
index 0000000000..0f17ab5ef1
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/computers_and_frames.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/deconstruct.png b/Resources/Textures/Interface/Radial/RCD/deconstruct.png
new file mode 100644
index 0000000000..ca9548e0cf
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/deconstruct.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/directional.png b/Resources/Textures/Interface/Radial/RCD/directional.png
new file mode 100644
index 0000000000..473ad252aa
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/directional.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/directional_reinforced.png b/Resources/Textures/Interface/Radial/RCD/directional_reinforced.png
new file mode 100644
index 0000000000..3cb416d2c3
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/directional_reinforced.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/firelock.png b/Resources/Textures/Interface/Radial/RCD/firelock.png
new file mode 100644
index 0000000000..5b581a2aa3
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/firelock.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/glass_airlock.png b/Resources/Textures/Interface/Radial/RCD/glass_airlock.png
new file mode 100644
index 0000000000..bc0dbb3591
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/glass_airlock.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/grille.png b/Resources/Textures/Interface/Radial/RCD/grille.png
new file mode 100644
index 0000000000..5a5234687e
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/grille.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/hv_coil.png b/Resources/Textures/Interface/Radial/RCD/hv_coil.png
new file mode 100644
index 0000000000..c2b5cab369
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/hv_coil.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/lighting.png b/Resources/Textures/Interface/Radial/RCD/lighting.png
new file mode 100644
index 0000000000..df167f35a8
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/lighting.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/lv_coil.png b/Resources/Textures/Interface/Radial/RCD/lv_coil.png
new file mode 100644
index 0000000000..f83ed75325
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/lv_coil.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/machine_frame.png b/Resources/Textures/Interface/Radial/RCD/machine_frame.png
new file mode 100644
index 0000000000..5dd90251e7
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/machine_frame.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/metal_tile.png b/Resources/Textures/Interface/Radial/RCD/metal_tile.png
new file mode 100644
index 0000000000..14f1ce2bd9
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/metal_tile.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/multicoil.png b/Resources/Textures/Interface/Radial/RCD/multicoil.png
new file mode 100644
index 0000000000..9e32919a7b
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/multicoil.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/mv_coil.png b/Resources/Textures/Interface/Radial/RCD/mv_coil.png
new file mode 100644
index 0000000000..c58e9a2805
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/mv_coil.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/plating.png b/Resources/Textures/Interface/Radial/RCD/plating.png
new file mode 100644
index 0000000000..d3a63acc61
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/plating.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/reinforced_wall.png b/Resources/Textures/Interface/Radial/RCD/reinforced_wall.png
new file mode 100644
index 0000000000..07486830e2
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/reinforced_wall.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/solid_wall.png b/Resources/Textures/Interface/Radial/RCD/solid_wall.png
new file mode 100644
index 0000000000..b3efd02ac9
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/solid_wall.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/tube_light.png b/Resources/Textures/Interface/Radial/RCD/tube_light.png
new file mode 100644
index 0000000000..9c94ccbd7b
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/tube_light.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/walls_and_flooring.png b/Resources/Textures/Interface/Radial/RCD/walls_and_flooring.png
new file mode 100644
index 0000000000..88d3c36c7a
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/walls_and_flooring.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/window.png b/Resources/Textures/Interface/Radial/RCD/window.png
new file mode 100644
index 0000000000..ed486c23b8
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/window.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/window_reinforced.png b/Resources/Textures/Interface/Radial/RCD/window_reinforced.png
new file mode 100644
index 0000000000..80efff04ec
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/window_reinforced.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/windows_and_grilles.png b/Resources/Textures/Interface/Radial/RCD/windows_and_grilles.png
new file mode 100644
index 0000000000..e51ab09423
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/windows_and_grilles.png differ
diff --git a/Resources/Textures/Interface/Radial/back_hover.png b/Resources/Textures/Interface/Radial/back_hover.png
new file mode 100644
index 0000000000..7378a60fef
Binary files /dev/null and b/Resources/Textures/Interface/Radial/back_hover.png differ
diff --git a/Resources/Textures/Interface/Radial/back_normal.png b/Resources/Textures/Interface/Radial/back_normal.png
new file mode 100644
index 0000000000..2c4a20048c
Binary files /dev/null and b/Resources/Textures/Interface/Radial/back_normal.png differ
diff --git a/Resources/Textures/Interface/Radial/button_hover.png b/Resources/Textures/Interface/Radial/button_hover.png
new file mode 100644
index 0000000000..49885a26c3
Binary files /dev/null and b/Resources/Textures/Interface/Radial/button_hover.png differ
diff --git a/Resources/Textures/Interface/Radial/button_normal.png b/Resources/Textures/Interface/Radial/button_normal.png
new file mode 100644
index 0000000000..66dc277709
Binary files /dev/null and b/Resources/Textures/Interface/Radial/button_normal.png differ
diff --git a/Resources/Textures/Interface/Radial/close_hover.png b/Resources/Textures/Interface/Radial/close_hover.png
new file mode 100644
index 0000000000..873d20961d
Binary files /dev/null and b/Resources/Textures/Interface/Radial/close_hover.png differ
diff --git a/Resources/Textures/Interface/Radial/close_normal.png b/Resources/Textures/Interface/Radial/close_normal.png
new file mode 100644
index 0000000000..99417f2829
Binary files /dev/null and b/Resources/Textures/Interface/Radial/close_normal.png differ
diff --git a/Resources/Textures/Interface/VerbIcons/paint.svg b/Resources/Textures/Interface/VerbIcons/paint.svg
deleted file mode 100644
index 78a56e3570..0000000000
--- a/Resources/Textures/Interface/VerbIcons/paint.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   version="1.1"
-   id="svg834"
-   sodipodi:docname="plus.svg"
-   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs838" />
-  <sodipodi:namedview
-     id="namedview836"
-     pagecolor="#505050"
-     bordercolor="#eeeeee"
-     borderopacity="1"
-     inkscape:pageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="33.666667"
-     inkscape:cx="11.985149"
-     inkscape:cy="7.2475248"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg834" />
-  <path
-     d="M 22.69307,10.252475 H 13.806931 V 1.3663366 H 10.252475 V 10.252475 H 1.3663366 v 3.554455 h 8.8861384 v 8.886139 h 3.554456 V 13.80693 h 8.886139 z"
-     id="path832"
-     inkscape:label="path832"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:0.888614" />
-</svg>
diff --git a/Resources/Textures/LobbyScreens/attributions.yml b/Resources/Textures/LobbyScreens/attributions.yml
index f27d0b3b2c..3b81fc68fd 100644
--- a/Resources/Textures/LobbyScreens/attributions.yml
+++ b/Resources/Textures/LobbyScreens/attributions.yml
@@ -37,3 +37,8 @@
   license: "CC-BY-NC-SA-3.0"
   copyright: "InCrah on twitter / @in_crah"
   source: "https://twitter.com/in_crah"
+
+- files: ["terminalstation.webp"]
+  license: "CC-BY-SA-3.0"
+  copyright: "aserovich on discord"
+  source: "https://github.com/space-wizards/space-station-14"
diff --git a/Resources/Textures/LobbyScreens/terminalstation.webp b/Resources/Textures/LobbyScreens/terminalstation.webp
new file mode 100644
index 0000000000..ae7cab269d
Binary files /dev/null and b/Resources/Textures/LobbyScreens/terminalstation.webp differ
diff --git a/Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png.yml b/Resources/Textures/LobbyScreens/terminalstation.webp.yml
similarity index 100%
rename from Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png.yml
rename to Resources/Textures/LobbyScreens/terminalstation.webp.yml
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardblindfold.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_blindfold.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardblindfold.png
rename to Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_blindfold.png
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardfoot_l.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_foot_l.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardfoot_l.png
rename to Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_foot_l.png
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardfoot_r.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_foot_r.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardfoot_r.png
rename to Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_foot_r.png
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardlefteye.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_lefteye.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardlefteye.png
rename to Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_lefteye.png
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardrighteye.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_righteye.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardrighteye.png
rename to Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_righteye.png
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_abdomen.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_abdomen.png
new file mode 100644
index 0000000000..e8b42aca5c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_abdomen.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_blindfold.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_blindfold.png
new file mode 100644
index 0000000000..499a3cb29d
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_blindfold.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lefteye_1.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lefteye_1.png
new file mode 100644
index 0000000000..73ba4b1c50
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lefteye_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lefteye_2.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lefteye_2.png
new file mode 100644
index 0000000000..a1c9a8f092
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lefteye_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lowerleg_l.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lowerleg_l.png
new file mode 100644
index 0000000000..df750d9819
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lowerleg_l.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lowerleg_r.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lowerleg_r.png
new file mode 100644
index 0000000000..f6504f8ca7
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lowerleg_r.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_righteye_1.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_righteye_1.png
new file mode 100644
index 0000000000..4c5ab639bb
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_righteye_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_righteye_2.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_righteye_2.png
new file mode 100644
index 0000000000..563e692b8b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_righteye_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_shoulder.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_shoulder.png
new file mode 100644
index 0000000000..ba2c0f6032
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_shoulder.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperarm_l.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperarm_l.png
new file mode 100644
index 0000000000..1587a75b99
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperarm_l.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperarm_r.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperarm_r.png
new file mode 100644
index 0000000000..19750a09d0
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperarm_r.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperleg_l.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperleg_l.png
new file mode 100644
index 0000000000..7252c23515
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperleg_l.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperleg_r.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperleg_r.png
new file mode 100644
index 0000000000..2f09a4de3e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperleg_r.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json b/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json
index 232e7b0b22..8d82ccab51 100644
--- a/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json
@@ -72,23 +72,75 @@
       "directions": 4
     },
 	{
-      "name": "gauze_lizardblindfold",
+      "name": "gauze_lizard_blindfold",
       "directions": 4
     },
 	{
-      "name": "gauze_lizardrighteye",
+      "name": "gauze_lizard_righteye",
       "directions": 4
     },
     {
-      "name": "gauze_lizardlefteye",
+      "name": "gauze_lizard_lefteye",
       "directions": 4
     },
     {
-      "name": "gauze_lizardfoot_r",
+      "name": "gauze_lizard_foot_r",
       "directions": 4
     },
     {
-      "name": "gauze_lizardfoot_l",
+      "name": "gauze_lizard_foot_l",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_abdomen",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_shoulder",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_blindfold",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_righteye_1",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_righteye_2",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_lefteye_1",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_lefteye_2",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_upperarm_r",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_upperarm_l",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_upperleg_r",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_upperleg_l",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_lowerleg_r",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_lowerleg_l",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Mobs/Effects/onfire.rsi/Mouse_burning.png b/Resources/Textures/Mobs/Effects/onfire.rsi/Mouse_burning.png
new file mode 100644
index 0000000000..d5461a89c0
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/onfire.rsi/Mouse_burning.png differ
diff --git a/Resources/Textures/Mobs/Effects/onfire.rsi/meta.json b/Resources/Textures/Mobs/Effects/onfire.rsi/meta.json
index 5bd235bf90..005128d9be 100644
--- a/Resources/Textures/Mobs/Effects/onfire.rsi/meta.json
+++ b/Resources/Textures/Mobs/Effects/onfire.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0", "states": [{"name": "Generic_mob_burning", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "Monkey_burning", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1]]}, {"name": "Standing", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1]]}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0",
+    "states": [
+        {
+            "name": "Generic_mob_burning",
+            "directions": 4,
+            "delays": [
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ]
+            ]
+        },
+        {
+            "name": "Monkey_burning",
+            "directions": 4,
+            "delays": [
+                [ 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1 ]
+            ]
+        },
+        {
+            "name": "Standing",
+            "directions": 4,
+            "delays": [
+                [ 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1 ]
+            ]
+        },
+        {
+            "name": "Mouse_burning",
+            "directions": 4,
+            "delays": [
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png
new file mode 100644
index 0000000000..81261d0f54
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json
new file mode 100644
index 0000000000..f76e611841
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png
new file mode 100644
index 0000000000..d192a88461
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json
new file mode 100644
index 0000000000..f76e611841
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png
new file mode 100644
index 0000000000..4adab5cb6e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json
new file mode 100644
index 0000000000..f76e611841
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon.png
new file mode 100644
index 0000000000..a270180dcd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon_open.png
new file mode 100644
index 0000000000..a81a799855
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json
new file mode 100644
index 0000000000..d7f3d6da42
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC0-1.0",
+    "copyright": "Original work by noctis on Discord",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png
new file mode 100644
index 0000000000..bd1eff6943
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json
new file mode 100644
index 0000000000..f76e611841
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png
similarity index 53%
rename from Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/icon.png
rename to Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png
index e1e80b9293..caa81b36f0 100644
Binary files a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json
new file mode 100644
index 0000000000..f76e611841
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png
new file mode 100644
index 0000000000..7a6b0624da
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json
new file mode 100644
index 0000000000..f76e611841
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png
new file mode 100644
index 0000000000..9426978d72
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json
new file mode 100644
index 0000000000..d16d731d7f
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon",
+        "delays": [
+        [
+            1,
+            1,
+            1,
+            1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png
new file mode 100644
index 0000000000..53b96d67d5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png
new file mode 100644
index 0000000000..57273615e3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json
new file mode 100644
index 0000000000..6009794429
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, recolored by PursuitinAshes (Github)",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png
new file mode 100644
index 0000000000..88fdd5e79b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json
new file mode 100644
index 0000000000..f76e611841
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon.png
new file mode 100644
index 0000000000..ace08a9ffb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon_open.png
new file mode 100644
index 0000000000..39281831dc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png
new file mode 100644
index 0000000000..3c03c07742
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png
new file mode 100644
index 0000000000..2f68635d90
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json
new file mode 100644
index 0000000000..8bc80009c5
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json
@@ -0,0 +1,53 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi, Sol Dry from /tg/.",
+  "states": [
+    {
+      "name": "icon"
+    },
+	{
+	  "name": "icon_open"
+	},
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png
new file mode 100644
index 0000000000..c4bf829e5d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json
new file mode 100644
index 0000000000..f76e611841
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-left.png
index 294f326780..dd6bc0b0f2 100644
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-right.png
index 3a4e9e8f9d..7f00423dc3 100644
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-left.png
index e8bfce8645..2cb9f2bbfc 100644
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-right.png
index 4635cb206c..a0645041ab 100644
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json
index f34820cec4..0f883ee280 100644
--- a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json
@@ -58,6 +58,9 @@
     {
       "name": "spray"
     },
+    {
+      "name": "spray_cap"
+    },
     {
       "name": "spray_cap_colors"
     },
@@ -67,22 +70,6 @@
     {
       "name": "equipped-BELT",
       "directions": 4
-    },
-    {
-      "name": "clown-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "clown-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "spray-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "spray-inhand-left",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap.png b/Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap.png
new file mode 100644
index 0000000000..01d2d49bc0
Binary files /dev/null and b/Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap.png differ
diff --git a/Resources/Textures/Objects/Magic/spellbooks.rsi/bookfireball.png b/Resources/Textures/Objects/Magic/spellbooks.rsi/bookfireball.png
deleted file mode 100644
index ed18010a72..0000000000
Binary files a/Resources/Textures/Objects/Magic/spellbooks.rsi/bookfireball.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Magic/spellbooks.rsi/bookforcewall.png b/Resources/Textures/Objects/Magic/spellbooks.rsi/bookforcewall.png
deleted file mode 100644
index 3f35598953..0000000000
Binary files a/Resources/Textures/Objects/Magic/spellbooks.rsi/bookforcewall.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Magic/spellbooks.rsi/bookknock.png b/Resources/Textures/Objects/Magic/spellbooks.rsi/bookknock.png
deleted file mode 100644
index 9f5d68af7d..0000000000
Binary files a/Resources/Textures/Objects/Magic/spellbooks.rsi/bookknock.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Magic/spellbooks.rsi/meta.json b/Resources/Textures/Objects/Magic/spellbooks.rsi/meta.json
deleted file mode 100644
index f9f1703f24..0000000000
--- a/Resources/Textures/Objects/Magic/spellbooks.rsi/meta.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/f3e328af032f0ba0234b866c24ccb0003e1a4993",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "bookfireball",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "bookforcewall",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "bookknock",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "spellbook"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Magic/spellbooks.rsi/spellbook.png b/Resources/Textures/Objects/Magic/spellbooks.rsi/spellbook.png
deleted file mode 100644
index d24f198f94..0000000000
Binary files a/Resources/Textures/Objects/Magic/spellbooks.rsi/spellbook.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_aurora.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_aurora.png
deleted file mode 100644
index 0e34258138..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_aurora.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_cafe.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_cafe.png
deleted file mode 100644
index 7a3b6667cf..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_cafe.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_earth.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_earth.png
deleted file mode 100644
index 8e29c3880a..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_earth.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_antarctica.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_antarctica.png
deleted file mode 100644
index 3843e20069..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_antarctica.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_arctic.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_arctic.png
deleted file mode 100644
index ace42ee7dc..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_arctic.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_city.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_city.png
deleted file mode 100644
index abd76a5470..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_city.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_desert.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_desert.png
deleted file mode 100644
index 9a2d2ad658..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_desert.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_mountain.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_mountain.png
deleted file mode 100644
index ee26df9e9a..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_mountain.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_ocean.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_ocean.png
deleted file mode 100644
index d70795ebd4..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_ocean.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_ranch.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_ranch.png
deleted file mode 100644
index 7f6b3e86dd..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_ranch.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_wolfpup.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_wolfpup.png
deleted file mode 100644
index df0b2350ae..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_wolfpup.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_journ_mount.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_journ_mount.png
deleted file mode 100644
index f266a2f0d9..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_journ_mount.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_map.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_map.png
deleted file mode 100644
index fb880d9703..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_map.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_medical.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_medical.png
deleted file mode 100644
index e94b6789fb..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_medical.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_morgue.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_morgue.png
deleted file mode 100644
index 6b6c86cf08..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_morgue.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_names.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_names.png
deleted file mode 100644
index f2396ac527..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_names.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_narsie_legend.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_narsie_legend.png
deleted file mode 100644
index fe7659f396..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_narsie_legend.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_possum.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_possum.png
deleted file mode 100644
index b169c180be..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_possum.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_rufus.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_rufus.png
deleted file mode 100644
index 22e936fb3f..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_rufus.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scmmd.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scmmd.png
deleted file mode 100644
index 2430e14290..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scmmd.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scpz.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scpz.png
deleted file mode 100644
index 0e09bb8f09..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scpz.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scsss.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scsss.png
deleted file mode 100644
index 1262f51118..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scsss.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_struck.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_struck.png
deleted file mode 100644
index 144bef30ee..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_struck.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_sun.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_sun.png
deleted file mode 100644
index 5e7c0fa9bc..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_sun.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_temple.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_temple.png
deleted file mode 100644
index 6f68c1c2e2..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_temple.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_truth.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_truth.png
deleted file mode 100644
index 6f076f2ef0..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_truth.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_watched.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_watched.png
deleted file mode 100644
index 693a4141ab..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_watched.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_world.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_world.png
deleted file mode 100644
index 8793ef8dfa..0000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_world.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/meta.json b/Resources/Textures/Objects/Misc/authorbooks.rsi/meta.json
deleted file mode 100644
index 0d8639d44f..0000000000
--- a/Resources/Textures/Objects/Misc/authorbooks.rsi/meta.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/37fb6bc6dd20005775dde8d886f48f7722606b77 and modified by Kit0vras#5869 (Discord) / Kit0vras (Github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "book_aurora"
-    },
-    {
-      "name": "book_cafe"
-    },
-    {
-      "name": "book_earth"
-    },
-    {
-      "name": "book_temple"
-    },
-    {
-      "name": "book_ian_antarctica"
-    },
-    {
-      "name": "book_ian_arctic"
-    },
-    {
-      "name": "book_ian_city"
-    },
-    {
-      "name": "book_ian_desert"
-    },
-    {
-      "name": "book_ian_mountain"
-    },
-    {
-      "name": "book_ian_ocean"
-    },
-    {
-      "name": "book_ian_ranch"
-    },
-    {
-      "name": "book_ian_wolfpup"
-    },
-    {
-      "name": "book_journ_mount"
-    },
-    {
-      "name": "book_scmmd"
-    },
-    {
-      "name": "book_medical"
-    },
-    {
-      "name": "book_morgue"
-    },
-    {
-      "name": "book_names"
-    },
-    {
-      "name": "book_narsie_legend"
-    },
-    {
-      "name": "book_possum"
-    },
-    {
-      "name": "book_rufus"
-    },
-    {
-      "name": "book_scsss"
-    },
-    {
-      "name": "book_scpz"
-    },
-    {
-      "name": "book_struck"
-    },
-    {
-      "name": "book_sun"
-    },
-    {
-      "name": "book_map"
-    },
-    {
-      "name": "book_truth"
-    },
-    {
-      "name": "book_watched"
-    },
-    {
-      "name": "book_world"
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book0.png b/Resources/Textures/Objects/Misc/books.rsi/book0.png
deleted file mode 100644
index 0cc314ef9e..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book1.png b/Resources/Textures/Objects/Misc/books.rsi/book1.png
deleted file mode 100644
index ee3d9f91f0..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book2.png b/Resources/Textures/Objects/Misc/books.rsi/book2.png
deleted file mode 100644
index 614791ac70..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book3.png b/Resources/Textures/Objects/Misc/books.rsi/book3.png
deleted file mode 100644
index ce11a89b0e..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book4.png b/Resources/Textures/Objects/Misc/books.rsi/book4.png
deleted file mode 100644
index c5f1aba4f8..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book4.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book5.png b/Resources/Textures/Objects/Misc/books.rsi/book5.png
deleted file mode 100644
index 18172241cc..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book5.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book6.png b/Resources/Textures/Objects/Misc/books.rsi/book6.png
deleted file mode 100644
index 1c95940aee..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book6.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book7.png b/Resources/Textures/Objects/Misc/books.rsi/book7.png
deleted file mode 100644
index eee791db78..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book7.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book8.png b/Resources/Textures/Objects/Misc/books.rsi/book8.png
deleted file mode 100644
index 6ba69a8c48..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book8.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_bar.png b/Resources/Textures/Objects/Misc/books.rsi/book_bar.png
deleted file mode 100644
index f522b7fd9b..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_bar.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_boneworking.png b/Resources/Textures/Objects/Misc/books.rsi/book_boneworking.png
deleted file mode 100644
index 634a1c6f0a..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_boneworking.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_borg.png b/Resources/Textures/Objects/Misc/books.rsi/book_borg.png
deleted file mode 100644
index 8ba4772575..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_borg.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_chemistry.png b/Resources/Textures/Objects/Misc/books.rsi/book_chemistry.png
deleted file mode 100644
index 8ba953d4de..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_chemistry.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_cloning.png b/Resources/Textures/Objects/Misc/books.rsi/book_cloning.png
deleted file mode 100644
index 52704aa249..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_cloning.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_cooking.png b/Resources/Textures/Objects/Misc/books.rsi/book_cooking.png
deleted file mode 100644
index 07433741fe..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_cooking.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_demonomicon.png b/Resources/Textures/Objects/Misc/books.rsi/book_demonomicon.png
deleted file mode 100644
index 607b144e8e..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_demonomicon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_detective.png b/Resources/Textures/Objects/Misc/books.rsi/book_detective.png
deleted file mode 100644
index bc280e2d6a..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_detective.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_engineering.png b/Resources/Textures/Objects/Misc/books.rsi/book_engineering.png
deleted file mode 100644
index 9808e2d97f..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_engineering.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_engineering2.png b/Resources/Textures/Objects/Misc/books.rsi/book_engineering2.png
deleted file mode 100644
index 853eb6cca4..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_engineering2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_fish.png b/Resources/Textures/Objects/Misc/books.rsi/book_fish.png
deleted file mode 100644
index ab1fc080bf..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_fish.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_hacking.png b/Resources/Textures/Objects/Misc/books.rsi/book_hacking.png
deleted file mode 100644
index 1642063f7e..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_hacking.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_hydroponics_pod_people.png b/Resources/Textures/Objects/Misc/books.rsi/book_hydroponics_pod_people.png
deleted file mode 100644
index df41d96214..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_hydroponics_pod_people.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_icon.png b/Resources/Textures/Objects/Misc/books.rsi/book_icon.png
new file mode 100644
index 0000000000..e3e77759dc
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/book_icon.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_infections.png b/Resources/Textures/Objects/Misc/books.rsi/book_infections.png
deleted file mode 100644
index 3f79f46237..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_infections.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_medical.png b/Resources/Textures/Objects/Misc/books.rsi/book_medical.png
deleted file mode 100644
index 7152cfe51c..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_medical.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_nuclear.png b/Resources/Textures/Objects/Misc/books.rsi/book_nuclear.png
deleted file mode 100644
index dbf95833fd..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_nuclear.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_origami.png b/Resources/Textures/Objects/Misc/books.rsi/book_origami.png
deleted file mode 100644
index 63344d2bf4..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_origami.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_particle_accelerator.png b/Resources/Textures/Objects/Misc/books.rsi/book_particle_accelerator.png
deleted file mode 100644
index a0fc564a68..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_particle_accelerator.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_science.png b/Resources/Textures/Objects/Misc/books.rsi/book_science.png
deleted file mode 100644
index 47047c958a..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_science.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_security.png b/Resources/Textures/Objects/Misc/books.rsi/book_security.png
deleted file mode 100644
index fb1a4028e8..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_security.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_space_law.png b/Resources/Textures/Objects/Misc/books.rsi/book_space_law.png
deleted file mode 100644
index 524f10b76c..0000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_space_law.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/cover_base.png b/Resources/Textures/Objects/Misc/books.rsi/cover_base.png
new file mode 100644
index 0000000000..4f6f819a3a
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/cover_base.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/cover_old.png b/Resources/Textures/Objects/Misc/books.rsi/cover_old.png
new file mode 100644
index 0000000000..7ad4bdf685
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/cover_old.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/cover_strong.png b/Resources/Textures/Objects/Misc/books.rsi/cover_strong.png
new file mode 100644
index 0000000000..61baf7b577
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/cover_strong.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_bottom.png b/Resources/Textures/Objects/Misc/books.rsi/decor_bottom.png
new file mode 100644
index 0000000000..65ce4aa626
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_bottom.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_diagonal.png b/Resources/Textures/Objects/Misc/books.rsi/decor_diagonal.png
new file mode 100644
index 0000000000..50f6f59183
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_diagonal.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_middle.png b/Resources/Textures/Objects/Misc/books.rsi/decor_middle.png
new file mode 100644
index 0000000000..ca4ca82114
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_middle.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_spine.png b/Resources/Textures/Objects/Misc/books.rsi/decor_spine.png
new file mode 100644
index 0000000000..5ebd7c769d
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_spine.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_vertical_middle.png b/Resources/Textures/Objects/Misc/books.rsi/decor_vertical_middle.png
new file mode 100644
index 0000000000..75f141ce40
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_vertical_middle.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_wingette.png b/Resources/Textures/Objects/Misc/books.rsi/decor_wingette.png
new file mode 100644
index 0000000000..048a29388c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_wingette.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_wingette_circle.png b/Resources/Textures/Objects/Misc/books.rsi/decor_wingette_circle.png
new file mode 100644
index 0000000000..a9d9afc120
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_wingette_circle.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_wingette_flat.png b/Resources/Textures/Objects/Misc/books.rsi/decor_wingette_flat.png
new file mode 100644
index 0000000000..0ca0a4de6f
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_wingette_flat.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/detail_bookmark.png b/Resources/Textures/Objects/Misc/books.rsi/detail_bookmark.png
new file mode 100644
index 0000000000..4541f8bc1d
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/detail_bookmark.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/detail_rivets.png b/Resources/Textures/Objects/Misc/books.rsi/detail_rivets.png
new file mode 100644
index 0000000000..53a4c8bef4
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/detail_rivets.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_apple.png b/Resources/Textures/Objects/Misc/books.rsi/icon_apple.png
new file mode 100644
index 0000000000..2316fb4e55
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_apple.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_atmos.png b/Resources/Textures/Objects/Misc/books.rsi/icon_atmos.png
new file mode 100644
index 0000000000..518623069e
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_atmos.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_aurora.png b/Resources/Textures/Objects/Misc/books.rsi/icon_aurora.png
new file mode 100644
index 0000000000..a0179d31be
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_aurora.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_banana.png b/Resources/Textures/Objects/Misc/books.rsi/icon_banana.png
new file mode 100644
index 0000000000..2c2a657412
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_banana.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_bar.png b/Resources/Textures/Objects/Misc/books.rsi/icon_bar.png
new file mode 100644
index 0000000000..3bb7e7631f
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_bar.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_biohazard.png b/Resources/Textures/Objects/Misc/books.rsi/icon_biohazard.png
new file mode 100644
index 0000000000..a3ad873f61
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_biohazard.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_borg.png b/Resources/Textures/Objects/Misc/books.rsi/icon_borg.png
new file mode 100644
index 0000000000..4781ff3fe8
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_borg.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_briefcase.png b/Resources/Textures/Objects/Misc/books.rsi/icon_briefcase.png
new file mode 100644
index 0000000000..cbbe1a74d9
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_briefcase.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_bucket.png b/Resources/Textures/Objects/Misc/books.rsi/icon_bucket.png
new file mode 100644
index 0000000000..df76b0550d
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_bucket.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_cabbage.png b/Resources/Textures/Objects/Misc/books.rsi/icon_cabbage.png
new file mode 100644
index 0000000000..e9c806f92e
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_cabbage.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_chemical.png b/Resources/Textures/Objects/Misc/books.rsi/icon_chemical.png
new file mode 100644
index 0000000000..3714784dac
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_chemical.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_corner.png b/Resources/Textures/Objects/Misc/books.rsi/icon_corner.png
new file mode 100644
index 0000000000..70b68d327c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_corner.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_diamond.png b/Resources/Textures/Objects/Misc/books.rsi/icon_diamond.png
new file mode 100644
index 0000000000..268a659194
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_diamond.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_dna.png b/Resources/Textures/Objects/Misc/books.rsi/icon_dna.png
new file mode 100644
index 0000000000..d8c1bb07b9
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_dna.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_eye.png b/Resources/Textures/Objects/Misc/books.rsi/icon_eye.png
new file mode 100644
index 0000000000..11e47cd11d
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_eye.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_fish.png b/Resources/Textures/Objects/Misc/books.rsi/icon_fish.png
new file mode 100644
index 0000000000..7baaa13185
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_fish.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_glow.png b/Resources/Textures/Objects/Misc/books.rsi/icon_glow.png
new file mode 100644
index 0000000000..030f818877
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_glow.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_hacking.png b/Resources/Textures/Objects/Misc/books.rsi/icon_hacking.png
new file mode 100644
index 0000000000..bd3602c418
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_hacking.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_ian.png b/Resources/Textures/Objects/Misc/books.rsi/icon_ian.png
new file mode 100644
index 0000000000..04109c5036
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_ian.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_law.png b/Resources/Textures/Objects/Misc/books.rsi/icon_law.png
new file mode 100644
index 0000000000..3843f9c4ad
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_law.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_letter_N.png b/Resources/Textures/Objects/Misc/books.rsi/icon_letter_N.png
new file mode 100644
index 0000000000..7b1888e8c6
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_letter_N.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_letter_P.png b/Resources/Textures/Objects/Misc/books.rsi/icon_letter_P.png
new file mode 100644
index 0000000000..12da61a070
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_letter_P.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_lightning.png b/Resources/Textures/Objects/Misc/books.rsi/icon_lightning.png
new file mode 100644
index 0000000000..92a115d2b6
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_lightning.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_magic.png b/Resources/Textures/Objects/Misc/books.rsi/icon_magic.png
new file mode 100644
index 0000000000..80e61b35ad
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_magic.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_magic_fireball.png b/Resources/Textures/Objects/Misc/books.rsi/icon_magic_fireball.png
new file mode 100644
index 0000000000..79a1370ddf
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_magic_fireball.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_magic_forcewall.png b/Resources/Textures/Objects/Misc/books.rsi/icon_magic_forcewall.png
new file mode 100644
index 0000000000..45e1ceb3c5
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_magic_forcewall.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_magic_knock.png b/Resources/Textures/Objects/Misc/books.rsi/icon_magic_knock.png
new file mode 100644
index 0000000000..506dfdeaee
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_magic_knock.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_magnifier.png b/Resources/Textures/Objects/Misc/books.rsi/icon_magnifier.png
new file mode 100644
index 0000000000..953d2f93ef
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_magnifier.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_medical.png b/Resources/Textures/Objects/Misc/books.rsi/icon_medical.png
new file mode 100644
index 0000000000..36799b2f95
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_medical.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_medical_cross.png b/Resources/Textures/Objects/Misc/books.rsi/icon_medical_cross.png
new file mode 100644
index 0000000000..970b6d3b4b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_medical_cross.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_mount.png b/Resources/Textures/Objects/Misc/books.rsi/icon_mount.png
new file mode 100644
index 0000000000..399560fdf6
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_mount.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_nuclear.png b/Resources/Textures/Objects/Misc/books.rsi/icon_nuclear.png
new file mode 100644
index 0000000000..883fe5411e
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_nuclear.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_origami.png b/Resources/Textures/Objects/Misc/books.rsi/icon_origami.png
new file mode 100644
index 0000000000..9eb0e542e8
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_origami.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_pentagramm.png b/Resources/Textures/Objects/Misc/books.rsi/icon_pentagramm.png
new file mode 100644
index 0000000000..3804e3f489
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_pentagramm.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_planet.png b/Resources/Textures/Objects/Misc/books.rsi/icon_planet.png
new file mode 100644
index 0000000000..784dcd0882
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_planet.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_possum.png b/Resources/Textures/Objects/Misc/books.rsi/icon_possum.png
new file mode 100644
index 0000000000..5d25c82a91
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_possum.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_question.png b/Resources/Textures/Objects/Misc/books.rsi/icon_question.png
new file mode 100644
index 0000000000..fda304af04
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_question.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_scmmd.png b/Resources/Textures/Objects/Misc/books.rsi/icon_scmmd.png
new file mode 100644
index 0000000000..d64e9bdd85
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_scmmd.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_skull.png b/Resources/Textures/Objects/Misc/books.rsi/icon_skull.png
new file mode 100644
index 0000000000..96793050fb
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_skull.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_stars.png b/Resources/Textures/Objects/Misc/books.rsi/icon_stars.png
new file mode 100644
index 0000000000..0970ada3f3
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_stars.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_stars2.png b/Resources/Textures/Objects/Misc/books.rsi/icon_stars2.png
new file mode 100644
index 0000000000..a88d168a44
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_stars2.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_stunbaton.png b/Resources/Textures/Objects/Misc/books.rsi/icon_stunbaton.png
new file mode 100644
index 0000000000..d247b9163c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_stunbaton.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_temple.png b/Resources/Textures/Objects/Misc/books.rsi/icon_temple.png
new file mode 100644
index 0000000000..54bb81a404
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_temple.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_text.png b/Resources/Textures/Objects/Misc/books.rsi/icon_text.png
new file mode 100644
index 0000000000..8f7b3158d2
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_text.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_text2.png b/Resources/Textures/Objects/Misc/books.rsi/icon_text2.png
new file mode 100644
index 0000000000..c87370e75d
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_text2.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_text3.png b/Resources/Textures/Objects/Misc/books.rsi/icon_text3.png
new file mode 100644
index 0000000000..ef03b24174
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_text3.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_time.png b/Resources/Textures/Objects/Misc/books.rsi/icon_time.png
new file mode 100644
index 0000000000..13f0267eb5
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_time.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_tree.png b/Resources/Textures/Objects/Misc/books.rsi/icon_tree.png
new file mode 100644
index 0000000000..cfbebb9795
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_tree.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_wrench.png b/Resources/Textures/Objects/Misc/books.rsi/icon_wrench.png
new file mode 100644
index 0000000000..99bed38d3c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_wrench.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/meta.json b/Resources/Textures/Objects/Misc/books.rsi/meta.json
index e5c4e1ec0d..be4ef5f04c 100644
--- a/Resources/Textures/Objects/Misc/books.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/books.rsi/meta.json
@@ -1,71 +1,74 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/commit/37fb6bc6dd20005775dde8d886f48f7722606b77",
+  "copyright": "Base sprite taken at: https://github.com/tgstation/tgstation/commit/37fb6bc6dd20005775dde8d886f48f7722606b77 , splitted on layers by TheShuEd (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "book0"
+      "name": "book_icon"
     },
     {
-      "name": "book1"
+      "name": "cover_base"
     },
     {
-      "name": "book2"
+      "name": "cover_old"
     },
     {
-      "name": "book3"
+      "name": "cover_strong"
     },
     {
-      "name": "book4"
+      "name": "decor_wingette"
     },
     {
-      "name": "book5"
+      "name": "decor_wingette_flat"
     },
     {
-      "name": "book6"
+      "name": "decor_wingette_circle"
     },
     {
-      "name": "book7"
+      "name": "decor_bottom"
     },
     {
-      "name": "book8"
+      "name": "decor_diagonal"
     },
     {
-      "name": "book_infections"
+      "name": "decor_middle"
     },
     {
-      "name": "book_cooking"
+      "name": "decor_spine"
     },
     {
-      "name": "book_engineering"
+      "name": "decor_vertical_middle"
     },
     {
-      "name": "book_engineering2"
+      "name": "detail_bookmark"
     },
     {
-      "name": "book_hacking"
+      "name": "detail_rivets"
     },
     {
-      "name": "book_detective"
+      "name": "icon_apple"
     },
     {
-      "name": "book_nuclear"
+      "name": "icon_atmos"
     },
     {
-      "name": "book_particle_accelerator"
+      "name": "icon_aurora"
     },
     {
-      "name": "book_cloning"
+      "name": "icon_banana"
     },
     {
-      "name": "book_hydroponics_pod_people"
+      "name": "icon_bar"
     },
     {
-      "name": "book_borg",
+      "name": "icon_biohazard"
+    },
+    {
+      "name": "icon_borg",
       "delays": [
         [
           6,
@@ -74,19 +77,61 @@
       ]
     },
     {
-      "name": "book_chemistry"
+      "name": "icon_briefcase"
     },
     {
-      "name": "book_bar"
+      "name": "icon_bucket"
     },
     {
-      "name": "book_space_law"
+      "name": "icon_cabbage"
     },
     {
-      "name": "book_demonomicon",
+      "name": "icon_chemical"
+    },
+    {
+      "name": "icon_corner"
+    },
+    {
+      "name": "icon_diamond"
+    },
+    {
+      "name": "icon_dna"
+    },
+    {
+      "name": "icon_eye"
+    },
+    {
+      "name": "icon_fish"
+    },
+    {
+      "name": "icon_glow"
+    },
+    {
+      "name": "icon_hacking"
+    },
+    {
+      "name": "icon_ian"
+    },
+    {
+      "name": "icon_law"
+    },
+    {
+      "name": "icon_letter_N"
+    },
+    {
+      "name": "icon_letter_P"
+    },
+    {
+      "name": "icon_lightning"
+    },
+    {
+      "name": "icon_magic"
+    },
+    {
+      "name": "icon_magic_fireball",
       "delays": [
         [
-          0.5,
+          0.1,
           0.1,
           0.1,
           0.1
@@ -94,13 +139,32 @@
       ]
     },
     {
-      "name": "book_origami"
+      "name": "icon_magic_forcewall",
+      "delays": [
+        [
+          0.3,
+          0.3
+        ]
+      ]
     },
     {
-      "name": "book_boneworking"
+      "name": "icon_magic_knock",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
-      "name": "book_fish"
+      "name": "icon_magnifier"
+    },
+    {
+      "name": "icon_medical"
     },
     {
       "name": "summon_book"
@@ -109,10 +173,87 @@
       "name": "book_science"
     },
     {
-      "name": "book_medical"
+      "name": "icon_medical_cross"
     },
     {
-      "name": "book_security"
+      "name": "icon_mount"
+    },
+    {
+      "name": "icon_nuclear"
+    },
+    {
+      "name": "icon_origami"
+    },
+    {
+      "name": "icon_pentagramm"
+    },
+    {
+      "name": "icon_planet"
+    },
+    {
+      "name": "icon_possum"
+    },
+    {
+      "name": "icon_question"
+    },
+    {
+      "name": "icon_scmmd"
+    },
+    {
+      "name": "icon_skull"
+    },
+    {
+      "name": "icon_stars"
+    },
+    {
+      "name": "icon_stars2"
+    },
+    {
+      "name": "icon_stunbaton"
+    },
+    {
+      "name": "icon_temple"
+    },
+    {
+      "name": "icon_text"
+    },
+    {
+      "name": "icon_text2"
+    },
+    {
+      "name": "icon_text3"
+    },
+    {
+      "name": "icon_time"
+    },
+    {
+      "name": "icon_tree"
+    },
+    {
+      "name": "icon_wrench"
+    },
+    {
+      "name": "overlay_blood"
+    },
+    {
+      "name": "overlay_dirt"
+    },
+    {
+      "name": "overlay_null"
+    },
+    {
+      "name": "paper"
+    },
+    {
+      "name": "paper_blood",
+      "delays": [
+        [
+          5,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Misc/books.rsi/overlay_blood.png b/Resources/Textures/Objects/Misc/books.rsi/overlay_blood.png
new file mode 100644
index 0000000000..c497b9e8f3
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/overlay_blood.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/overlay_dirt.png b/Resources/Textures/Objects/Misc/books.rsi/overlay_dirt.png
new file mode 100644
index 0000000000..43d2d741d7
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/overlay_dirt.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/overlay_null.png b/Resources/Textures/Objects/Misc/books.rsi/overlay_null.png
new file mode 100644
index 0000000000..7244b37f5c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/overlay_null.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/paper.png b/Resources/Textures/Objects/Misc/books.rsi/paper.png
new file mode 100644
index 0000000000..8309d99db7
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/paper.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/paper_blood.png b/Resources/Textures/Objects/Misc/books.rsi/paper_blood.png
new file mode 100644
index 0000000000..b0ed27ad52
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/paper_blood.png differ
diff --git a/Resources/Textures/Objects/Misc/cd.rsi/icon.png b/Resources/Textures/Objects/Misc/cd.rsi/icon.png
new file mode 100644
index 0000000000..346d8c162a
Binary files /dev/null and b/Resources/Textures/Objects/Misc/cd.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/meta.json b/Resources/Textures/Objects/Misc/cd.rsi/meta.json
similarity index 58%
rename from Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/meta.json
rename to Resources/Textures/Objects/Misc/cd.rsi/meta.json
index 71f798f2c4..7f5e1ec864 100644
--- a/Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/cd.rsi/meta.json
@@ -1,17 +1,12 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Ubaser.",
+  "copyright": "Made by SlamBamActionman",
   "size": {
     "x": 32,
     "y": 32
   },
-
   "states": [
-    {
-      "name": "equipped-NECK",
-      "directions": 4
-    },
     {
       "name": "icon"
     }
diff --git a/Resources/Textures/Objects/Misc/diskcases.rsi/icon_base.png b/Resources/Textures/Objects/Misc/diskcases.rsi/icon_base.png
new file mode 100644
index 0000000000..11fb7140ff
Binary files /dev/null and b/Resources/Textures/Objects/Misc/diskcases.rsi/icon_base.png differ
diff --git a/Resources/Textures/Objects/Misc/diskcases.rsi/icon_cargo.png b/Resources/Textures/Objects/Misc/diskcases.rsi/icon_cargo.png
new file mode 100644
index 0000000000..4bee922d75
Binary files /dev/null and b/Resources/Textures/Objects/Misc/diskcases.rsi/icon_cargo.png differ
diff --git a/Resources/Textures/Objects/Misc/diskcases.rsi/icon_cc.png b/Resources/Textures/Objects/Misc/diskcases.rsi/icon_cc.png
new file mode 100644
index 0000000000..a0dd3a8793
Binary files /dev/null and b/Resources/Textures/Objects/Misc/diskcases.rsi/icon_cc.png differ
diff --git a/Resources/Textures/Objects/Misc/diskcases.rsi/meta.json b/Resources/Textures/Objects/Misc/diskcases.rsi/meta.json
new file mode 100644
index 0000000000..714b0b19a0
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/diskcases.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by SlamBamActionman",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon_base"
+    },
+    {
+      "name": "icon_cc"
+    },
+    {
+      "name": "icon_cargo"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..374a7981d0
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
index ddbda4f0af..782dc2bfda 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a seed modified by potato1234_X (github) for ss14",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a seed modified by potato1234_X (github) for ss14, equipped-HELMET taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and changed hue",
   "size": {
     "x": 32,
     "y": 32
@@ -27,6 +27,10 @@
     },
     {
       "name": "stage-3"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png
rename to Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
index 8b6952d030..b49b49cc85 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, equipped-HELMET taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
   "size": {
     "x": 32,
     "y": 32
@@ -27,6 +27,10 @@
     },
     {
       "name": "stage-3"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..585f227940
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-SUITSTORAGE.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 49209bf2dc..421037eac3 100644
--- a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json
@@ -32,6 +32,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+    {
+        "name": "equipped-SUITSTORAGE",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/icon.png
new file mode 100644
index 0000000000..6955b10e5d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
new file mode 100644
index 0000000000..c7c06adfc8
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, modified into incomplete version by Vermidia",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..648fff08e4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-SUITSTORAGE.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 383ea777d2..5a18552d2e 100644
--- a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json
@@ -32,6 +32,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+    {
+        "name": "equipped-SUITSTORAGE",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..e194aff0a6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-SUITSTORAGE.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 383ea777d2..5a18552d2e 100644
--- a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json
@@ -32,6 +32,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+    {
+        "name": "equipped-SUITSTORAGE",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..cb8ff3d744
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-SUITSTORAGE.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 49209bf2dc..421037eac3 100644
--- a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json
@@ -32,6 +32,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+    {
+        "name": "equipped-SUITSTORAGE",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..fc03f154a4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-SUITSTORAGE.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 383ea777d2..5a18552d2e 100644
--- a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json
@@ -32,6 +32,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+    {
+        "name": "equipped-SUITSTORAGE",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png b/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png
deleted file mode 100644
index 738c92a6d3..0000000000
Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png b/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png
deleted file mode 100644
index 204c5ff89d..0000000000
Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/condisposal.png b/Resources/Textures/Structures/Furniture/toilet.rsi/condisposal.png
new file mode 100644
index 0000000000..c60cabe80b
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/condisposal.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-charging.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-charging.png
new file mode 100644
index 0000000000..cb9ad3a9c7
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-charging.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-closed.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-closed.png
new file mode 100644
index 0000000000..98c4088aba
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-closed.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-down.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-down.png
new file mode 100644
index 0000000000..97712ddc65
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-down.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-flush.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-flush.png
new file mode 100644
index 0000000000..811284448c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-flush.png differ
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-right.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-open.png
similarity index 64%
rename from Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-right.png
rename to Resources/Textures/Structures/Furniture/toilet.rsi/disposal-open.png
index 27b68e2cfe..f48f67bf9a 100644
Binary files a/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-right.png and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-open.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-up.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-up.png
new file mode 100644
index 0000000000..3b37aba472
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-up.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal.png
new file mode 100644
index 0000000000..cb2db2f9d8
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal.png differ
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-left.png b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-charge.png
similarity index 66%
rename from Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-left.png
rename to Resources/Textures/Structures/Furniture/toilet.rsi/dispover-charge.png
index ad3ad959de..23ecafa9d8 100644
Binary files a/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-left.png and b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-charge.png differ
diff --git a/Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-full.png
similarity index 79%
rename from Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png
rename to Resources/Textures/Structures/Furniture/toilet.rsi/dispover-full.png
index b7bd88245f..ceb04dfb26 100644
Binary files a/Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png and b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-full.png differ
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-left.png b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-handle.png
similarity index 74%
rename from Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-left.png
rename to Resources/Textures/Structures/Furniture/toilet.rsi/dispover-handle.png
index d90d5b21b7..4f40192d5b 100644
Binary files a/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-left.png and b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-handle.png differ
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-right.png b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-ready.png
similarity index 66%
rename from Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-right.png
rename to Resources/Textures/Structures/Furniture/toilet.rsi/dispover-ready.png
index 353e47c56f..bac1c76ec9 100644
Binary files a/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-right.png and b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-ready.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/meta.json b/Resources/Textures/Structures/Furniture/toilet.rsi/meta.json
index 0761994277..047ddbb24b 100644
--- a/Resources/Textures/Structures/Furniture/toilet.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/toilet.rsi/meta.json
@@ -4,24 +4,240 @@
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e",
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Made by brainfood1183 (github) for ss14",
     "states": [
         {
-            "name": "closed_toilet_seat_down",
-            "directions": 4
+            "name": "condisposal",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
         },
         {
-            "name": "closed_toilet_seat_up",
-            "directions": 4
+            "name": "disposal-open",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
         },
         {
-            "name": "open_toilet_seat_down",
-            "directions": 4
+            "name": "disposal-closed",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
         },
         {
-            "name": "open_toilet_seat_up",
-            "directions": 4
+            "name": "disposal",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "disposal-up",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "disposal-down",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "disposal-charging",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "disposal-flush",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ],
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ],
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ],
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "dispover-charge",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "dispover-full",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "dispover-handle",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "dispover-ready",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png b/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png
deleted file mode 100644
index a487afc0b8..0000000000
Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png b/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png
deleted file mode 100644
index 77995657cf..0000000000
Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/display.png b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/display.png
index e86c457962..d9edabb6a0 100644
Binary files a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/display.png and b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/display.png differ
diff --git a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/icon.png b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/icon.png
index d21713efdd..a60dc10b12 100644
Binary files a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/icon.png and b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/meta.json b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/meta.json
index c3bd5aeaa4..d7f967e739 100644
--- a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage",
+  "copyright": "Created by EmoGarbage, icon & unshaded changed by lzk228",
   "size": {
     "x": 32,
     "y": 32
@@ -14,11 +14,12 @@
       "name": "icon"
     },
     {
-      "name": "printing", 
+      "name": "printing",
       "delays": [[0.25, 0.25, 0.25, 0.25]]
     },
     {
-      "name": "unshaded"
+      "name": "unshaded",
+      "delays": [[2, 1, 1, 1]]
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/unshaded.png b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/unshaded.png
index bfb67b28f3..4788c7df1b 100644
Binary files a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/unshaded.png and b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/unshaded.png differ
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 64ab0755b2..b5985faca7 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -205,7 +205,20 @@ Observationskit: null
 # 2024-02-26
 CrateBaseWeldable: CrateGenericSteel
 
-# 2024-03-7
+# 2024-03-05
+BookBotanicalTextbook: BookRandomStory
+BookEscalation: BookRandomStory
+BookEscalationSecurity: BookRandomStory
+BookDemonomiconRandom: BookRandomStory
+BookDemonomicon1: BookRandomStory
+BookDemonomicon2: BookRandomStory
+BookDemonomicon3: BookRandomStory
+BookChemistryInsane: BookRandomStory
+BookGnominomicon: BookRandomStory
+BookFishing: BookRandomStory
+BookDetective: BookRandomStory
+
+# 2024-03-07
 AirlockExternalEasyPry: AirlockExternal
 AirlockExternalGlassEasyPry: AirlockExternalGlass
 AirlockGlassShuttleEasyPry: AirlockGlassShuttle
@@ -220,5 +233,22 @@ ImprovisedExplosive: FireBomb
 ImprovisedExplosiveEmpty: FireBombEmpty
 ImprovisedExplosiveFuel: FireBombFuel
 
+# 2024-03-16
+ClothingHeadHatHairflower: FoodPoppy
+
 # 2024-03-21
 RPED: null
+
+# 2024-03-30
+# These are technically not equivalent, but it probably makes more sense to replace any existing SCAF stuff with SOME kind of armor, instead of just deleting it outright.
+ClothingHeadHelmetScaf: ClothingHeadHelmetBasic
+ClothingOuterArmorScaf: ClothingOuterArmorBasic
+
+# 2024-03-31
+ClothingNeckFlowerWreath: ClothingHeadHatFlowerWreath
+ClothingHeadHatFlowerCrown: ClothingHeadHatFlowerWreath
+BriefcaseSyndieBase: null
+
+# 2024-04-08
+BodyBag_Container: BodyBag
+BodyBag_Folded: BodyBagFolded
diff --git a/RobustToolbox b/RobustToolbox
index 4002cbddb9..6764ed56b0 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 4002cbddb9c9de9030a81480b45b13d978b87526
+Subproject commit 6764ed56b06309b56bd35c8ebffdf64882d4c4c1